diff options
| -rw-r--r-- | lib/Target/ARM/ARMCodeEmitter.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMInstrThumb.td | 2 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMMCCodeEmitter.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/Target/ARM/ARMCodeEmitter.cpp b/lib/Target/ARM/ARMCodeEmitter.cpp index 3892948d62..02d1631a17 100644 --- a/lib/Target/ARM/ARMCodeEmitter.cpp +++ b/lib/Target/ARM/ARMCodeEmitter.cpp @@ -175,7 +175,7 @@ namespace { const { return 0; } unsigned getThumbBLXTargetOpValue(const MachineInstr &MI, unsigned Op) const { return 0; } - unsigned getThumbBRTargetOpValue(const MachineInstr &MI, unsigned Op) + unsigned getThumbCBTargetOpValue(const MachineInstr &MI, unsigned Op) const { return 0; } unsigned getBranchTargetOpValue(const MachineInstr &MI, unsigned Op) const { return 0; } diff --git a/lib/Target/ARM/ARMInstrThumb.td b/lib/Target/ARM/ARMInstrThumb.td index df85690cb7..5a77aa3de4 100644 --- a/lib/Target/ARM/ARMInstrThumb.td +++ b/lib/Target/ARM/ARMInstrThumb.td @@ -75,7 +75,7 @@ def t_imm_s4 : Operand<i32> { // Define Thumb specific addressing modes. def t_cbtarget : Operand<i32> { - let EncoderMethod = "getThumbBRTargetOpValue"; + let EncoderMethod = "getThumbCBTargetOpValue"; } def t_bltarget : Operand<i32> { diff --git a/lib/Target/ARM/ARMMCCodeEmitter.cpp b/lib/Target/ARM/ARMMCCodeEmitter.cpp index 9684fb1de8..d0812a00d3 100644 --- a/lib/Target/ARM/ARMMCCodeEmitter.cpp +++ b/lib/Target/ARM/ARMMCCodeEmitter.cpp @@ -98,8 +98,8 @@ public: uint32_t getThumbBLXTargetOpValue(const MCInst &MI, unsigned OpIdx, SmallVectorImpl<MCFixup> &Fixups) const; - /// getThumbBRTargetOpValue - Return encoding info for Thumb branch target. - uint32_t getThumbBRTargetOpValue(const MCInst &MI, unsigned OpIdx, + /// getThumbCBTargetOpValue - Return encoding info for Thumb branch target. + uint32_t getThumbCBTargetOpValue(const MCInst &MI, unsigned OpIdx, SmallVectorImpl<MCFixup> &Fixups) const; /// getBranchTargetOpValue - Return encoding info for 24-bit immediate @@ -458,9 +458,9 @@ getThumbBLXTargetOpValue(const MCInst &MI, unsigned OpIdx, return ::getBranchTargetOpValue(MI, OpIdx, ARM::fixup_arm_thumb_blx, Fixups); } -/// getThumbBRTargetOpValue - Return encoding info for Thumb branch target. +/// getThumbCBTargetOpValue - Return encoding info for Thumb branch target. uint32_t ARMMCCodeEmitter:: -getThumbBRTargetOpValue(const MCInst &MI, unsigned OpIdx, +getThumbCBTargetOpValue(const MCInst &MI, unsigned OpIdx, SmallVectorImpl<MCFixup> &Fixups) const { return ::getBranchTargetOpValue(MI, OpIdx, ARM::fixup_arm_thumb_br, Fixups); } |