6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Add instruction encodings / disassembly support for l2rus instructions.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172987 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Osborne 2013-01-20 18:51:15 +00:00
parent c78ec6b6bc
commit b853c415c6
4 changed files with 92 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/Target/XCore/Disassembler/XCoreDisassembler.cpp
View File

@ -157,6 +157,16 @@ static DecodeStatus DecodeL3RSrcDstInstruction(MCInst &Inst,
uint64_t Address, uint64_t Address,
const void *Decoder); const void *Decoder);
static DecodeStatus DecodeL2RUSInstruction(MCInst &Inst,
unsigned Insn,
uint64_t Address,
const void *Decoder);
static DecodeStatus DecodeL2RUSBitpInstruction(MCInst &Inst,
unsigned Insn,
uint64_t Address,
const void *Decoder);
#include "XCoreGenDisassemblerTables.inc" #include "XCoreGenDisassemblerTables.inc"
static DecodeStatus DecodeGRRegsRegisterClass(MCInst &Inst, static DecodeStatus DecodeGRRegsRegisterClass(MCInst &Inst,
@ -366,7 +376,7 @@ DecodeRUSSrcDstBitpInstruction(MCInst &Inst, unsigned Insn, uint64_t Address,
static DecodeStatus static DecodeStatus
DecodeL2OpInstructionFail(MCInst &Inst, unsigned Insn, uint64_t Address, DecodeL2OpInstructionFail(MCInst &Inst, unsigned Insn, uint64_t Address,
const void *Decoder) { const void *Decoder) {
// Try and decode as a L3R instruction. // Try and decode as a L3R / L2RUS instruction.
unsigned Opcode = fieldFromInstruction(Insn, 16, 4) | unsigned Opcode = fieldFromInstruction(Insn, 16, 4) |
fieldFromInstruction(Insn, 27, 5) << 4; fieldFromInstruction(Insn, 27, 5) << 4;
switch (Opcode) { switch (Opcode) {
@ -406,6 +416,15 @@ DecodeL2OpInstructionFail(MCInst &Inst, unsigned Insn, uint64_t Address,
case 0x11c: case 0x11c:
Inst.setOpcode(XCore::ST8_l3r); Inst.setOpcode(XCore::ST8_l3r);
return DecodeL3RInstruction(Inst, Insn, Address, Decoder); return DecodeL3RInstruction(Inst, Insn, Address, Decoder);
case 0x12c:
Inst.setOpcode(XCore::ASHR_l2rus);
return DecodeL2RUSBitpInstruction(Inst, Insn, Address, Decoder);
case 0x13c:
Inst.setOpcode(XCore::LDAWF_l2rus);
return DecodeL2RUSInstruction(Inst, Insn, Address, Decoder);
case 0x14c:
Inst.setOpcode(XCore::LDAWB_l2rus);
return DecodeL2RUSInstruction(Inst, Insn, Address, Decoder);
case 0x15c: case 0x15c:
Inst.setOpcode(XCore::CRC_l3r); Inst.setOpcode(XCore::CRC_l3r);
return DecodeL3RSrcDstInstruction(Inst, Insn, Address, Decoder); return DecodeL3RSrcDstInstruction(Inst, Insn, Address, Decoder);
@ -515,6 +534,34 @@ DecodeL3RSrcDstInstruction(MCInst &Inst, unsigned Insn, uint64_t Address,
return S; return S;
} }
static DecodeStatus
DecodeL2RUSInstruction(MCInst &Inst, unsigned Insn, uint64_t Address,
const void *Decoder) {
unsigned Op1, Op2, Op3;
DecodeStatus S =
Decode3OpInstruction(fieldFromInstruction(Insn, 0, 16), Op1, Op2, Op3);
if (S == MCDisassembler::Success) {
DecodeGRRegsRegisterClass(Inst, Op1, Address, Decoder);
DecodeGRRegsRegisterClass(Inst, Op2, Address, Decoder);
Inst.addOperand(MCOperand::CreateImm(Op3));
}
return S;
}
static DecodeStatus
DecodeL2RUSBitpInstruction(MCInst &Inst, unsigned Insn, uint64_t Address,
const void *Decoder) {
unsigned Op1, Op2, Op3;
DecodeStatus S =
Decode3OpInstruction(fieldFromInstruction(Insn, 0, 16), Op1, Op2, Op3);
if (S == MCDisassembler::Success) {
DecodeGRRegsRegisterClass(Inst, Op1, Address, Decoder);
DecodeGRRegsRegisterClass(Inst, Op2, Address, Decoder);
DecodeBitpOperand(Inst, Op3, Address, Decoder);
}
return S;
}
MCDisassembler::DecodeStatus MCDisassembler::DecodeStatus
XCoreDisassembler::getInstruction(MCInst &instr, XCoreDisassembler::getInstruction(MCInst &instr,
uint64_t &Size, uint64_t &Size,

15
lib/Target/XCore/XCoreInstrFormats.td
View File

@ -68,8 +68,21 @@ class _F2RUSBitp<bits<5> opc, dag outs, dag ins, string asmstr,
let DecoderMethod = "Decode2RUSBitpInstruction"; let DecoderMethod = "Decode2RUSBitpInstruction";
} }
class _FL2RUS<dag outs, dag ins, string asmstr, list<dag> pattern> class _FL2RUS<bits<9> opc, dag outs, dag ins, string asmstr, list<dag> pattern>
: InstXCore<4, outs, ins, asmstr, pattern> { : InstXCore<4, outs, ins, asmstr, pattern> {
let Inst{31-27} = opc{8-4};
let Inst{26-20} = 0b1111110;
let Inst{19-16} = opc{3-0};
let Inst{15-11} = 0b11111;
let DecoderMethod = "DecodeL2RUSInstruction";
}
// L2RUS with bitp operand
class _FL2RUSBitp<bits<9> opc, dag outs, dag ins, string asmstr,
list<dag> pattern>
: _FL2RUS<opc, outs, ins, asmstr, pattern> {
let DecoderMethod = "DecodeL2RUSBitpInstruction";
} }
class _FRU6<dag outs, dag ins, string asmstr, list<dag> pattern> class _FRU6<dag outs, dag ins, string asmstr, list<dag> pattern>

40
lib/Target/XCore/XCoreInstrInfo.td
View File

@ -237,25 +237,25 @@ class F3R_np<bits<5> opc, string OpcStr> :
// Three operand long // Three operand long
/// FL3R_L2RUS multiclass - Define a normal FL3R/FL2RUS pattern in one shot. /// FL3R_L2RUS multiclass - Define a normal FL3R/FL2RUS pattern in one shot.
multiclass FL3R_L2RUS<bits<9> opc, string OpcStr, SDNode OpNode> { multiclass FL3R_L2RUS<bits<9> opc1, bits<9> opc2, string OpcStr,
def _l3r: _FL3R<opc, (outs GRRegs:$dst), (ins GRRegs:$b, GRRegs:$c), SDNode OpNode> {
def _l3r: _FL3R<opc1, (outs GRRegs:$dst), (ins GRRegs:$b, GRRegs:$c),
!strconcat(OpcStr, " $dst, $b, $c"), !strconcat(OpcStr, " $dst, $b, $c"),
[(set GRRegs:$dst, (OpNode GRRegs:$b, GRRegs:$c))]>; [(set GRRegs:$dst, (OpNode GRRegs:$b, GRRegs:$c))]>;
def _l2rus : _FL2RUS< def _l2rus : _FL2RUS<opc2, (outs GRRegs:$dst), (ins GRRegs:$b, i32imm:$c),
(outs GRRegs:$dst), (ins GRRegs:$b, i32imm:$c), !strconcat(OpcStr, " $dst, $b, $c"),
!strconcat(OpcStr, " $dst, $b, $c"), [(set GRRegs:$dst, (OpNode GRRegs:$b, immUs:$c))]>;
[(set GRRegs:$dst, (OpNode GRRegs:$b, immUs:$c))]>;
} }
/// FL3R_L2RUS multiclass - Define a normal FL3R/FL2RUS pattern in one shot. /// FL3R_L2RUS multiclass - Define a normal FL3R/FL2RUS pattern in one shot.
multiclass FL3R_L2RBITP<bits<9> opc, string OpcStr, SDNode OpNode> { multiclass FL3R_L2RBITP<bits<9> opc1, bits<9> opc2, string OpcStr,
def _l3r: _FL3R<opc, (outs GRRegs:$dst), (ins GRRegs:$b, GRRegs:$c), SDNode OpNode> {
def _l3r: _FL3R<opc1, (outs GRRegs:$dst), (ins GRRegs:$b, GRRegs:$c),
!strconcat(OpcStr, " $dst, $b, $c"), !strconcat(OpcStr, " $dst, $b, $c"),
[(set GRRegs:$dst, (OpNode GRRegs:$b, GRRegs:$c))]>; [(set GRRegs:$dst, (OpNode GRRegs:$b, GRRegs:$c))]>;
def _l2rus : _FL2RUS< def _l2rus : _FL2RUSBitp<opc2, (outs GRRegs:$dst), (ins GRRegs:$b, i32imm:$c),
(outs GRRegs:$dst), (ins GRRegs:$b, i32imm:$c), !strconcat(OpcStr, " $dst, $b, $c"),
!strconcat(OpcStr, " $dst, $b, $c"), [(set GRRegs:$dst, (OpNode GRRegs:$b, immBitp:$c))]>;
[(set GRRegs:$dst, (OpNode GRRegs:$b, immBitp:$c))]>;
} }
class FL3R<bits<9> opc, string OpcStr, SDNode OpNode> : class FL3R<bits<9> opc, string OpcStr, SDNode OpNode> :
@ -430,10 +430,9 @@ def LDAWF_l3r : _FL3R<0b000111100, (outs GRRegs:$dst),
(ldawf GRRegs:$addr, GRRegs:$offset))]>; (ldawf GRRegs:$addr, GRRegs:$offset))]>;
let neverHasSideEffects = 1 in let neverHasSideEffects = 1 in
def LDAWF_l2rus : _FL2RUS<(outs GRRegs:$dst), def LDAWF_l2rus : _FL2RUS<0b100111100, (outs GRRegs:$dst),
(ins GRRegs:$addr, i32imm:$offset), (ins GRRegs:$addr, i32imm:$offset),
"ldaw $dst, $addr[$offset]", "ldaw $dst, $addr[$offset]", []>;
[]>;
def LDAWB_l3r : _FL3R<0b001001100, (outs GRRegs:$dst), def LDAWB_l3r : _FL3R<0b001001100, (outs GRRegs:$dst),
(ins GRRegs:$addr, GRRegs:$offset), (ins GRRegs:$addr, GRRegs:$offset),
@ -442,10 +441,9 @@ def LDAWB_l3r : _FL3R<0b001001100, (outs GRRegs:$dst),
(ldawb GRRegs:$addr, GRRegs:$offset))]>; (ldawb GRRegs:$addr, GRRegs:$offset))]>;
let neverHasSideEffects = 1 in let neverHasSideEffects = 1 in
def LDAWB_l2rus : _FL2RUS<(outs GRRegs:$dst), def LDAWB_l2rus : _FL2RUS<0b101001100, (outs GRRegs:$dst),
(ins GRRegs:$addr, i32imm:$offset), (ins GRRegs:$addr, i32imm:$offset),
"ldaw $dst, $addr[-$offset]", "ldaw $dst, $addr[-$offset]", []>;
[]>;
def LDA16F_l3r : _FL3R<0b001011100, (outs GRRegs:$dst), def LDA16F_l3r : _FL3R<0b001011100, (outs GRRegs:$dst),
(ins GRRegs:$addr, GRRegs:$offset), (ins GRRegs:$addr, GRRegs:$offset),
@ -468,7 +466,7 @@ def REMS_l3r : FL3R<0b110001100, "rems", srem>;
def REMU_l3r : FL3R<0b110011100, "remu", urem>; def REMU_l3r : FL3R<0b110011100, "remu", urem>;
} }
def XOR_l3r : FL3R<0b000011100, "xor", xor>; def XOR_l3r : FL3R<0b000011100, "xor", xor>;
defm ASHR : FL3R_L2RBITP<0b000101100, "ashr", sra>; defm ASHR : FL3R_L2RBITP<0b000101100, 0b100101100, "ashr", sra>;
let Constraints = "$src1 = $dst" in let Constraints = "$src1 = $dst" in
def CRC_l3r : _FL3RSrcDst<0b101011100, (outs GRRegs:$dst), def CRC_l3r : _FL3RSrcDst<0b101011100, (outs GRRegs:$dst),

11
test/MC/Disassembler/XCore/xcore.txt
View File

@ -301,3 +301,14 @@
# CHECK: xor r4, r3, r9 # CHECK: xor r4, r3, r9
0xcd 0xfc 0xec 0x0f 0xcd 0xfc 0xec 0x0f
# l2rus instructions
# CHECK: ashr r5, r1, 3
0x57 0xf8 0xec 0x97
# CHECK: ldaw r11, r10[6]
0x7a 0xfc 0xec 0x9f
# CHECK: ldaw r8, r2[-9]
0x09 0xfd 0xec 0xa7