diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2009-11-10 21:12:53 -0800 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2009-11-10 21:12:53 -0800 |
commit | 850eb54a7c3408b887a0f6663c021fd61f227204 (patch) | |
tree | 5412bd92b00a61c4e622819d9b823589b9c5e4a8 /src/arch/arm/isa | |
parent | b8120f6c38f212acbfd246a3081842a9e3d06eb3 (diff) | |
parent | 2e28da5583814efe1e0a09718f6a674f983d12d1 (diff) | |
download | gem5-850eb54a7c3408b887a0f6663c021fd61f227204.tar.xz |
Merge with the head.
Diffstat (limited to 'src/arch/arm/isa')
-rw-r--r-- | src/arch/arm/isa/formats/unimp.isa | 2 | ||||
-rw-r--r-- | src/arch/arm/isa/formats/unknown.isa | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/arm/isa/formats/unimp.isa b/src/arch/arm/isa/formats/unimp.isa index c82bb41c6..6909c3f85 100644 --- a/src/arch/arm/isa/formats/unimp.isa +++ b/src/arch/arm/isa/formats/unimp.isa @@ -115,7 +115,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 new UnimpFault("Unimplemented Instruction"); } Fault diff --git a/src/arch/arm/isa/formats/unknown.isa b/src/arch/arm/isa/formats/unknown.isa index 2ad7a2506..97a0caa6b 100644 --- a/src/arch/arm/isa/formats/unknown.isa +++ b/src/arch/arm/isa/formats/unknown.isa @@ -74,7 +74,7 @@ output exec {{ { panic("attempt to execute unknown instruction " "(inst 0x%08x, opcode 0x%x, binary: %s)", machInst, OPCODE, inst2string(machInst)); - return new UnimplementedOpcodeFault; + return new UnimpFault("Unimplemented Instruction"); } }}; |