summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--courgette/disassembler_elf_32.h2
-rw-r--r--courgette/disassembler_elf_32_arm.cc2
-rw-r--r--courgette/encoded_program.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/courgette/disassembler_elf_32.h b/courgette/disassembler_elf_32.h
index dc44ec5..58e2eba 100644
--- a/courgette/disassembler_elf_32.h
+++ b/courgette/disassembler_elf_32.h
@@ -30,7 +30,7 @@ class DisassemblerElf32 : public Disassembler {
// class encapsulates this behavior. public for use in unit tests.
class TypedRVA {
public:
- explicit TypedRVA(RVA rva) : rva_(rva), offset_(-1) {
+ explicit TypedRVA(RVA rva) : rva_(rva), offset_(static_cast<size_t>(-1)) {
}
virtual ~TypedRVA() { };
diff --git a/courgette/disassembler_elf_32_arm.cc b/courgette/disassembler_elf_32_arm.cc
index dc3712f..f0f94b9 100644
--- a/courgette/disassembler_elf_32_arm.cc
+++ b/courgette/disassembler_elf_32_arm.cc
@@ -215,7 +215,7 @@ uint16 DisassemblerElf32ARM::TypedRVAARM::op_size() const {
case ARM_OFF21:
return 4;
default:
- return -1;
+ return 0xFFFF;
}
}
diff --git a/courgette/encoded_program.cc b/courgette/encoded_program.cc
index 8fb8c69..b78e7fe 100644
--- a/courgette/encoded_program.cc
+++ b/courgette/encoded_program.cc
@@ -710,7 +710,7 @@ COMPILE_ASSERT(offsetof(RelocBlockPOD, relocs) == 8, reloc_block_header_size);
class RelocBlock {
public:
RelocBlock() {
- pod.page_rva = ~0;
+ pod.page_rva = 0xFFFFFFFF;
pod.block_size = 8;
}