arm: Fixed undefined behaviours identified by gcc

[gem5.git] / src / arch / SConscript

diff --git a/src/arch/SConscript b/src/arch/SConscript
index e9b5c5365f5487495921c8095b65f7950cb4b390..31ea0b78fcc75db0683ec221d464d0cbb812231f 100644 (file)
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -95,13 +95,11 @@ isa_parser = File('isa_parser.py')
 # The emitter patches up the sources & targets to include the
 # autogenerated files as targets and isa parser itself as a source.
 def isa_desc_emitter(target, source, env):
-    cpu_models = list(env['CPU_MODELS'])
-    cpu_models.append('CheckerCPU')
-
     # List the isa parser as a source.
-    source += [ isa_parser ]
-    # Add in the CPU models.
-    source += [ Value(m) for m in cpu_models ]
+    source += [
+        isa_parser,
+        Value("ExecContext"),
+        ]
 
     # Specify different targets depending on if we're running the ISA
     # parser for its dependency information, or for the generated files.
@@ -137,8 +135,7 @@ def isa_desc_action_func(target, source, env):
 
     # Skip over the ISA description itself and the parser to the CPU models.
     models = [ s.get_contents() for s in source[2:] ]
-    cpu_models = [CpuModel.dict[cpu] for cpu in models]
-    parser = isa_parser.ISAParser(target[0].dir.abspath, cpu_models)
+    parser = isa_parser.ISAParser(target[0].dir.abspath)
     parser.parse_isa_desc(source[0].abspath)
 isa_desc_action = MakeAction(isa_desc_action_func, Transform("ISA DESC", 1))