mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-11-01 15:17:25 +00:00
Revert both r121082 (which broke a bunch of constant pool stuff) and r125074 (which worked around it). This should get us back to the old, correct behavior, though it will make the integrated assembler unhappy for the time being.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125127 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -256,27 +256,27 @@ static unsigned T2Morph2LoadLiteral(unsigned Opcode) {
|
||||
case ARM::t2LDR_POST: case ARM::t2LDR_PRE:
|
||||
case ARM::t2LDRi12: case ARM::t2LDRi8:
|
||||
case ARM::t2LDRs: case ARM::t2LDRT:
|
||||
return ARM::t2LDRi12;
|
||||
return ARM::t2LDRpci;
|
||||
|
||||
case ARM::t2LDRB_POST: case ARM::t2LDRB_PRE:
|
||||
case ARM::t2LDRBi12: case ARM::t2LDRBi8:
|
||||
case ARM::t2LDRBs: case ARM::t2LDRBT:
|
||||
return ARM::t2LDRBi12;
|
||||
return ARM::t2LDRBpci;
|
||||
|
||||
case ARM::t2LDRH_POST: case ARM::t2LDRH_PRE:
|
||||
case ARM::t2LDRHi12: case ARM::t2LDRHi8:
|
||||
case ARM::t2LDRHs: case ARM::t2LDRHT:
|
||||
return ARM::t2LDRHi12;
|
||||
return ARM::t2LDRHpci;
|
||||
|
||||
case ARM::t2LDRSB_POST: case ARM::t2LDRSB_PRE:
|
||||
case ARM::t2LDRSBi12: case ARM::t2LDRSBi8:
|
||||
case ARM::t2LDRSBs: case ARM::t2LDRSBT:
|
||||
return ARM::t2LDRSBi12;
|
||||
return ARM::t2LDRSBpci;
|
||||
|
||||
case ARM::t2LDRSH_POST: case ARM::t2LDRSH_PRE:
|
||||
case ARM::t2LDRSHi12: case ARM::t2LDRSHi8:
|
||||
case ARM::t2LDRSHs: case ARM::t2LDRSHT:
|
||||
return ARM::t2LDRSHi12;
|
||||
return ARM::t2LDRSHpci;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -531,9 +531,9 @@ static MCDisassembler *createThumbDisassembler(const Target &T) {
|
||||
return new ThumbDisassembler;
|
||||
}
|
||||
|
||||
extern "C" void LLVMInitializeARMDisassembler() {
|
||||
extern "C" void LLVMInitializeARMDisassembler() {
|
||||
// Register the disassembler.
|
||||
TargetRegistry::RegisterMCDisassembler(TheARMTarget,
|
||||
TargetRegistry::RegisterMCDisassembler(TheARMTarget,
|
||||
createARMDisassembler);
|
||||
TargetRegistry::RegisterMCDisassembler(TheThumbTarget,
|
||||
createThumbDisassembler);
|
||||
|
||||
Reference in New Issue
Block a user