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

Reapply 116059, this time without the fatfingered pasto at the top.

Browse Source 
''const'ify getMachineOpValue() and associated helpers.'

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116067 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach 2010-10-08 17:45:54 +00:00
parent 2cee75a254
commit 3e09413c2c
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Target/ARM/ARMCodeEmitter.cpp
View File

@ -150,8 +150,9 @@ namespace {
/// getMachineOpValue - Return binary encoding of operand. If the machine /// getMachineOpValue - Return binary encoding of operand. If the machine
/// operand requires relocation, record the relocation and return zero. /// operand requires relocation, record the relocation and return zero.
unsigned getMachineOpValue(const MachineInstr &MI,const MachineOperand &MO); unsigned getMachineOpValue(const MachineInstr &MI,
unsigned getMachineOpValue(const MachineInstr &MI, unsigned OpIdx) { const MachineOperand &MO) const;
unsigned getMachineOpValue(const MachineInstr &MI, unsigned OpIdx) const {
return getMachineOpValue(MI, MI.getOperand(OpIdx)); return getMachineOpValue(MI, MI.getOperand(OpIdx));
} }
@ -169,12 +170,12 @@ namespace {
/// fixed up by the relocation stage. /// fixed up by the relocation stage.
void emitGlobalAddress(const GlobalValue *GV, unsigned Reloc, void emitGlobalAddress(const GlobalValue *GV, unsigned Reloc,
bool MayNeedFarStub, bool Indirect, bool MayNeedFarStub, bool Indirect,
intptr_t ACPV = 0); intptr_t ACPV = 0) const;
void emitExternalSymbolAddress(const char *ES, unsigned Reloc); void emitExternalSymbolAddress(const char *ES, unsigned Reloc) const;
void emitConstPoolAddress(unsigned CPI, unsigned Reloc); void emitConstPoolAddress(unsigned CPI, unsigned Reloc) const;
void emitJumpTableAddress(unsigned JTIndex, unsigned Reloc); void emitJumpTableAddress(unsigned JTIndex, unsigned Reloc) const;
void emitMachineBasicBlock(MachineBasicBlock *BB, unsigned Reloc, void emitMachineBasicBlock(MachineBasicBlock *BB, unsigned Reloc,
intptr_t JTBase = 0); intptr_t JTBase = 0) const;
}; };
} }
@ -262,7 +263,7 @@ unsigned ARMCodeEmitter::getMovi32Value(const MachineInstr &MI,
/// getMachineOpValue - Return binary encoding of operand. If the machine /// getMachineOpValue - Return binary encoding of operand. If the machine
/// operand requires relocation, record the relocation and return zero. /// operand requires relocation, record the relocation and return zero.
unsigned ARMCodeEmitter::getMachineOpValue(const MachineInstr &MI, unsigned ARMCodeEmitter::getMachineOpValue(const MachineInstr &MI,
const MachineOperand &MO) { const MachineOperand &MO) const {
if (MO.isReg()) if (MO.isReg())
return getARMRegisterNumbering(MO.getReg()); return getARMRegisterNumbering(MO.getReg());
else if (MO.isImm()) else if (MO.isImm())
@ -294,7 +295,7 @@ unsigned ARMCodeEmitter::getMachineOpValue(const MachineInstr &MI,
/// ///
void ARMCodeEmitter::emitGlobalAddress(const GlobalValue *GV, unsigned Reloc, void ARMCodeEmitter::emitGlobalAddress(const GlobalValue *GV, unsigned Reloc,
bool MayNeedFarStub, bool Indirect, bool MayNeedFarStub, bool Indirect,
intptr_t ACPV) { intptr_t ACPV) const {
MachineRelocation MR = Indirect MachineRelocation MR = Indirect
? MachineRelocation::getIndirectSymbol(MCE.getCurrentPCOffset(), Reloc, ? MachineRelocation::getIndirectSymbol(MCE.getCurrentPCOffset(), Reloc,
const_cast<GlobalValue *>(GV), const_cast<GlobalValue *>(GV),
@ -308,7 +309,8 @@ void ARMCodeEmitter::emitGlobalAddress(const GlobalValue *GV, unsigned Reloc,
/// emitExternalSymbolAddress - Arrange for the address of an external symbol to /// emitExternalSymbolAddress - Arrange for the address of an external symbol to
/// be emitted to the current location in the function, and allow it to be PC /// be emitted to the current location in the function, and allow it to be PC
/// relative. /// relative.
void ARMCodeEmitter::emitExternalSymbolAddress(const char *ES, unsigned Reloc) { void ARMCodeEmitter::
emitExternalSymbolAddress(const char *ES, unsigned Reloc) const {
MCE.addRelocation(MachineRelocation::getExtSym(MCE.getCurrentPCOffset(), MCE.addRelocation(MachineRelocation::getExtSym(MCE.getCurrentPCOffset(),
Reloc, ES)); Reloc, ES));
} }
@ -316,7 +318,7 @@ void ARMCodeEmitter::emitExternalSymbolAddress(const char *ES, unsigned Reloc) {
/// emitConstPoolAddress - Arrange for the address of an constant pool /// emitConstPoolAddress - Arrange for the address of an constant pool
/// to be emitted to the current location in the function, and allow it to be PC /// to be emitted to the current location in the function, and allow it to be PC
/// relative. /// relative.
void ARMCodeEmitter::emitConstPoolAddress(unsigned CPI, unsigned Reloc) { void ARMCodeEmitter::emitConstPoolAddress(unsigned CPI, unsigned Reloc) const {
// Tell JIT emitter we'll resolve the address. // Tell JIT emitter we'll resolve the address.
MCE.addRelocation(MachineRelocation::getConstPool(MCE.getCurrentPCOffset(), MCE.addRelocation(MachineRelocation::getConstPool(MCE.getCurrentPCOffset(),
Reloc, CPI, 0, true)); Reloc, CPI, 0, true));
@ -325,14 +327,16 @@ void ARMCodeEmitter::emitConstPoolAddress(unsigned CPI, unsigned Reloc) {
/// emitJumpTableAddress - Arrange for the address of a jump table to /// emitJumpTableAddress - Arrange for the address of a jump table to
/// be emitted to the current location in the function, and allow it to be PC /// be emitted to the current location in the function, and allow it to be PC
/// relative. /// relative.
void ARMCodeEmitter::emitJumpTableAddress(unsigned JTIndex, unsigned Reloc) { void ARMCodeEmitter::
emitJumpTableAddress(unsigned JTIndex, unsigned Reloc) const {
MCE.addRelocation(MachineRelocation::getJumpTable(MCE.getCurrentPCOffset(), MCE.addRelocation(MachineRelocation::getJumpTable(MCE.getCurrentPCOffset(),
Reloc, JTIndex, 0, true)); Reloc, JTIndex, 0, true));
} }
/// emitMachineBasicBlock - Emit the specified address basic block. /// emitMachineBasicBlock - Emit the specified address basic block.
void ARMCodeEmitter::emitMachineBasicBlock(MachineBasicBlock *BB, void ARMCodeEmitter::emitMachineBasicBlock(MachineBasicBlock *BB,
unsigned Reloc, intptr_t JTBase) { unsigned Reloc,
intptr_t JTBase) const {
MCE.addRelocation(MachineRelocation::getBB(MCE.getCurrentPCOffset(), MCE.addRelocation(MachineRelocation::getBB(MCE.getCurrentPCOffset(),
Reloc, BB, JTBase)); Reloc, BB, JTBase));
} }

14
lib/Target/ARM/ARMMCCodeEmitter.cpp
View File

@ -44,8 +44,8 @@ public:
/// getMachineOpValue - Return binary encoding of operand. If the machine /// getMachineOpValue - Return binary encoding of operand. If the machine
/// operand requires relocation, record the relocation and return zero. /// operand requires relocation, record the relocation and return zero.
unsigned getMachineOpValue(const MCInst &MI,const MCOperand &MO); unsigned getMachineOpValue(const MCInst &MI,const MCOperand &MO) const;
unsigned getMachineOpValue(const MCInst &MI, unsigned OpIdx) { unsigned getMachineOpValue(const MCInst &MI, unsigned OpIdx) const {
return getMachineOpValue(MI, MI.getOperand(OpIdx)); return getMachineOpValue(MI, MI.getOperand(OpIdx));
} }
@ -120,17 +120,13 @@ EncodeInstruction(const MCInst &MI, raw_ostream &OS,
return; return;
++MCNumEmitted; // Keep track of the # of mi's emitted ++MCNumEmitted; // Keep track of the # of mi's emitted
switch (TSFlags & ARMII::FormMask) { switch (Opcode) {
case ARMII::BrMiscFrm: //FIXME: Any non-pseudos that need special handling, if there are any...
case ARMII::MiscFrm: { default: {
unsigned Value = getBinaryCodeForInstr(MI); unsigned Value = getBinaryCodeForInstr(MI);
EmitConstant(Value, 4, CurByte, OS); EmitConstant(Value, 4, CurByte, OS);
break; break;
} }
default: {
llvm_unreachable("Unhandled instruction encoding format!");
break;
}
} }
} }