6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-20 10:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Distinguish between pcrel imm operands and 'normal' ones. Fix fixes gross weirdness of asmprinting.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84710 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Anton Korobeynikov 2009-10-21 00:13:25 +00:00
parent dc2165e18e
commit 8ecaf237e0
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
View File

@ -65,6 +65,9 @@ namespace {
}
void printOperand(const MachineInstr *MI, int OpNum,
const char* Modifier = 0);
void printPCRelImmOperand(const MachineInstr *MI, int OpNum) {
printOperand(MI, OpNum);
}
void printSrcMemOperand(const MachineInstr *MI, int OpNum,
const char* Modifier = 0);
void printCCOperand(const MachineInstr *MI, int OpNum);

22
lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp
View File

@ -35,6 +35,16 @@ void MSP430InstPrinter::printInst(const MCInst *MI) {
printInstruction(MI);
}
void MSP430InstPrinter::printPCRelImmOperand(const MCInst *MI, unsigned OpNo) {
const MCOperand &Op = MI->getOperand(OpNo);
if (Op.isImm())
O << Op.getImm();
else {
assert(Op.isExpr() && "unknown pcrel immediate operand");
Op.getExpr()->print(O, &MAI);
}
}
void MSP430InstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
const char *Modifier) {
const MCOperand &Op = MI->getOperand(OpNo);
@ -44,8 +54,7 @@ void MSP430InstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
O << '#' << Op.getImm();
} else {
assert(Op.isExpr() && "unknown operand kind in printOperand");
bool isMemOp = Modifier && !strcmp(Modifier, "mem");
O << (isMemOp ? '&' : '#');
O << '#';
Op.getExpr()->print(O, &MAI);
}
}
@ -56,9 +65,10 @@ void MSP430InstPrinter::printSrcMemOperand(const MCInst *MI, unsigned OpNo,
const MCOperand &Disp = MI->getOperand(OpNo+1);
// FIXME: move global to displacement field!
if (Base.isExpr())
printOperand(MI, OpNo, "mem");
else if (Disp.isImm() && !Base.isReg())
if (Base.isExpr()) {
O << '&';
Base.getExpr()->print(O, &MAI);
} else if (Disp.isImm() && !Base.isReg())
printOperand(MI, OpNo);
else if (Base.isReg()) {
if (Disp.getImm()) {
@ -74,8 +84,8 @@ void MSP430InstPrinter::printSrcMemOperand(const MCInst *MI, unsigned OpNo,
Disp.dump();
llvm_unreachable("Unsupported memory operand");
}
}
void MSP430InstPrinter::printCCOperand(const MCInst *MI, unsigned OpNo) {
unsigned CC = MI->getOperand(OpNo).getImm();

3
lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.h
View File

@ -35,10 +35,9 @@ namespace llvm
void printOperand(const MCInst *MI, unsigned OpNo,
const char *Modifier = 0);
void printPCRelImmOperand(const MCInst *MI, unsigned OpNo);
void printSrcMemOperand(const MCInst *MI, unsigned OpNo,
const char *Modifier = 0);
void printCCOperand(const MCInst *MI, unsigned OpNo);
};

4
lib/Target/MSP430/MSP430InstrInfo.td
View File

@ -71,7 +71,9 @@ def memdst : Operand<i16> {
}
// Branch targets have OtherVT type.
def brtarget : Operand<OtherVT>;
def brtarget : Operand<OtherVT> {
let PrintMethod = "printPCRelImmOperand";
}
// Operand for printing out a condition code.
def cc : Operand<i8> {