diff options
| author | Owen Anderson <resistor@mac.com> | 2011-08-15 20:08:25 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2011-08-15 20:08:25 +0000 |
| commit | 5df7ef6cdbdaaa6bf3bf12b959557a44fbf250a6 (patch) | |
| tree | 3d9e680182358f9a777b2281196a78ff87b262fe | |
| parent | 5a1a67cd3f35b82bcae5dc5dce6ffd9b9549a5c0 (diff) | |
Fix incorrect encoding of UMAAL and friends. Patch by James Molloy.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137641 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/ARMInstrInfo.td | 4 | ||||
| -rw-r--r-- | test/MC/ARM/basic-arm-instructions.s | 4 | ||||
| -rw-r--r-- | test/MC/Disassembler/ARM/basic-arm-instructions.txt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td index 9e0e56e640..1377928355 100644 --- a/lib/Target/ARM/ARMInstrInfo.td +++ b/lib/Target/ARM/ARMInstrInfo.td @@ -3461,8 +3461,8 @@ def UMAAL : AMul1I <0b0000010, (outs GPR:$RdLo, GPR:$RdHi), bits<4> RdHi; bits<4> Rm; bits<4> Rn; - let Inst{19-16} = RdLo; - let Inst{15-12} = RdHi; + let Inst{19-16} = RdHi; + let Inst{15-12} = RdLo; let Inst{11-8} = Rm; let Inst{3-0} = Rn; } diff --git a/test/MC/ARM/basic-arm-instructions.s b/test/MC/ARM/basic-arm-instructions.s index 3d0fffc848..1a262356fc 100644 --- a/test/MC/ARM/basic-arm-instructions.s +++ b/test/MC/ARM/basic-arm-instructions.s @@ -2197,8 +2197,8 @@ Lforward: umaal r3, r4, r5, r6 umaallt r3, r4, r5, r6 -@ CHECK: umaal r3, r4, r5, r6 @ encoding: [0x95,0x46,0x43,0xe0] -@ CHECK: umaallt r3, r4, r5, r6 @ encoding: [0x95,0x46,0x43,0xb0] +@ CHECK: umaal r3, r4, r5, r6 @ encoding: [0x95,0x36,0x44,0xe0] +@ CHECK: umaallt r3, r4, r5, r6 @ encoding: [0x95,0x36,0x44,0xb0] @------------------------------------------------------------------------------ diff --git a/test/MC/Disassembler/ARM/basic-arm-instructions.txt b/test/MC/Disassembler/ARM/basic-arm-instructions.txt index f4143a1084..306b906eab 100644 --- a/test/MC/Disassembler/ARM/basic-arm-instructions.txt +++ b/test/MC/Disassembler/ARM/basic-arm-instructions.txt @@ -2090,8 +2090,8 @@ # CHECK: umaal r3, r4, r5, r6 # CHECK: umaallt r3, r4, r5, r6 -0x95 0x46 0x43 0xe0 -0x95 0x46 0x43 0xb0 +0x95 0x36 0x44 0xe0 +0x95 0x36 0x44 0xb0 #------------------------------------------------------------------------------ |