@@ -1589,7 +1589,7 @@ void ARMExpandPseudo::CMSESaveClearFPRegsV81(MachineBasicBlock &MBB,
1589
1589
BuildMI (MBB, MBBI, DL, TII->get (ARM::VSTMSDB_UPD), ARM::SP)
1590
1590
.addReg (ARM::SP)
1591
1591
.add (predOps (ARMCC::AL));
1592
- for (int Reg = ARM::S16; Reg <= ARM::S31; ++Reg)
1592
+ for (unsigned Reg = ARM::S16; Reg <= ARM::S31; ++Reg)
1593
1593
VPUSH.addReg (Reg);
1594
1594
1595
1595
// Clear FP registers with a VSCCLRM.
@@ -1794,7 +1794,7 @@ void ARMExpandPseudo::CMSERestoreFPRegsV81(
1794
1794
BuildMI (MBB, MBBI, DL, TII->get (ARM::VLDMSIA_UPD), ARM::SP)
1795
1795
.addReg (ARM::SP)
1796
1796
.add (predOps (ARMCC::AL));
1797
- for (int Reg = ARM::S16; Reg <= ARM::S31; ++Reg)
1797
+ for (unsigned Reg = ARM::S16; Reg <= ARM::S31; ++Reg)
1798
1798
VPOP.addReg (Reg, RegState::Define);
1799
1799
}
1800
1800
}
@@ -2044,13 +2044,14 @@ bool ARMExpandPseudo::ExpandCMP_SWAP_64(MachineBasicBlock &MBB,
2044
2044
2045
2045
static void CMSEPushCalleeSaves (const TargetInstrInfo &TII,
2046
2046
MachineBasicBlock &MBB,
2047
- MachineBasicBlock::iterator MBBI, int JumpReg,
2048
- const LivePhysRegs &LiveRegs, bool Thumb1Only) {
2047
+ MachineBasicBlock::iterator MBBI,
2048
+ Register JumpReg, const LivePhysRegs &LiveRegs,
2049
+ bool Thumb1Only) {
2049
2050
const DebugLoc &DL = MBBI->getDebugLoc ();
2050
2051
if (Thumb1Only) { // push Lo and Hi regs separately
2051
2052
MachineInstrBuilder PushMIB =
2052
2053
BuildMI (MBB, MBBI, DL, TII.get (ARM::tPUSH)).add (predOps (ARMCC::AL));
2053
- for (int Reg = ARM::R4; Reg < ARM::R8; ++Reg) {
2054
+ for (unsigned Reg = ARM::R4; Reg < ARM::R8; ++Reg) {
2054
2055
PushMIB.addReg (
2055
2056
Reg, Reg == JumpReg || LiveRegs.contains (Reg) ? 0 : RegState::Undef);
2056
2057
}
@@ -2062,7 +2063,8 @@ static void CMSEPushCalleeSaves(const TargetInstrInfo &TII,
2062
2063
// memory, and allow us to later pop them with a single instructions.
2063
2064
// FIXME: Could also use any of r0-r3 that are free (including in the
2064
2065
// first PUSH above).
2065
- for (int LoReg = ARM::R7, HiReg = ARM::R11; LoReg >= ARM::R4; --LoReg) {
2066
+ for (unsigned LoReg = ARM::R7, HiReg = ARM::R11; LoReg >= ARM::R4;
2067
+ --LoReg) {
2066
2068
if (JumpReg == LoReg)
2067
2069
continue ;
2068
2070
BuildMI (MBB, MBBI, DL, TII.get (ARM::tMOVr), LoReg)
@@ -2072,7 +2074,7 @@ static void CMSEPushCalleeSaves(const TargetInstrInfo &TII,
2072
2074
}
2073
2075
MachineInstrBuilder PushMIB2 =
2074
2076
BuildMI (MBB, MBBI, DL, TII.get (ARM::tPUSH)).add (predOps (ARMCC::AL));
2075
- for (int Reg = ARM::R4; Reg < ARM::R8; ++Reg) {
2077
+ for (unsigned Reg = ARM::R4; Reg < ARM::R8; ++Reg) {
2076
2078
if (Reg == JumpReg)
2077
2079
continue ;
2078
2080
PushMIB2.addReg (Reg, RegState::Kill);
@@ -2082,7 +2084,7 @@ static void CMSEPushCalleeSaves(const TargetInstrInfo &TII,
2082
2084
// the JumpReg), use r4 or r5, whichever is not JumpReg. It has already been
2083
2085
// saved.
2084
2086
if (JumpReg >= ARM::R4 && JumpReg <= ARM::R7) {
2085
- int LoReg = JumpReg == ARM::R4 ? ARM::R5 : ARM::R4;
2087
+ Register LoReg = JumpReg == ARM::R4 ? ARM::R5 : ARM::R4;
2086
2088
BuildMI (MBB, MBBI, DL, TII.get (ARM::tMOVr), LoReg)
2087
2089
.addReg (ARM::R8, LiveRegs.contains (ARM::R8) ? 0 : RegState::Undef)
2088
2090
.add (predOps (ARMCC::AL));
@@ -2095,7 +2097,7 @@ static void CMSEPushCalleeSaves(const TargetInstrInfo &TII,
2095
2097
BuildMI (MBB, MBBI, DL, TII.get (ARM::t2STMDB_UPD), ARM::SP)
2096
2098
.addReg (ARM::SP)
2097
2099
.add (predOps (ARMCC::AL));
2098
- for (int Reg = ARM::R4; Reg < ARM::R12; ++Reg) {
2100
+ for (unsigned Reg = ARM::R4; Reg < ARM::R12; ++Reg) {
2099
2101
PushMIB.addReg (
2100
2102
Reg, Reg == JumpReg || LiveRegs.contains (Reg) ? 0 : RegState::Undef);
2101
2103
}
@@ -2125,7 +2127,7 @@ static void CMSEPopCalleeSaves(const TargetInstrInfo &TII,
2125
2127
BuildMI (MBB, MBBI, DL, TII.get (ARM::t2LDMIA_UPD), ARM::SP)
2126
2128
.addReg (ARM::SP)
2127
2129
.add (predOps (ARMCC::AL));
2128
- for (int Reg = ARM::R4; Reg < ARM::R12; ++Reg)
2130
+ for (unsigned Reg = ARM::R4; Reg < ARM::R12; ++Reg)
2129
2131
PopMIB.addReg (Reg, RegState::Define);
2130
2132
}
2131
2133
}
0 commit comments