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

Fix instruction description of VMOV (between two ARM core registers and two single-precision resiters) (and do it properly this time!

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159989 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Barton 2012-07-10 12:51:09 +00:00
parent 97a0c6bc91
commit fae96f17b4
4 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Target/ARM/ARMInstrVFP.td
View File

@ -567,8 +567,8 @@ def VMOVRRS : AVConv3I<0b11000101, 0b1010,
bits<4> Rt2; bits<4> Rt2;
// Encode instruction operands. // Encode instruction operands.
let Inst{3-0} = src1{3-0}; let Inst{3-0} = src1{4-1};
let Inst{5} = src1{4}; let Inst{5} = src1{0};
let Inst{15-12} = Rt; let Inst{15-12} = Rt;
let Inst{19-16} = Rt2; let Inst{19-16} = Rt2;
@ -617,8 +617,8 @@ def VMOVSRR : AVConv5I<0b11000100, 0b1010,
bits<4> src2; bits<4> src2;
// Encode instruction operands. // Encode instruction operands.
let Inst{3-0} = dst1{3-0}; let Inst{3-0} = dst1{4-1};
let Inst{5} = dst1{4}; let Inst{5} = dst1{0};
let Inst{15-12} = src1; let Inst{15-12} = src1;
let Inst{19-16} = src2; let Inst{19-16} = src2;

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

@ -4198,9 +4198,9 @@ static DecodeStatus DecodeVMOVSRR(MCInst &Inst, unsigned Insn,
DecodeStatus S = MCDisassembler::Success; DecodeStatus S = MCDisassembler::Success;
unsigned Rt = fieldFromInstruction32(Insn, 12, 4); unsigned Rt = fieldFromInstruction32(Insn, 12, 4);
unsigned Rt2 = fieldFromInstruction32(Insn, 16, 4); unsigned Rt2 = fieldFromInstruction32(Insn, 16, 4);
unsigned Rm = fieldFromInstruction32(Insn, 0, 4); unsigned Rm = fieldFromInstruction32(Insn, 5, 1);
unsigned pred = fieldFromInstruction32(Insn, 28, 4); unsigned pred = fieldFromInstruction32(Insn, 28, 4);
Rm |= fieldFromInstruction32(Insn, 5, 1) << 4; Rm |= fieldFromInstruction32(Insn, 0, 4) << 1;
if (Rt == 0xF || Rt2 == 0xF || Rm == 0x1F) if (Rt == 0xF || Rt2 == 0xF || Rm == 0x1F)
S = MCDisassembler::SoftFail; S = MCDisassembler::SoftFail;
@ -4224,9 +4224,9 @@ static DecodeStatus DecodeVMOVRRS(MCInst &Inst, unsigned Insn,
DecodeStatus S = MCDisassembler::Success; DecodeStatus S = MCDisassembler::Success;
unsigned Rt = fieldFromInstruction32(Insn, 12, 4); unsigned Rt = fieldFromInstruction32(Insn, 12, 4);
unsigned Rt2 = fieldFromInstruction32(Insn, 16, 4); unsigned Rt2 = fieldFromInstruction32(Insn, 16, 4);
unsigned Rm = fieldFromInstruction32(Insn, 0, 4); unsigned Rm = fieldFromInstruction32(Insn, 5, 1);
unsigned pred = fieldFromInstruction32(Insn, 28, 4); unsigned pred = fieldFromInstruction32(Insn, 28, 4);
Rm |= fieldFromInstruction32(Insn, 5, 1) << 4; Rm |= fieldFromInstruction32(Insn, 0, 4) << 1;
if (Rt == 0xF || Rt2 == 0xF || Rm == 0x1F) if (Rt == 0xF || Rt2 == 0xF || Rm == 0x1F)
S = MCDisassembler::SoftFail; S = MCDisassembler::SoftFail;

21
test/MC/ARM/simple-fp-encoding.s
View File

@ -196,6 +196,27 @@
@ CHECK: vmov r0, r1, d16 @ encoding: [0x30,0x0b,0x51,0xec] @ CHECK: vmov r0, r1, d16 @ encoding: [0x30,0x0b,0x51,0xec]
vmov r0, r1, d16 vmov r0, r1, d16
@ Between two single precision registers and two core registers
vmov s3, s4, r1, r2
vmov s2, s3, r1, r2
vmov r1, r2, s3, s4
vmov r1, r2, s2, s3
@ CHECK: vmov s3, s4, r1, r2 @ encoding: [0x31,0x1a,0x42,0xec]
@ CHECK: vmov s2, s3, r1, r2 @ encoding: [0x11,0x1a,0x42,0xec]
@ CHECK: vmov r1, r2, s3, s4 @ encoding: [0x31,0x1a,0x52,0xec]
@ CHECK: vmov r1, r2, s2, s3 @ encoding: [0x11,0x1a,0x52,0xec]
@ Between one double precision register and two core registers
vmov d15, r1, r2
vmov d16, r1, r2
vmov r1, r2, d15
vmov r1, r2, d16
@ CHECK: vmov d15, r1, r2 @ encoding: [0x1f,0x1b,0x42,0xec]
@ CHECK: vmov d16, r1, r2 @ encoding: [0x30,0x1b,0x42,0xec]
@ CHECK: vmov r1, r2, d15 @ encoding: [0x1f,0x1b,0x52,0xec]
@ CHECK: vmov r1, r2, d16 @ encoding: [0x30,0x1b,0x52,0xec]
@ CHECK: vldr d17, [r0] @ encoding: [0x00,0x1b,0xd0,0xed] @ CHECK: vldr d17, [r0] @ encoding: [0x00,0x1b,0xd0,0xed]
@ CHECK: vldr s0, [lr] @ encoding: [0x00,0x0a,0x9e,0xed] @ CHECK: vldr s0, [lr] @ encoding: [0x00,0x0a,0x9e,0xed]
@ CHECK: vldr d0, [lr] @ encoding: [0x00,0x0b,0x9e,0xed] @ CHECK: vldr d0, [lr] @ encoding: [0x00,0x0b,0x9e,0xed]

21
test/MC/Disassembler/ARM/neon.txt
View File

@ -1895,7 +1895,26 @@
# CHECK: vst4.8 {d0[0], d1[0], d2[0], d3[0]}, [r0]! # CHECK: vst4.8 {d0[0], d1[0], d2[0], d3[0]}, [r0]!
0x3d 0x2a 0x5e 0x6c 0x3d 0x2a 0x5e 0x6c
# CHECK: vmovvs r2, lr, s29, s30 # CHECK: vmovvs r2, lr, s27, s28
0x31 0x1a 0x42 0xec
0x11 0x1a 0x42 0xec
0x31 0x1a 0x52 0xec
0x11 0x1a 0x52 0xec
# CHECK: vmov s3, s4, r1, r2
# CHECK: vmov s2, s3, r1, r2
# CHECK: vmov r1, r2, s3, s4
# CHECK: vmov r1, r2, s2, s3
0x1f 0x1b 0x42 0xec
0x30 0x1b 0x42 0xec
0x1f 0x1b 0x52 0xec
0x30 0x1b 0x52 0xec
# CHECK: vmov d15, r1, r2
# CHECK: vmov d16, r1, r2
# CHECK: vmov r1, r2, d15
# CHECK: vmov r1, r2, d16
0xe9 0x1a 0xb2 0x4e 0xe9 0x1a 0xb2 0x4e
# CHECK: vcvttmi.f32.f16 s2, s19 # CHECK: vcvttmi.f32.f16 s2, s19