diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:03 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:03 -0500 |
commit | 274badd201e634b646a7d6cc5d64def956dd5e80 (patch) | |
tree | 49e52b3ed03b6582abdc3d54a86537e9f41f0c76 /src/arch/arm/isa/decoder | |
parent | b6b2f8891a809eeec0409906f820e3e2dc60caa0 (diff) | |
download | gem5-274badd201e634b646a7d6cc5d64def956dd5e80.tar.xz |
ARM: Hook the new branch instructions into the 16 bit thumb decoder.
Diffstat (limited to 'src/arch/arm/isa/decoder')
-rw-r--r-- | src/arch/arm/isa/decoder/thumb.isa | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/arch/arm/isa/decoder/thumb.isa b/src/arch/arm/isa/decoder/thumb.isa index 9071649a2..349a4a87d 100644 --- a/src/arch/arm/isa/decoder/thumb.isa +++ b/src/arch/arm/isa/decoder/thumb.isa @@ -58,14 +58,10 @@ } 0x6: decode TOPCODE_12_11 { 0x0, 0x1: Thumb16MacroMem::thumb16MacroMem(); - default: decode TOPCODE_11_8 { - 0xe: WarnUnimpl::undefined(); // permanently undefined - 0xf: WarnUnimpl::svc(); // formerly swi - default: WarnUnimpl::b(); // conditional - } + 0x2, 0x3: Thumb16CondBranchAndSvc::thumb16CondBranchAndSvc(); } 0x7: decode TOPCODE_12_11 { - 0x0: WarnUnimpl::b(); // unconditional + 0x0: Thumb16UncondBranch::thumb16UncondBranch(); } } @@ -165,7 +161,7 @@ 0x0: Thumb32DataProcModImm::thumb32DataProcModImm(); 0x1: WarnUnimpl::Data_processing_plain_binary_immediate(); } - 0x1: WarnUnimpl::Branches_and_miscellaneous_control(); + 0x1: BranchesAndMiscCtrl::branchesAndMiscCtrl(); } 0x3: decode HTOPCODE_10_9 { 0x0: decode HTOPCODE_4 { |