6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-23 14:25:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix a LDRT/LDRBT decoding bug where for Encoding A2, if Inst{4} != 0, we should reject the instruction

Browse Source 
as invalid.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128734 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Johnny Chen
2011-04-01 20:21:38 +00:00
parent ce1498bdbe
commit ec30f6f5e5
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
View File

@@ -1106,6 +1106,14 @@ static bool DisassembleLdStFrm(MCInst &MI, unsigned Opcode, uint32_t insn,
MI.addOperand(MCOperand::CreateImm(Offset)); MI.addOperand(MCOperand::CreateImm(Offset));
OpIdx += 1; OpIdx += 1;
} else { } else {
// The opcode ARM::LDRT actually corresponds to both Encoding A1 and A2 of
// A8.6.86 LDRT. So if Inst{4} != 0 while Inst{25} (getIBit(insn)) == 1,
// we should reject this insn as invalid.
//
// Ditto for LDRBT.
if ((Opcode == ARM::LDRT || Opcode == ARM::LDRBT) && (slice(insn,4,4) == 1))
return false;
// Disassemble the offset reg (Rm), shift type, and immediate shift length. // Disassemble the offset reg (Rm), shift type, and immediate shift length.
MI.addOperand(MCOperand::CreateReg(getRegisterEnum(B, ARM::GPRRegClassID, MI.addOperand(MCOperand::CreateReg(getRegisterEnum(B, ARM::GPRRegClassID,
decodeRm(insn)))); decodeRm(insn))));

3
test/MC/Disassembler/ARM/arm-tests.txt
View File

@@ -45,6 +45,9 @@
# CHECK: ldr r0, [r2], #15 # CHECK: ldr r0, [r2], #15
0x0f 0x00 0x92 0xe4 0x0f 0x00 0x92 0xe4
# CHECK: ldr r5, [r7, -r10, lsl #2]
0x0a 0x51 0x17 0xe7
# CHECK: ldrh r0, [r2], #0 # CHECK: ldrh r0, [r2], #0
0xb0 0x00 0xd2 0xe0 0xb0 0x00 0xd2 0xe0

12
test/MC/Disassembler/ARM/invalid-LDRT-arm.txt Normal file
View File

@@ -0,0 +1,12 @@
# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
# Opcode=0 Name=PHI Format=(42)
# 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0
# -------------------------------------------------------------------------------------------------
# | 1: 1: 1: 0| 0: 1: 1: 0| 0: 0: 1: 1| 0: 1: 1: 1| 0: 1: 0: 1| 0: 0: 0: 1| 0: 0: 0: 1| 0: 0: 0: 0|
# -------------------------------------------------------------------------------------------------
#
# The bytes have Inst{4} = 1, so it's not an LDRT Encoding A2 instruction.
0x10 0x51 0x37 0xe6