Chromium Code Reviews| Index: src/IceTargetLoweringARM32.cpp |
| diff --git a/src/IceTargetLoweringARM32.cpp b/src/IceTargetLoweringARM32.cpp |
| index 06269027d04bde8c5ed795ba990a2eb6bc205f0d..a6b5597a1893064c0c081323435523423a3e0f02 100644 |
| --- a/src/IceTargetLoweringARM32.cpp |
| +++ b/src/IceTargetLoweringARM32.cpp |
| @@ -331,18 +331,19 @@ void TargetARM32::staticInit(GlobalContext *Ctx) { |
| TypeToRegisterSet[IceType_v4f32] = VectorRegisters; |
| filterTypeToRegisterSet( |
| - Ctx, RegARM32::Reg_NUM, TypeToRegisterSet, RegARM32::RCARM32_NUM, |
| - [](int32_t RegNum) -> IceString { |
| + Ctx, RegARM32::Reg_NUM, TypeToRegisterSet, |
| + RegARM32::RCARM32_NUM, [](int32_t RegNum) -> IceString { |
|
Karl
2016/01/22 17:10:54
Isn't using RegARM32::RCARM32_NUM dangerous? The f
Jim Stichnoth
2016/01/22 19:02:17
Done - used a separate function a la x86, which sh
|
| + // This function simply removes ", " from the register name. |
| IceString Name = RegARM32::getRegName(RegNum); |
| constexpr const char RegSeparator[] = ", "; |
| constexpr size_t RegSeparatorWidth = |
| llvm::array_lengthof(RegSeparator) - 1; |
| for (size_t Pos = Name.find(RegSeparator); Pos != std::string::npos; |
| Pos = Name.find(RegSeparator)) { |
| - Name.replace(Pos, RegSeparatorWidth, ":"); |
| + Name.replace(Pos, RegSeparatorWidth, ""); |
| } |
| return Name; |
| - }); |
| + }, regClassString); |
| } |
| namespace { |