diff options
Diffstat (limited to 'courgette/disassembler.cc')
-rw-r--r-- | courgette/disassembler.cc | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/courgette/disassembler.cc b/courgette/disassembler.cc index 9b58ba0..b9fce8b 100644 --- a/courgette/disassembler.cc +++ b/courgette/disassembler.cc @@ -4,12 +4,10 @@ #include "courgette/disassembler.h" -#include "base/logging.h" - namespace courgette { Disassembler::Disassembler(const void* start, size_t length) - : failure_reason_("uninitialized") { + : failure_reason_("uninitialized") { start_ = reinterpret_cast<const uint8_t*>(start); length_ = length; end_ = start_ + length_; @@ -17,21 +15,13 @@ Disassembler::Disassembler(const void* start, size_t length) Disassembler::~Disassembler() {}; -const uint8_t* Disassembler::FileOffsetToPointer(FileOffset file_offset) const { - CHECK_LE(file_offset, static_cast<FileOffset>(end_ - start_)); - return start_ + file_offset; -} - -const uint8_t* Disassembler::RVAToPointer(RVA rva) const { - FileOffset file_offset = RVAToFileOffset(rva); - if (file_offset == kNoFileOffset) - return nullptr; - - return FileOffsetToPointer(file_offset); +const uint8_t* Disassembler::OffsetToPointer(size_t offset) const { + assert(start_ + offset <= end_); + return start_ + offset; } bool Disassembler::Good() { - failure_reason_ = nullptr; + failure_reason_ = NULL; return true; } |