Common host app model

.editorconfig

@@ -214,6 +214,9 @@ csharp_preserve_single_line_blocks = true
 # Code block
 csharp_prefer_braces = when_multiline:warning
 
+# File Scoped Namespaces
+csharp_style_namespace_declarations = file_scoped
+
 
 # -----------------------------------------------
 # Misc Code Styles that should affect code analysis
@@ -233,6 +236,9 @@ dotnet_style_prefer_compound_assignment = false:suggestion
 # IDE0055: Fix formatting. All formatting options have rule ID IDE0055 and title Fix formatting
 dotnet_diagnostic.IDE0055.severity = warning
 
+# IDE0161: Use file-scoped namespace
+dotnet_diagnostic.IDE0161.severity = warning
+
 
 # -----------------------------------------------
 # Misc Code Rules that should be disabled in code analysis

benchmarks/Highbyte.DotNet6502.Benchmarks/6502/Execute6502InstructionBenchmark.cs

@@ -2,6 +2,7 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Engines;
 using BenchmarkDotNet.Jobs;
+using Highbyte.DotNet6502.Utils;
 
 namespace Highbyte.DotNet6502.Benchmarks;
 

benchmarks/Highbyte.DotNet6502.Benchmarks/6502/ExecuteAll6502InstructionsBenchmark.cs

@@ -2,6 +2,7 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Engines;
 using BenchmarkDotNet.Jobs;
+using Highbyte.DotNet6502.Utils;
 
 namespace Highbyte.DotNet6502.Benchmarks;
 

benchmarks/Highbyte.DotNet6502.Benchmarks/Commodore64/C64ExecuteFrameBenchmark.cs

@@ -5,6 +5,7 @@
 using Highbyte.DotNet6502.Systems;
 using Highbyte.DotNet6502.Systems.Commodore64;
 using Highbyte.DotNet6502.Systems.Commodore64.Config;
+using Highbyte.DotNet6502.Utils;
 using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Highbyte.DotNet6502.Benchmarks.Commodore64;

benchmarks/Highbyte.DotNet6502.Benchmarks/Commodore64/C64ExecuteInstructionBenchmark.cs

@@ -5,6 +5,7 @@
 using Highbyte.DotNet6502.Systems;
 using Highbyte.DotNet6502.Systems.Commodore64;
 using Highbyte.DotNet6502.Systems.Commodore64.Config;
+using Highbyte.DotNet6502.Utils;
 using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Highbyte.DotNet6502.Benchmarks.Commodore64;

benchmarks/Highbyte.DotNet6502.Benchmarks/Commodore64/Data/C64CharGenerator.cs

@@ -1,58 +1,57 @@
 using Highbyte.DotNet6502.Systems.Commodore64;
 using Highbyte.DotNet6502.Systems.Commodore64.Video;
 
-namespace Highbyte.DotNet6502.Benchmarks.Commodore64.Data
+namespace Highbyte.DotNet6502.Benchmarks.Commodore64.Data;
+
+public class C64CharGenerator
 {
-    public class C64CharGenerator
-    {
-        private readonly C64 _c64;
-        private readonly Vic2 _vic2;
-        private readonly Memory _vic2Mem;
+    private readonly C64 _c64;
+    private readonly Vic2 _vic2;
+    private readonly Memory _vic2Mem;
 
-        public C64CharGenerator(C64 c64)
-        {
-            _c64 = c64;
-            _vic2 = c64.Vic2;
-            _vic2Mem = c64.Mem;
-        }
+    public C64CharGenerator(C64 c64)
+    {
+        _c64 = c64;
+        _vic2 = c64.Vic2;
+        _vic2Mem = c64.Mem;
+    }
 
-        public void WriteToScreen(byte characterCode, byte col, byte row)
-        {
-            var screenAddress = (ushort)(_vic2.VideoMatrixBaseAddress + (row * _vic2.Vic2Screen.TextCols) + col);
-            _vic2Mem[screenAddress] = characterCode;
-        }
-        public void CreateCharData()
+    public void WriteToScreen(byte characterCode, byte col, byte row)
+    {
+        var screenAddress = (ushort)(_vic2.VideoMatrixBaseAddress + (row * _vic2.Vic2Screen.TextCols) + col);
+        _vic2Mem[screenAddress] = characterCode;
+    }
+    public void CreateCharData()
+    {
+        foreach (var characterCode in s_chars.Keys)
         {
-            foreach (var characterCode in s_chars.Keys)
+            var characterSetLineAddress = (ushort)(_vic2.CharsetManager.CharacterSetAddressInVIC2Bank
+                                    + (characterCode * _vic2.Vic2Screen.CharacterHeight));
+            for (int i = 0; i < s_chars[characterCode].Length; i++)
             {
-                var characterSetLineAddress = (ushort)(_vic2.CharsetManager.CharacterSetAddressInVIC2Bank
-                                        + (characterCode * _vic2.Vic2Screen.CharacterHeight));
-                for (int i = 0; i < s_chars[characterCode].Length; i++)
-                {
-                    _vic2Mem[(ushort)(characterSetLineAddress + i)] = s_chars[characterCode][i];
-                }
+                _vic2Mem[(ushort)(characterSetLineAddress + i)] = s_chars[characterCode][i];
             }
         }
+    }
 
-        private static Dictionary<int, byte[]> s_chars
+    private static Dictionary<int, byte[]> s_chars
+    {
+        get
         {
-            get
+            return new Dictionary<int, byte[]>
             {
-                return new Dictionary<int, byte[]>
-                {
-                    // A
-                    {1, new byte[] {
-                        0b00011000,
-                        0b01100110,
-                        0b01111110,
-                        0b01100110,
-                        0b01100110,
-                        0b01100110,
-                        0b00000000
-                        }
+                // A
+                {1, new byte[] {
+                    0b00011000,
+                    0b01100110,
+                    0b01111110,
+                    0b01100110,
+                    0b01100110,
+                    0b01100110,
+                    0b00000000
                     }
-                };
-            }
+                }
+            };
         }
     }
 }