sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge zizzer.eecs.umich.edu:/bk/newmem

Browse source 
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 77222b85492c8ad6c0b776fa34c83065c77c402e
This commit is contained in:
Gabe Black 2007-06-04 19:53:05 +00:00
commit ddbc26c85e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/common/FSConfig.py
View file

@ -38,14 +38,14 @@ class CowIdeDisk(IdeDisk):
def childImage(self, ci): def childImage(self, ci):
self.image.child.image_file = ci self.image.child.image_file = ci
class BaseTsunami(Tsunami): def makeLinuxAlphaSystem(mem_mode, mdesc = None):
class BaseTsunami(Tsunami):
ethernet = NSGigE(configdata=NSGigEPciData(), ethernet = NSGigE(configdata=NSGigEPciData(),
pci_bus=0, pci_dev=1, pci_func=0) pci_bus=0, pci_dev=1, pci_func=0)
etherint = NSGigEInt(device=Parent.ethernet) etherint = NSGigEInt(device=Parent.ethernet)
ide = IdeController(disks=[Parent.disk0, Parent.disk2], ide = IdeController(disks=[Parent.disk0, Parent.disk2],
pci_func=0, pci_dev=0, pci_bus=0) pci_func=0, pci_dev=0, pci_bus=0)
def makeLinuxAlphaSystem(mem_mode, mdesc = None):
self = LinuxAlphaSystem() self = LinuxAlphaSystem()
if not mdesc: if not mdesc:
# generic system # generic system

4
src/cpu/simple/base.cc
View file

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