Fix more MSVC warnings, courgette/ edition.

courgette/disassembler_elf_32_arm.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/disassembler_elf_32_arm.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 20 matching lines @@
     case ARM_OFF8: {
       // The offset is given by lower 8 bits of the op.  It is a 9-bit
       // offset, shifted right one bit and signed extended.
       uint32 temp = (arm_op & 0x00FF) << 1;
       if (temp & 0x0100)
         temp |= 0xFFFFFE00;
       temp += 4;  // Offset from _next_ PC.
       fflush(stdout);
 
       (*addr) = temp;
-      (*c_op) = (arm_op >> 8) | 0x1000;
+      (*c_op) = static_cast<uint16>(arm_op >> 8) | 0x1000;
       break;
     }
     case ARM_OFF11: {
       // The offset is given by lower 11 bits of the op, and is a
       // 12-bit offset, shifted right one bit and sign extended.
       uint32 temp = (arm_op & 0x07FF) << 1;
       if (temp & 0x00000800)
         temp |= 0xFFFFF000;
       temp += 4;  // Offset from _next_ PC.
 
       (*addr) = temp;
-      (*c_op) = (arm_op >> 11) | 0x2000;
+      (*c_op) = static_cast<uint16>(arm_op >> 11) | 0x2000;
       break;
     }
     case ARM_OFF24: {
       // The offset is given by the lower 24-bits of the op, shifted
       // left 2 bits, and sign extended.
       uint32 temp = (arm_op & 0x00FFFFFF) << 2;
       if (temp & 0x02000000)
         temp |= 0xFC000000;
       temp += 8;
 
@@ skipping 30 matching lines @@
       }
       temp += prefetch;
       (*addr) = temp;
 
       uint32 temp2 = 0x4000;
       temp2 |= (arm_op & (1 << 12)) >> 12;
       temp2 |= (arm_op & (1 << 14)) >> 13;
       temp2 |= (arm_op & (1 << 15)) >> 13;
       temp2 |= (arm_op & 0xF8000000) >> 24;
       temp2 |= (prefetch & 0x0000000F) << 8;
-      (*c_op) = temp2;
+      (*c_op) = static_cast<uint16>(temp2);
       break;
     }
     case ARM_OFF21: {
       uint32 temp = 0;
       temp |= (arm_op & 0x000007FF) << 1;  // imm11
       temp |= (arm_op & 0x003F0000) >> 4;  // imm6
 
       uint32 S   = (arm_op & (1 << 26)) >> 26;
       uint32 j2  = (arm_op & (1 << 11)) >> 11;
       uint32 j1  = (arm_op & (1 << 13)) >> 13;
 
       temp |= (S << 20) | (j1 << 19) | (j2 << 18);
 
       if (temp & 0x00100000)  // sign extension
         temp |= 0xFFE00000;
       temp += 4;
       (*addr) = temp;
 
       uint32 temp2 = 0x5000;
       temp2 |= (arm_op & 0x03C00000) >> 22;  // just save the cond
-      (*c_op) = temp2;
+      (*c_op) = static_cast<uint16>(temp2);
       break;
     }
     default:
       return false;
   }
   return true;
 }
 
 CheckBool DisassemblerElf32ARM::Decompress(ARM_RVA type, uint16 c_op,
                                            uint32 addr, uint32* arm_op) {
@@ skipping 343 matching lines @@
       // Move 2 bytes at a time, but track 32-bit boundaries
       p += 2;
       on_32bit = ((on_32bit + 1) % 2) != 0;
     }
   }
 
   return true;
 }
 
 }  // namespace courgette