Fixes for comparisons between signed and unsigned values with new jb-mr2 compiler

Change-Id: Ibfcf8dca0b36b29548231c829be3c160c1c6d747

4 files changed, 13 insertions, 13 deletions

diff --git a/src/disassembler_mips.cc b/src/disassembler_mips.cc
index a2817963f9..7fba4a8678 100644
--- a/src/disassembler_mips.cc
+++ b/src/disassembler_mips.cc
@@ -128,16 +128,16 @@ static const MipsInstruction gMipsInstructions[] = {
   { kITypeMask, 14 << kOpcodeShift, "ori", "TSi", },
   { kITypeMask, 15 << kOpcodeShift, "lui", "TI", },
 
-  { kITypeMask, 32 << kOpcodeShift, "lb", "TO", },
-  { kITypeMask, 33 << kOpcodeShift, "lh", "TO", },
-  { kITypeMask, 35 << kOpcodeShift, "lw", "TO", },
-  { kITypeMask, 36 << kOpcodeShift, "lbu", "TO", },
-  { kITypeMask, 37 << kOpcodeShift, "lhu", "TO", },
-  { kITypeMask, 40 << kOpcodeShift, "sb", "TO", },
-  { kITypeMask, 41 << kOpcodeShift, "sh", "TO", },
-  { kITypeMask, 43 << kOpcodeShift, "sw", "TO", },
-  { kITypeMask, 49 << kOpcodeShift, "lwc1", "tO", },
-  { kITypeMask, 57 << kOpcodeShift, "swc1", "tO", },
+  { kITypeMask, 32u << kOpcodeShift, "lb", "TO", },
+  { kITypeMask, 33u << kOpcodeShift, "lh", "TO", },
+  { kITypeMask, 35u << kOpcodeShift, "lw", "TO", },
+  { kITypeMask, 36u << kOpcodeShift, "lbu", "TO", },
+  { kITypeMask, 37u << kOpcodeShift, "lhu", "TO", },
+  { kITypeMask, 40u << kOpcodeShift, "sb", "TO", },
+  { kITypeMask, 41u << kOpcodeShift, "sh", "TO", },
+  { kITypeMask, 43u << kOpcodeShift, "sw", "TO", },
+  { kITypeMask, 49u << kOpcodeShift, "lwc1", "tO", },
+  { kITypeMask, 57u << kOpcodeShift, "swc1", "tO", },
 
   // Floating point.
   { kFpMask,                kCop1 | 0, "add", "fdst" },
diff --git a/src/gc/mark_sweep.cc b/src/gc/mark_sweep.cc
index 6fcaf83ce4..055a7e7972 100644
--- a/src/gc/mark_sweep.cc
+++ b/src/gc/mark_sweep.cc
@@ -1224,7 +1224,7 @@ public:
 
   // Scans all of the objects
   virtual void Run(Thread* self) {
-    int index;
+    size_t index;
     while ((index = index_++) < length_) {
       if (kUseMarkStackPrefetch) {
         static const size_t prefetch_look_ahead = 1;
diff --git a/src/oat/runtime/arm/context_arm.cc b/src/oat/runtime/arm/context_arm.cc
index 7b45bc2a7d..4e42e94e60 100644
--- a/src/oat/runtime/arm/context_arm.cc
+++ b/src/oat/runtime/arm/context_arm.cc
@@ -70,7 +70,7 @@ void ArmContext::FillCalleeSaves(const StackVisitor& fr) {
 }
 
 void ArmContext::SetGPR(uint32_t reg, uintptr_t value) {
-  DCHECK_LT(reg, kNumberOfCoreRegisters);
+  DCHECK_LT(reg, static_cast<uint32_t>(kNumberOfCoreRegisters));
   DCHECK_NE(gprs_[reg], &gZero); // Can't overwrite this static value since they are never reset.
   DCHECK(gprs_[reg] != NULL);
   *gprs_[reg] = value;
diff --git a/src/oat/runtime/arm/context_arm.h b/src/oat/runtime/arm/context_arm.h
index a2b9ebefb6..ec1d4cb7f6 100644
--- a/src/oat/runtime/arm/context_arm.h
+++ b/src/oat/runtime/arm/context_arm.h
@@ -45,7 +45,7 @@ class ArmContext : public Context {
   }
 
   virtual uintptr_t GetGPR(uint32_t reg) {
-    CHECK_LT(reg, kNumberOfCoreRegisters);
+    CHECK_LT(reg, static_cast<uint32_t>(kNumberOfCoreRegisters));
     return *gprs_[reg];
   }