From 387889526430e34a7da32741d39942b7f4771bf8 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Mon, 22 May 2006 22:15:22 -0400
Subject: Fix to SPARC Nop class for multiple CPU models.

src/arch/sparc/isa/formats/nop.isa:
    Fix nop header so we can compile with multiple CPU models.
    (Former code re-defined Nop object for each model.)

--HG--
extra : convert_revision : 04e92622edf4dfefd9e149a17f604e17a93707c9
---
 src/arch/sparc/isa/formats/nop.isa | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/arch')

diff --git a/src/arch/sparc/isa/formats/nop.isa b/src/arch/sparc/isa/formats/nop.isa
index 7fd1a3b21..37ef2e8d0 100644
--- a/src/arch/sparc/isa/formats/nop.isa
+++ b/src/arch/sparc/isa/formats/nop.isa
@@ -32,6 +32,16 @@
 // Nop instruction
 //
 
+// Per-cpu-model nop execute method.
+def template NopExec {{
+
+    Fault execute(%(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
+    {
+        // Nothing to see here, move along
+        return NoFault;
+    }
+}};
+
 output header {{
         /**
          * Nop class.
@@ -46,14 +56,11 @@ output header {{
             }
 
             // All Nop instructions do the same thing, so this can be
-            // defined here. Nops can be defined directly, so there needs
-            // to be a default implementation
-            Fault execute(%(CPU_exec_context)s *xc,
-                Trace::InstRecord *traceData) const
-            {
-                //Nothing to see here, move along
-                return NoFault;
-            }
+            // defined here. Nops can be defined directly, so there
+            // needs to be a default implementation.  Interpolate via
+            // template so i gets expanded to a set of
+            // cpu-model-specific functions.
+            %(NopExec)s
 
             std::string generateDisassembly(Addr pc,
                     const SymbolTable *symtab) const;
-- 
cgit v1.2.3


From 475a981f6e9bdff9436ad0ecf34f83ead5a63498 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Mon, 22 May 2006 22:18:08 -0400
Subject: Get rid of FastCPU model. It doesn't compile, and if we really want
 this we should start over from scratch and see if we can reuse parts from
 BaseSimpleCPU (e.g., derive a FastSimpleCPU).

SConstruct:
src/arch/SConscript:
src/cpu/cpu_models.py:
    Get rid of FastCPU model.

--HG--
extra : convert_revision : f3f0362f7292bf21e8e0d4d84c475be8a9789a0c
---
 src/arch/SConscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/arch')

diff --git a/src/arch/SConscript b/src/arch/SConscript
index 06b8e8dde..9c193207f 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -132,7 +132,7 @@ def isa_desc_emitter(target, source, env):
     return (isa_desc_gen_files, [isa_parser, cpu_models_file] + source)
 
 # Pieces are in place, so create the builder.
-isa_desc_builder = Builder(action='python $SOURCES $TARGET.dir $CPU_MODELS',
+isa_desc_builder = Builder(action='python2.4 $SOURCES $TARGET.dir $CPU_MODELS',
                            emitter = isa_desc_emitter)
 
 env.Append(BUILDERS = { 'ISADesc' : isa_desc_builder })
-- 
cgit v1.2.3