diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:02 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:02 -0500 |
| commit | d082705b01d9ce648651c147636e8e9976406ab2 (patch) | |
| tree | 08e02b2c537ce646ad53caccd6c5d5885b678c70 /src/arch/arm/isa/decoder | |
| parent | 98693436368ef671681859d95f6bc4a0542a6a37 (diff) | |
| download | gem5-d082705b01d9ce648651c147636e8e9976406ab2.tar.xz | |
ARM: Hook the new branch instructions into the ARM decoder.
Diffstat (limited to 'src/arch/arm/isa/decoder')
| -rw-r--r-- | src/arch/arm/isa/decoder/arm.isa | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/arch/arm/isa/decoder/arm.isa b/src/arch/arm/isa/decoder/arm.isa index 717bd1857..06f540717 100644 --- a/src/arch/arm/isa/decoder/arm.isa +++ b/src/arch/arm/isa/decoder/arm.isa @@ -129,7 +129,7 @@ format DataOp { } } 0x1: decode OPCODE { - 0x9: BranchExchange::oldbx({{ }}); + 0x9: ArmBx::armBx(); 0xb: PredOp::clz({{ Rd = ((Rm == 0) ? 32 : (31 - findMsbSet(Rm))); }}); @@ -138,7 +138,7 @@ format DataOp { 0x9: WarnUnimpl::bxj(); } 0x3: decode OPCODE { - 0x9: BranchExchange::oldblx({{ }}, Link); + 0x9: ArmBlxReg::armBlxReg(); } 0x5: decode OPCODE { 0x8: WarnUnimpl::qadd(); @@ -264,9 +264,8 @@ format DataOp { } 0x4: ArmMacroMem::armMacroMem(); 0x5: decode OPCODE_24 { - // Branch (and Link) Instructions - 0: Branch::oldb({{ }}); - 1: Branch::oldbl({{ }}, Link); + 0: ArmBBlxImm::armBBlxImm(); + 1: ArmBlBlxImm::armBlBlxImm(); } 0x6: decode CPNUM { 0xb: decode LOADOP { |