diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-16 02:08:13 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-16 02:08:13 -0500 |
commit | 00f451cc02373a22023f1e32ba3823a1d07adb42 (patch) | |
tree | 60746e24b517c20c5c9235c5692c3d0e6814c6bc /arch/alpha/ev5.cc | |
parent | b161d2a731ec7d75bdeb896d1b89efcbb125a09f (diff) | |
download | gem5-00f451cc02373a22023f1e32ba3823a1d07adb42.tar.xz |
Some changes which weren't needed before doing a bk pull were needed afterwards, for some reason.
arch/alpha/ev5.cc:
Took out the unnecessary check for a null Fault pointer.
arch/alpha/isa/mem.isa:
Changed Fault to Fault *, and removed underscores from fault names.
--HG--
extra : convert_revision : 367a58a375f911185ddcc5fc826034af96427461
Diffstat (limited to 'arch/alpha/ev5.cc')
-rw-r--r-- | arch/alpha/ev5.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc index 9d14be4d5..a48609729 100644 --- a/arch/alpha/ev5.cc +++ b/arch/alpha/ev5.cc @@ -180,8 +180,8 @@ AlphaISA::zeroRegisters(CPU *cpu) void ExecContext::ev5_trap(Fault * fault) { - DPRINTF(Fault, "Fault %s at PC: %#x\n", fault ? fault->name : "none", regs.pc); - cpu->recordEvent(csprintf("Fault %s", fault ? fault->name : "none")); + DPRINTF(Fault, "Fault %s at PC: %#x\n", fault->name, regs.pc); + cpu->recordEvent(csprintf("Fault %s", fault->name)); assert(!misspeculating()); kernelStats->fault(fault); |