Switch to standard integer types in courgette/.

courgette/typedrva_unittest.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 <stdint.h>
+
 #include "courgette/base_test_unittest.h"
 #include "courgette/disassembler_elf_32_arm.h"
 #include "courgette/disassembler_elf_32_x86.h"
 #include "courgette/image_utils.h"
 
 class TypedRVATest : public BaseTest {
  public:
   void TestRelativeTargetX86(courgette::RVA word, courgette::RVA expected)
     const;
 
   void TestRelativeTargetARM(courgette::ARM_RVA arm_rva,
                              courgette::RVA rva,
-                             uint32 op,
+                             uint32_t op,
                              courgette::RVA expected) const;
 
   void TestARMOPEncode(courgette::ARM_RVA arm_rva,
                        courgette::RVA rva,
-                       uint32 op,
+                       uint32_t op,
                        courgette::RVA expected) const;
 };
 
 void TypedRVATest::TestRelativeTargetX86(courgette::RVA word,
                                          courgette::RVA expected) const {
   courgette::DisassemblerElf32X86::TypedRVAX86* typed_rva
     = new courgette::DisassemblerElf32X86::TypedRVAX86(0);
-  const uint8* op_pointer = reinterpret_cast<const uint8*>(&word);
+  const uint8_t* op_pointer = reinterpret_cast<const uint8_t*>(&word);
 
   EXPECT_TRUE(typed_rva->ComputeRelativeTarget(op_pointer));
   EXPECT_EQ(typed_rva->relative_target(), expected);
 
   delete typed_rva;
 }
 
-uint32 Read32LittleEndian(const void* address) {
-  return *reinterpret_cast<const uint32*>(address);
+uint32_t Read32LittleEndian(const void* address) {
+  return *reinterpret_cast<const uint32_t*>(address);
 }
 
 void TypedRVATest::TestRelativeTargetARM(courgette::ARM_RVA arm_rva,
                                          courgette::RVA rva,
-                                         uint32 op,
+                                         uint32_t op,
                                          courgette::RVA expected) const {
   courgette::DisassemblerElf32ARM::TypedRVAARM* typed_rva
     = new courgette::DisassemblerElf32ARM::TypedRVAARM(arm_rva, rva);
-  uint8* op_pointer = reinterpret_cast<uint8*>(&op);
+  uint8_t* op_pointer = reinterpret_cast<uint8_t*>(&op);
 
   EXPECT_TRUE(typed_rva->ComputeRelativeTarget(op_pointer));
   EXPECT_EQ(rva + typed_rva->relative_target(), expected);
 
   delete typed_rva;
 }
 
 void TypedRVATest::TestARMOPEncode(courgette::ARM_RVA arm_rva,
-                             courgette::RVA rva,
-                             uint32 op,
-                             courgette::RVA expected) const {
-  uint16 c_op;
-  uint32 addr;
+                                   courgette::RVA rva,
+                                   uint32_t op,
+                                   courgette::RVA expected) const {
+  uint16_t c_op;
+  uint32_t addr;
   EXPECT_TRUE(courgette::DisassemblerElf32ARM::Compress(arm_rva, op, rva,
                                                         &c_op, &addr));
   EXPECT_EQ(rva + addr, expected);
 
-  uint32 new_op;
+  uint32_t new_op;
   EXPECT_TRUE(courgette::DisassemblerElf32ARM::Decompress(arm_rva, c_op, addr,
                                                           &new_op));
   EXPECT_EQ(new_op, op);
 }
 
 TEST_F(TypedRVATest, TestX86) {
   TestRelativeTargetX86(0x0, 0x4);
 }
 
 // ARM opcodes taken from and tested against the output of
@@ skipping 78 matching lines @@
   TestARMOPEncode(courgette::ARM_OFF25, 0x2c58, 0xf005feac, 0x89b4);
   TestARMOPEncode(courgette::ARM_OFF25, 0x2bd2, 0xf7ffeb9e, 0x2310);
   TestARMOPEncode(courgette::ARM_OFF25, 0x2bd8, 0xf7ffeb8e, 0x22f8);
   TestARMOPEncode(courgette::ARM_OFF25, 0x2c3e, 0xf7ffea2e, 0x209c);
   TestARMOPEncode(courgette::ARM_OFF21, 0x2bc6, 0xf00084c7, 0x3558);
   TestARMOPEncode(courgette::ARM_OFF21, 0x2bde, 0xf000871d, 0x3a1c);
   TestARMOPEncode(courgette::ARM_OFF21, 0x2c5e, 0xf2c086c1, 0x39e4);
   TestARMOPEncode(courgette::ARM_OFF21, 0x67e4, 0xf43faee9, 0x65ba);
   TestARMOPEncode(courgette::ARM_OFF21, 0x67ee, 0xf47faee4, 0x65ba);
 }