fix allowSpecBuffHit and trackBranch options

1 files changed, 4 insertions, 8 deletions

diff --git a/configs/common/CpuConfig.py b/configs/common/CpuConfig.py
index ec1f3692a..ec3883db4 100644
--- a/configs/common/CpuConfig.py
+++ b/configs/common/CpuConfig.py
@@ -118,20 +118,16 @@ def config_scheme(cpu_cls, cpu_list, options):
             else:
                 cpu.needsTSO = False
 
-            if options.allowSpecBuffHit:
-                cpu.allowSpecBuffHit = True
-            else:
-                cpu.allowSpecBuffHit = False
+            if options.allowSpecBuffHit is not None:
+                cpu.allowSpecBuffHit = options.allowSpecBuffHit
 
             if options.useIFT:
                 cpu.useIFT = True
             else:
                 cpu.useIFT = False
 
-            if options.trackBranch:
-                cpu.trackBranch = True
-            else:
-                cpu.trackBranch = False
+            if options.trackBranch is not None:
+                cpu.trackBranch = options.trackBranch
 
             if len(options.scheme)!=0:
                 cpu.simulateScheme = options.scheme