diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-09-19 06:17:19 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-09-19 06:17:19 -0700 |
| commit | 110c59b414e1e93004f56cefcb92ea945c3f3713 (patch) | |
| tree | e23d52dd53bc58d0235f6eca7801b545364464ce /src/arch/mips/isa | |
| parent | 7e704c9f51a5ed60e46299f7b1dcef6d668b3ff6 (diff) | |
| download | gem5-110c59b414e1e93004f56cefcb92ea945c3f3713.tar.xz | |
MIPS: Get rid of cruft in the fault classes.
Get rid of Fault classes left over from when this file was copied from Alpha,
and rename ArithmeticOverflowFault to be IntegerOverflowFault and get rid of
the old IntegerOverflowFault stub. The Integer version is what's actually in
the manual, but the Arithmetic version had the implementation.
Diffstat (limited to 'src/arch/mips/isa')
| -rw-r--r-- | src/arch/mips/isa/decoder.isa | 6 | ||||
| -rw-r--r-- | src/arch/mips/isa/formats/unimp.isa | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/arch/mips/isa/decoder.isa b/src/arch/mips/isa/decoder.isa index 4ed8c0c0c..eca7d7411 100644 --- a/src/arch/mips/isa/decoder.isa +++ b/src/arch/mips/isa/decoder.isa @@ -214,7 +214,7 @@ decode OPCODE_HI default Unknown::unknown() { Rd = result = Rs + Rt; if (FULL_SYSTEM && findOverflow(32, result, Rs, Rt)) { - fault = new ArithmeticFault(); + fault = new IntegerOverflowFault(); } }}); 0x1: addu({{ Rd.sw = Rs.sw + Rt.sw;}}); @@ -223,7 +223,7 @@ decode OPCODE_HI default Unknown::unknown() { Rd = result = Rs - Rt; if (FULL_SYSTEM && findOverflow(32, result, Rs, ~Rt)) { - fault = new ArithmeticFault(); + fault = new IntegerOverflowFault(); } }}); 0x3: subu({{ Rd.sw = Rs.sw - Rt.sw; }}); @@ -327,7 +327,7 @@ decode OPCODE_HI default Unknown::unknown() { Rt = result = Rs + imm; if (FULL_SYSTEM && findOverflow(32, result, Rs, imm)) { - fault = new ArithmeticFault(); + fault = new IntegerOverflowFault(); } }}); 0x1: addiu({{ Rt.sw = Rs.sw + imm; }}); diff --git a/src/arch/mips/isa/formats/unimp.isa b/src/arch/mips/isa/formats/unimp.isa index e599510a4..65b4425af 100644 --- a/src/arch/mips/isa/formats/unimp.isa +++ b/src/arch/mips/isa/formats/unimp.isa @@ -186,7 +186,7 @@ output exec {{ panic("attempt to execute unimplemented instruction '%s' " "(inst 0x%08x, opcode 0x%x, binary:%s)", mnemonic, machInst, OPCODE, inst2string(machInst)); - return new UnimplementedOpcodeFault; + return NoFault; } Fault @@ -202,7 +202,7 @@ output exec {{ panic("attempt to execute unimplemented instruction '%s' " "(inst %#08x, opcode %#x, binary:%s)", mnemonic, machInst, OPCODE, inst2string(machInst)); - return new UnimplementedOpcodeFault; + return NoFault; } } @@ -219,7 +219,7 @@ output exec {{ panic("attempt to execute unimplemented instruction '%s' " "(inst %#08x, opcode %#x, binary:%s)", mnemonic, machInst, OPCODE, inst2string(machInst)); - return new UnimplementedOpcodeFault; + return NoFault; } } @@ -236,7 +236,7 @@ output exec {{ panic("attempt to execute unimplemented instruction '%s' " "(inst %#08x, opcode %#x, binary:%s)", mnemonic, machInst, OPCODE, inst2string(machInst)); - return new UnimplementedOpcodeFault; + return NoFault; } } |