[llvm-commits] CVS: llvm/lib/Target/X86/Printer.cpp
Chris Lattner
lattner at cs.uiuc.edu
Mon Jan 6 12:52:00 PST 2003
Changes in directory llvm/lib/Target/X86:
Printer.cpp updated: 1.32 -> 1.33
---
Log message:
* Implement rudimentary output of the constant pool
* Implement support for MRMS?m instructions
---
Diffs of the changes:
Index: llvm/lib/Target/X86/Printer.cpp
diff -u llvm/lib/Target/X86/Printer.cpp:1.32 llvm/lib/Target/X86/Printer.cpp:1.33
--- llvm/lib/Target/X86/Printer.cpp:1.32 Sat Dec 28 14:25:38 2002
+++ llvm/lib/Target/X86/Printer.cpp Mon Jan 6 12:50:21 2003
@@ -8,21 +8,24 @@
#include "X86.h"
#include "X86InstrInfo.h"
#include "llvm/Function.h"
+#include "llvm/Constant.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachineConstantPool.h"
#include "llvm/CodeGen/MachineInstr.h"
#include "Support/Statistic.h"
namespace {
struct Printer : public MachineFunctionPass {
std::ostream &O;
-
- Printer(std::ostream &o) : O(o) {}
+ unsigned ConstIdx;
+ Printer(std::ostream &o) : O(o), ConstIdx(0) {}
virtual const char *getPassName() const {
return "X86 Assembly Printer";
}
+ void printConstantPool(MachineConstantPool *MCP, const TargetData &TD);
bool runOnMachineFunction(MachineFunction &F);
};
}
@@ -36,6 +39,21 @@
}
+// printConstantPool - Print out any constants which have been spilled to
+// memory...
+void Printer::printConstantPool(MachineConstantPool *MCP, const TargetData &TD){
+ const std::vector<Constant*> &CP = MCP->getConstants();
+ if (CP.empty()) return;
+
+ for (unsigned i = 0, e = CP.size(); i != e; ++i) {
+ O << "\t.section .rodata\n";
+ O << "\t.align " << (unsigned)TD.getTypeAlignment(CP[i]->getType()) << "\n";
+ O << ".CPI" << i+ConstIdx << ":\t\t\t\t\t;" << *CP[i] << "\n";
+ O << "\t*Constant output not implemented yet!*\n\n";
+ }
+ ConstIdx += CP.size(); // Don't recycle constant pool index numbers
+}
+
/// runOnFunction - This uses the X86InstructionInfo::print method
/// to print assembly for each instruction.
bool Printer::runOnMachineFunction(MachineFunction &MF) {
@@ -43,7 +61,12 @@
const TargetMachine &TM = MF.getTarget();
const MachineInstrInfo &MII = TM.getInstrInfo();
+ // Print out constants referenced by the function
+ printConstantPool(MF.getConstantPool(), TM.getTargetData());
+
// Print out labels for the function.
+ O << "\t.text\n";
+ O << "\t.align 16\n";
O << "\t.globl\t" << MF.getFunction()->getName() << "\n";
O << "\t.type\t" << MF.getFunction()->getName() << ", @function\n";
O << MF.getFunction()->getName() << ":\n";
@@ -72,6 +95,8 @@
}
static bool isMem(const MachineInstr *MI, unsigned Op) {
+ if (MI->getOperand(Op+3).isFrameIndex()) return true;
+ if (MI->getOperand(Op+3).isConstantPoolIndex()) return true;
return Op+4 <= MI->getNumOperands() &&
MI->getOperand(Op ).isRegister() &&isScale(MI->getOperand(Op+1)) &&
MI->getOperand(Op+2).isRegister() &&MI->getOperand(Op+3).isImmediate();
@@ -85,6 +110,7 @@
O << "<" << V->getName() << ">";
return;
}
+ // FALLTHROUGH
case MachineOperand::MO_MachineRegister:
if (MO.getReg() < MRegisterInfo::FirstVirtualRegister)
O << RI.get(MO.getReg()).Name;
@@ -110,6 +136,7 @@
case X86II::Arg8: return "BYTE PTR";
case X86II::Arg16: return "WORD PTR";
case X86II::Arg32: return "DWORD PTR";
+ case X86II::Arg64: return "QWORD PTR";
case X86II::ArgF32: return "DWORD PTR";
case X86II::ArgF64: return "QWORD PTR";
case X86II::ArgF80: return "XWORD PTR";
@@ -119,6 +146,15 @@
static void printMemReference(std::ostream &O, const MachineInstr *MI,
unsigned Op, const MRegisterInfo &RI) {
assert(isMem(MI, Op) && "Invalid memory reference!");
+
+ if (MI->getOperand(Op+3).isFrameIndex()) {
+ O << "[frame slot #" << MI->getOperand(Op+3).getFrameIndex() << "]";
+ return;
+ } else if (MI->getOperand(Op+3).isConstantPoolIndex()) {
+ O << "[.CPI" << MI->getOperand(Op+3).getConstantPoolIndex() << "]";
+ return;
+ }
+
const MachineOperand &BaseReg = MI->getOperand(Op);
int ScaleVal = MI->getOperand(Op+1).getImmedValue();
const MachineOperand &IndexReg = MI->getOperand(Op+2);
@@ -227,7 +263,9 @@
O << getName(MI->getOpCode()) << " ";
printOp(O, MI->getOperand(0), RI);
- if (MI->getNumOperands() == 2 && !MI->getOperand(1).isRegister()) {
+ if (MI->getNumOperands() == 2 &&
+ (!MI->getOperand(1).isRegister() ||
+ MI->getOperand(1).getVRegValueOrNull())) {
O << ", ";
printOp(O, MI->getOperand(1), RI);
}
@@ -269,7 +307,7 @@
assert(isMem(MI, 0) && MI->getNumOperands() == 4+1 &&
MI->getOperand(4).isRegister() && "Bad format for MRMDestMem!");
- O << getName(MI->getOpCode()) << " " << sizePtr (Desc) << " ";
+ O << getName(MI->getOpCode()) << " " << sizePtr(Desc) << " ";
printMemReference(O, MI, 0, RI);
O << ", ";
printOp(O, MI->getOperand(4), RI);
@@ -319,7 +357,7 @@
O << getName(MI->getOpCode()) << " ";
printOp(O, MI->getOperand(0), RI);
- O << ", " << sizePtr (Desc) << " ";
+ O << ", " << sizePtr(Desc) << " ";
printMemReference(O, MI, MI->getNumOperands()-4, RI);
O << "\n";
return;
@@ -359,7 +397,33 @@
return;
}
+ case X86II::MRMS0m: case X86II::MRMS1m:
+ case X86II::MRMS2m: case X86II::MRMS3m:
+ case X86II::MRMS4m: case X86II::MRMS5m:
+ case X86II::MRMS6m: case X86II::MRMS7m: {
+ // In this form, the following are valid formats:
+ // 1. sete [m]
+ // 2. cmp [m], immediate
+ // 2. shl [m], rinput <implicit CL or 1>
+ // 3. sbb [m], immediate
+ //
+ assert(MI->getNumOperands() >= 4 && MI->getNumOperands() <= 5 &&
+ isMem(MI, 0) && "Bad MRMSxM format!");
+ assert((MI->getNumOperands() != 5 || MI->getOperand(4).isImmediate()) &&
+ "Bad MRMSxM format!");
+
+ O << getName(MI->getOpCode()) << " ";
+ O << sizePtr(Desc) << " ";
+ printMemReference(O, MI, 0, RI);
+ if (MI->getNumOperands() == 5) {
+ O << ", ";
+ printOp(O, MI->getOperand(4), RI);
+ }
+ O << "\n";
+ return;
+ }
+
default:
- O << "\t\t\t-"; MI->print(O, TM); break;
+ O << "\tUNKNOWN FORM:\t\t-"; MI->print(O, TM); break;
}
}
More information about the llvm-commits
mailing list