CPU build updated; constructors updated due to Config Builder usage

Author: AleksaMCode

CacheSimulator/CPU.cs

@@ -7,14 +7,14 @@ public class CPU
     {
         private List<CpuCore> cores { get; set; }
 
-        public CPU((string ramFileName, int size, int associativity, int blockSize, WritePolicy writeHitPolicy, WritePolicy writeMissPolicy, ReplacementPolicy replacementPolicy) cacheInfo, int numberOfCores)
+        public CPU((string ramFileName, int size, int associativity) cacheInfo, CacheConfiguration config, int numberOfCores)
         {
             cores = new List<CpuCore>(numberOfCores);
 
             //CPU cores initialization.
             for (var i = 0; i < numberOfCores; ++i)
             {
-                cores.Add(new CpuCore(cacheInfo));
+                cores.Add(new CpuCore(cacheInfo, config));
             }
         }
 

CacheSimulator/CpuCore.cs

@@ -9,9 +9,9 @@ public class CpuCore
     {
         private Cache L1d;
 
-        public CpuCore((string ramFileName, int size, int associativity, int blockSize, WritePolicy writeHitPolicy, WritePolicy writeMissPolicy, ReplacementPolicy replacementPolicy) cacheInfo)
+        public CpuCore((string ramFileName, int size, int associativity) cacheInfo, CacheConfiguration config)
         {
-            L1d = new Cache(cacheInfo);
+            L1d = new Cache(cacheInfo, config);
         }
 
         public string ExecuteTraceLine(string traceLine, int traceIndex, int coreNumber)

CacheSimulator/MainWindow.xaml.cs

@@ -76,18 +76,19 @@ private async void StartSimulation(object sender, RoutedEventArgs e)
             try
             {
                 var size = Int32.Parse(cacheSize.Text);
-                var lineSize = Int32.Parse(cacheLineSize.Text);
 
-                var associativity = GetCacheAssociativity(size, lineSize);
+                var associativity = GetCacheAssociativity(size, GetCacheLineSize());
                 var numberOfCores = GetNumberOfCores();
 
                 if (numberOfCores > 128)
                 {
                     numberOfCores = 128;
                 }
 
-                cpu = new CPU((ramFileFullPath, size, associativity, lineSize,
-                    GetWritePolicy(cacheWriteHitPolicyComboBox.Text), GetWritePolicy(cacheWriteMissPolicyComboBox.Text), GetReplacementPolicy(cacheReplacementPolicyComboBox.Text)), numberOfCores);
+                // Build cache config information.
+                var cacheConfigBuilder = GetCacheConfigBuilder();
+
+                cpu = new CPU((ramFileFullPath, size, associativity), cacheConfigBuilder.Build(), numberOfCores);
 
                 logLines.Append($"Simulation {numberOfSimulation++}\n");
 
@@ -207,6 +208,18 @@ private async void StartSimulation(object sender, RoutedEventArgs e)
             EnableWindowComponents(true);
         }
 
+
+        private CacheConfigurationBuilder GetCacheConfigBuilder()
+        {
+            var cacheConfigBuilder = new CacheConfigurationBuilder();
+            cacheConfigBuilder.Size(GetCacheLineSize());
+            cacheConfigBuilder.WriteHitPolicy(GetWritePolicy(cacheWriteHitPolicyComboBox.Text));
+            cacheConfigBuilder.WriteMissPolicy(GetWritePolicy(cacheWriteMissPolicyComboBox.Text));
+            cacheConfigBuilder.ReplacementPolicy(GetReplacementPolicy(cacheReplacementPolicyComboBox.Text));
+
+            return cacheConfigBuilder;
+        }
+
         private void StopSimulation(object sender, RoutedEventArgs e)
         {
             if (!isRunning || isCancelRequested)
@@ -218,6 +231,11 @@ private void StopSimulation(object sender, RoutedEventArgs e)
             source.Cancel();
         }
 
+        private int GetCacheLineSize()
+        {
+            return Int32.Parse(cacheLineSize.Text);
+        }
+
         private int GetCacheAssociativity(int cacheSize, int lineSize)
         {
             return cacheAssociativityComboBox.Text switch