| Index: courgette/disassembler_elf_32.h
|
| diff --git a/courgette/disassembler_elf_32.h b/courgette/disassembler_elf_32.h
|
| index 608c73a0b7f3eff7f3445e8ea118e2fce66324ac..110dd717edc864d8f8370c6665afefa365702b4a 100644
|
| --- a/courgette/disassembler_elf_32.h
|
| +++ b/courgette/disassembler_elf_32.h
|
| @@ -5,7 +5,10 @@
|
| #ifndef COURGETTE_DISASSEMBLER_ELF_32_H_
|
| #define COURGETTE_DISASSEMBLER_ELF_32_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "courgette/assembly_program.h"
|
| #include "courgette/disassembler.h"
|
| @@ -56,13 +59,13 @@ class DisassemblerElf32 : public Disassembler {
|
| }
|
|
|
| // Computes the relative jump's offset from the op in p.
|
| - virtual CheckBool ComputeRelativeTarget(const uint8* op_pointer) = 0;
|
| + virtual CheckBool ComputeRelativeTarget(const uint8_t* op_pointer) = 0;
|
|
|
| // Emits the courgette instruction corresponding to the RVA type.
|
| virtual CheckBool EmitInstruction(AssemblyProgram* program,
|
| RVA target_rva) = 0;
|
|
|
| - virtual uint16 op_size() const = 0;
|
| + virtual uint16_t op_size() const = 0;
|
|
|
| static bool IsLessThan(TypedRVA *a, TypedRVA *b) {
|
| return a->rva() < b->rva();
|
| @@ -109,7 +112,7 @@ class DisassemblerElf32 : public Disassembler {
|
| return section_header_table_ + id;
|
| }
|
|
|
| - const uint8 *SectionBody(int id) const {
|
| + const uint8_t* SectionBody(int id) const {
|
| return OffsetToPointer(SectionHeader(id)->sh_offset);
|
| }
|
|
|
|
|