diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-08-15 17:17:17 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-08-15 17:17:17 -0400 |
| commit | bcc333e92006f52baeef1ae0f94d4765513584d8 (patch) | |
| tree | 88e3fbd634750cec0e1e4210d62a1f90fd3d2380 /cpu/simple/cpu.cc | |
| parent | 49063eb24f8fd2ad010224cc282c55dd5471dd65 (diff) | |
| parent | b64eae5e52d9eb60ad498464d076b48cd5ceafe3 (diff) | |
| download | gem5-bcc333e92006f52baeef1ae0f94d4765513584d8.tar.xz | |
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_dir/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/rtcreg.h:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/uart8250.cc:
dev/uart8250.hh:
python/m5/objects/Tsunami.py:
Merge code.
--HG--
extra : convert_revision : e97d5dbcc051d2061622201265430d359f995d48
Diffstat (limited to 'cpu/simple/cpu.cc')
| -rw-r--r-- | cpu/simple/cpu.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index 1164e35a4..c5e12990b 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -738,7 +738,7 @@ SimpleCPU::tick() comInstEventQueue[0]->serviceEvents(numInst); // decode the instruction - inst = htoa(inst); + inst = gtoh(inst); curStaticInst = StaticInst<TheISA>::decode(inst); traceData = Trace::getInstRecord(curTick, xc, this, curStaticInst, |