diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:09 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:09 -0500 |
| commit | eb0823c4f2666e6b3de441fa661e9e17ef908d8f (patch) | |
| tree | 4fe0a87da67a488b6c01397de47f11c1a84f6a48 /src/arch/arm/insts/static_inst.hh | |
| parent | bb0d390105073f3fe827026d36cd950005a15e46 (diff) | |
| download | gem5-eb0823c4f2666e6b3de441fa661e9e17ef908d8f.tar.xz | |
ARM: Fix the implementation of BX to work in thumbEE mode.
Diffstat (limited to 'src/arch/arm/insts/static_inst.hh')
| -rw-r--r-- | src/arch/arm/insts/static_inst.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/arm/insts/static_inst.hh b/src/arch/arm/insts/static_inst.hh index 2c83ee79c..23c04306d 100644 --- a/src/arch/arm/insts/static_inst.hh +++ b/src/arch/arm/insts/static_inst.hh @@ -238,9 +238,9 @@ class ArmStaticInst : public StaticInst Addr newPc = (val & ~PcModeMask); if (thumbEE) { if (bits(newPc, 0)) { - warn("Bad thumbEE interworking branch address %#x.\n", newPc); - } else { newPc = newPc & ~mask(1); + } else { + panic("Bad thumbEE interworking branch address %#x.\n", newPc); } } else { if (bits(newPc, 0)) { |