diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-03-14 18:28:51 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-03-14 18:28:51 -0500 |
| commit | 6547e8882ba8fa538a8a80040b7eb82baedc540a (patch) | |
| tree | b5aa6ba54489a4cd48f97e152e28f810da97c57d /cpu/simple/cpu.cc | |
| parent | af975813e546b5a951d5e7108454946afd31e434 (diff) | |
| download | gem5-6547e8882ba8fa538a8a80040b7eb82baedc540a.tar.xz | |
Minor Sconscript edit ... mips decoder changes ... initialize NNPC and output fault name in simple cpu
SConscript:
Separate Alpha EIO from syscall building for other architectures
arch/isa_specific.hh:
change MIPS constant to 34k
arch/mips/isa/decoder.isa:
Allow sll,ssnop,nop, and ehb to be determined through decoder using
the different types of default cases
arch/mips/isa/formats/branch.isa:
Delete debug code
arch/mips/isa/formats/noop.isa:
add a Nop format
arch/mips/isa_traits.hh:
use constants instead of enums
arch/mips/process.cc:
point to the correct header file
cpu/simple/cpu.cc:
Output the actual fault name
sim/process.cc:
Inititalize NNPC
--HG--
extra : convert_revision : adb0026dfad25b14c98fb03c98bfe9c681bba6f8
Diffstat (limited to 'cpu/simple/cpu.cc')
| -rw-r--r-- | cpu/simple/cpu.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index b99ace598..5b66cf9af 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -961,6 +961,9 @@ SimpleCPU::tick() #define IFETCH_FLAGS(pc) 0 #endif + DPRINTF(Fetch,"Fetching PC:%08p NPC:%08p NNPC:%08p\n",cpuXC->readPC(), + cpuXC->readNextPC(),cpuXC->readNextNPC()); + #if SIMPLE_CPU_MEM_TIMING CpuRequest *ifetch_req = new CpuRequest(); ifetch_req->size = sizeof(MachInst); @@ -1077,7 +1080,7 @@ SimpleCPU::tick() #if FULL_SYSTEM fault->invoke(xcProxy); #else // !FULL_SYSTEM - fatal("fault (%d) detected @ PC %08p", fault, cpuXC->readPC()); + fatal("fault (%s) detected @ PC %08p", fault->name(), cpuXC->readPC()); #endif // FULL_SYSTEM } else { |