diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:08 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:08 -0500 |
commit | 8c1be04af62a333cff54aa5f349e8bb9e203f267 (patch) | |
tree | 17b971887d3ef60aa02e26fdc56086ff396c83a6 /src/arch/arm/isa/decoder | |
parent | 625a43e7c7c4f0bb4fde66cd07a1b74fa3bd1eb0 (diff) | |
download | gem5-8c1be04af62a333cff54aa5f349e8bb9e203f267.tar.xz |
ARM: Decode the thumb versions of the mcr and mrc instructions.
Diffstat (limited to 'src/arch/arm/isa/decoder')
-rw-r--r-- | src/arch/arm/isa/decoder/thumb.isa | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/arch/arm/isa/decoder/thumb.isa b/src/arch/arm/isa/decoder/thumb.isa index da8248683..e8e2d5919 100644 --- a/src/arch/arm/isa/decoder/thumb.isa +++ b/src/arch/arm/isa/decoder/thumb.isa @@ -90,9 +90,12 @@ } 0x1: decode LTCOPROC { 0xa, 0xb: WarnUnimpl::Core_to_extension_transfer(); - default: decode HTOPCODE_4 { - 0x0: WarnUnimpl::mcr(); // mcr2 - 0x1: WarnUnimpl::mrc(); // mrc2 + default: decode CPNUM { + 15: McrMrc15::mcrMrc15(); + default: decode HTOPCODE_4 { + 0x0: WarnUnimpl::mcr(); + 0x1: WarnUnimpl::mrc(); + } } } } @@ -155,9 +158,12 @@ } 0x1: decode LTCOPROC { 0xa, 0xb: WarnUnimpl::Core_to_extension_transfer(); - default: decode HTOPCODE_4 { - 0x0: WarnUnimpl::mcr(); // mcr2 - 0x1: WarnUnimpl::mrc(); // mrc2 + default: decode CPNUM { + 15: McrMrc15::mcr2Mrc215(); + default: decode HTOPCODE_4 { + 0x0: WarnUnimpl::mcr2(); + 0x1: WarnUnimpl::mrc2(); + } } } } |