From f64c8bafd2609ad21535cef3ee9d8a0ac41f1f8c Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Wed, 2 Jun 2010 12:58:12 -0500 Subject: ARM: BXJ should be BX when there is no J support --- src/arch/arm/isa/decoder/arm.isa | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/arch/arm/isa/decoder') diff --git a/src/arch/arm/isa/decoder/arm.isa b/src/arch/arm/isa/decoder/arm.isa index 31456dfc6..4c5d71ad9 100644 --- a/src/arch/arm/isa/decoder/arm.isa +++ b/src/arch/arm/isa/decoder/arm.isa @@ -67,10 +67,8 @@ format DataOp { 1: decode OPCODE_7 { 0x0: decode MISC_OPCODE { 0x0: ArmMsrMrs::armMsrMrs(); - 0x1: ArmBxClz::armBxClz(); - 0x2: decode OPCODE { - 0x9: WarnUnimpl::bxj(); - } + // bxj unimplemented, treated as bx + 0x1,0x2: ArmBxClz::armBxClz(); 0x3: decode OPCODE { 0x9: ArmBlxReg::armBlxReg(); } -- cgit v1.2.3