From 48133a0f04d43f71a90984eff1899fc2556bb6ec Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 4 Jun 2007 12:03:38 -0400
Subject: [PATCH 1/2] fix SPARC....

configs/common/FSConfig.py:
    fix SPARC

--HG--
extra : convert_revision : 34a36c0f626f3fb8a1526ec194a9b0cdae32fed4
---
 configs/common/FSConfig.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 8a87c3a6b..6bcdafb14 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -38,14 +38,14 @@ class CowIdeDisk(IdeDisk):
     def childImage(self, ci):
         self.image.child.image_file = ci
 
-class BaseTsunami(Tsunami):
-    ethernet = NSGigE(configdata=NSGigEPciData(),
-                      pci_bus=0, pci_dev=1, pci_func=0)
-    etherint = NSGigEInt(device=Parent.ethernet)
-    ide = IdeController(disks=[Parent.disk0, Parent.disk2],
-                        pci_func=0, pci_dev=0, pci_bus=0)
-
 def makeLinuxAlphaSystem(mem_mode, mdesc = None):
+    class BaseTsunami(Tsunami):
+        ethernet = NSGigE(configdata=NSGigEPciData(),
+                          pci_bus=0, pci_dev=1, pci_func=0)
+        etherint = NSGigEInt(device=Parent.ethernet)
+        ide = IdeController(disks=[Parent.disk0, Parent.disk2],
+                            pci_func=0, pci_dev=0, pci_bus=0)
+
     self = LinuxAlphaSystem()
     if not mdesc:
         # generic system

From 42174babbbf3a5741277e49e367f48bb8a2838e1 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 4 Jun 2007 15:53:04 -0400
Subject: [PATCH 2/2] don't be so aggressive with the tracing on #if

--HG--
extra : convert_revision : 8ee88bff8010dcb7a412f6a6b49d40fad1c0bb68
---
 src/cpu/simple/base.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index a8fe57f0a..33c5877a5 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -413,21 +413,21 @@ BaseSimpleCPU::preExecute()
             fetchMicroOp(thread->readMicroPC());
     }
 
-#if TRACING_ON
     //If we decoded an instruction this "tick", record information about it.
     if(curStaticInst)
     {
+#if TRACING_ON
         traceData = Trace::getInstRecord(curTick, tc, curStaticInst,
                                          thread->readPC());
 
         DPRINTF(Decode,"Decode: Decoded %s instruction: 0x%x\n",
                 curStaticInst->getName(), curStaticInst->machInst);
+#endif // TRACING_ON
 
 #if FULL_SYSTEM
         thread->setInst(inst);
 #endif // FULL_SYSTEM
     }
-#endif // TRACING_ON
 }
 
 void