aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Target/ARM/ARMCodeEmitter.cpp2
-rw-r--r--lib/Target/ARM/ARMInstrInfo.td2
-rw-r--r--lib/Target/ARM/ARMMCCodeEmitter.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARMCodeEmitter.cpp b/lib/Target/ARM/ARMCodeEmitter.cpp
index fa11a48322..4f8b3ca5f6 100644
--- a/lib/Target/ARM/ARMCodeEmitter.cpp
+++ b/lib/Target/ARM/ARMCodeEmitter.cpp
@@ -194,7 +194,7 @@ namespace {
Binary |= (Reg << 13);
return Binary;
}
- unsigned getNEONVcvtImm32(const MachineInstr &MI, unsigned Op) const {
+ unsigned getNEONVcvtImm32OpValue(const MachineInstr &MI, unsigned Op) const {
return 0; }
/// getMovi32Value - Return binary encoding of operand for movw/movt. If the
diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td
index 46f73b107f..0a39000231 100644
--- a/lib/Target/ARM/ARMInstrInfo.td
+++ b/lib/Target/ARM/ARMInstrInfo.td
@@ -300,7 +300,7 @@ def pclabel : Operand<i32> {
}
def neon_vcvt_imm32 : Operand<i32> {
- string EncoderMethod = "getNEONVcvtImm32";
+ string EncoderMethod = "getNEONVcvtImm32OpValue";
}
// rot_imm: An integer that encodes a rotate amount. Must be 8, 16, or 24.
diff --git a/lib/Target/ARM/ARMMCCodeEmitter.cpp b/lib/Target/ARM/ARMMCCodeEmitter.cpp
index 122aadf321..ffe462f64e 100644
--- a/lib/Target/ARM/ARMMCCodeEmitter.cpp
+++ b/lib/Target/ARM/ARMMCCodeEmitter.cpp
@@ -92,7 +92,7 @@ public:
return MI.getOperand(Op).getImm() - 1;
}
- unsigned getNEONVcvtImm32(const MCInst &MI, unsigned Op) const {
+ unsigned getNEONVcvtImm32OpValue(const MCInst &MI, unsigned Op) const {
return 64 - MI.getOperand(Op).getImm();
}