diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-04 19:53:05 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-04 19:53:05 +0000 |
| commit | ddbc26c85e267d3a0bdf6332d7e592bc9f17f604 (patch) | |
| tree | 0eb738800c672dcb73c2038c1e34685a896a3ce4 | |
| parent | 41bc0fc5b27b97f6235e5cd3fe089ff43b588bef (diff) | |
| parent | 42174babbbf3a5741277e49e367f48bb8a2838e1 (diff) | |
| download | gem5-ddbc26c85e267d3a0bdf6332d7e592bc9f17f604.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : 77222b85492c8ad6c0b776fa34c83065c77c402e
| -rw-r--r-- | configs/common/FSConfig.py | 14 | ||||
| -rw-r--r-- | src/cpu/simple/base.cc | 4 |
2 files changed, 9 insertions, 9 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 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 |