Chromium Code Reviews| Index: src/IceAssemblerARM32.cpp |
| diff --git a/src/IceAssemblerARM32.cpp b/src/IceAssemblerARM32.cpp |
| index 89854b18a60fdaf6cb66f1c2f6f7462214da4b71..e4d60f87a3966044d1be8eb313511e2f6e19d0f9 100644 |
| --- a/src/IceAssemblerARM32.cpp |
| +++ b/src/IceAssemblerARM32.cpp |
| @@ -195,7 +195,7 @@ RegARM32::GPRRegister getGPRReg(IValueT Shift, IValueT Value) { |
| IValueT getEncodedGPRegNum(const Variable *Var) { |
| assert(Var->hasReg()); |
| - int32_t Reg = Var->getRegNum(); |
| + auto Reg = Var->getRegNum(); |
| return llvm::isa<Variable64On32>(Var) ? RegARM32::getI64PairFirstGPRNum(Reg) |
| : RegARM32::getEncodedGPR(Reg); |
| } |
| @@ -470,8 +470,8 @@ EncodedOperand encodeAddress(const Operand *Opnd, IValueT &Value, |
| IOffsetT Offset = Var->getStackOffset(); |
| if (!Utils::IsAbsoluteUint(12, Offset)) |
| return CantEncode; |
| - int32_t BaseRegNum = Var->getBaseRegNum(); |
| - if (BaseRegNum == Variable::NoRegister) |
| + auto BaseRegNum = Var->getBaseRegNum(); |
| + if (BaseRegNum == RegNumT::NoRegister) |
| BaseRegNum = TInfo.FrameOrStackReg; |
| Value = encodeImmRegOffset(ImmEncoding, BaseRegNum, Offset, |
| OperandARM32Mem::Offset); |
| @@ -585,7 +585,7 @@ void verifyRegNotPcWhenSetFlags(IValueT Reg, bool SetFlags, |
| return; |
| if (SetFlags && (Reg == RegARM32::Encoded_Reg_pc)) |
| llvm::report_fatal_error(std::string(InstName) + ": " + |
| - RegARM32::getRegName(Reg) + |
| + RegARM32::getRegName(RegNumT::fixme(Reg)) + |
|
John
2016/02/10 16:01:51
this does not look like a "fixme" issue -- reg is
Jim Stichnoth
2016/02/10 17:47:20
Done.
|
| "=pc not allowed when CC=1"); |
| } |
| @@ -602,7 +602,7 @@ size_t MoveRelocatableFixup::emit(GlobalContext *Ctx, |
| IValueT Inst = Asm.load<IValueT>(position()); |
| Str << "\t" |
| "mov" << (kind() == llvm::ELF::R_ARM_MOVW_ABS_NC ? "w" : "t") << "\t" |
| - << RegARM32::getRegName((Inst >> kRdShift) & 0xF) |
| + << RegARM32::getRegName(RegNumT::fixme((Inst >> kRdShift) & 0xF)) |
| << ", #:" << (kind() == llvm::ELF::R_ARM_MOVW_ABS_NC ? "lower" : "upper") |
| << "16:" << symbol(Ctx, &Asm) << "\t@ .word " |
| << llvm::format_hex_no_prefix(Inst, 8) << "\n"; |