summaryrefslogtreecommitdiff
path: root/arch/mips/isa_traits.hh
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-03-18 10:52:19 -0500
committerKorey Sewell <ksewell@umich.edu>2006-03-18 10:52:19 -0500
commit3883406a1ca42950f0eed3e2deebbd900e45fc9d (patch)
tree50c71c621ead3d759c7a0c80b668c7e1bec2d002 /arch/mips/isa_traits.hh
parent5c6835ae3fb398fe8aa83ac8b4c806dd6e800b44 (diff)
parent8ddd509c7c98c44b43e481260e915e858c11c659 (diff)
downloadgem5-3883406a1ca42950f0eed3e2deebbd900e45fc9d.tar.xz
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips --HG-- extra : convert_revision : 1646b4fb065e3ed9d8de22e3f5c3aa05a2ef01b6
Diffstat (limited to 'arch/mips/isa_traits.hh')
-rw-r--r--arch/mips/isa_traits.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/isa_traits.hh b/arch/mips/isa_traits.hh
index 1a982c237..8363f42f3 100644
--- a/arch/mips/isa_traits.hh
+++ b/arch/mips/isa_traits.hh
@@ -589,7 +589,8 @@ extern const Addr PageOffset;
static inline void setSyscallReturn(SyscallReturn return_value, RegFile *regs)
{
- panic("Returning from syscall\n");
+ regs->intRegFile[ReturnValueReg1] = 1;
+ //panic("Returning from syscall\n");
}
// Machine operations