summaryrefslogtreecommitdiff
path: root/arch/mips/isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-04-18 09:44:45 -0400
committerGabe Black <gblack@eecs.umich.edu>2006-04-18 09:44:45 -0400
commitcae6b571d63b38c3177f5b47891021ba69386453 (patch)
tree6039a7ce3381b6c5448fc127bdb7b063ae52115e /arch/mips/isa
parent0534e355b77497a1272f6078edae1692d87a15cf (diff)
parent609c4ecea618c6406e50432e38882925db7b7ede (diff)
downloadgem5-cae6b571d63b38c3177f5b47891021ba69386453.tar.xz
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem --HG-- extra : convert_revision : 3eb97976caf57e43119a998c31128ca6f163c05b
Diffstat (limited to 'arch/mips/isa')
-rw-r--r--arch/mips/isa/decoder.isa2
-rw-r--r--arch/mips/isa/operands.isa1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/isa/decoder.isa b/arch/mips/isa/decoder.isa
index eaa7b7248..077f0afd0 100644
--- a/arch/mips/isa/decoder.isa
+++ b/arch/mips/isa/decoder.isa
@@ -119,7 +119,7 @@ decode OPCODE_HI default Unknown::unknown() {
}
format BasicOp {
- 0x4: syscall({{ xc->syscall(); }},IsNonSpeculative);
+ 0x4: syscall({{ xc->syscall(R2); }},IsNonSpeculative);
0x5: break({{ panic("Not implemented break yet"); }},IsNonSpeculative);
0x7: sync({{ panic("Not implemented sync yet"); }},IsNonSpeculative);
}
diff --git a/arch/mips/isa/operands.isa b/arch/mips/isa/operands.isa
index 5bc32d6e1..2fa3238dc 100644
--- a/arch/mips/isa/operands.isa
+++ b/arch/mips/isa/operands.isa
@@ -18,6 +18,7 @@ def operands {{
'Rt': ('IntReg', 'uw', 'RT', 'IsInteger', 3),
'r31': ('IntReg', 'uw','R31','IsInteger', 4),
'R0': ('IntReg', 'uw','R0', 'IsInteger', 5),
+ 'R2': ('IntReg', 'uw','2', 'IsInteger', 5),
'IntImm': ('IntReg', 'uw', 'INTIMM', 'IsInteger', 3),