summaryrefslogtreecommitdiffstats
path: root/courgette/disassembler.cc
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 01:03:43 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 01:03:43 +0000
commit104a608acbf0fe57728f95d21c59ed25f61b0482 (patch)
treef62f6ce78a3379b043e0ff71cfccef0baa46d98f /courgette/disassembler.cc
parentc840d52c54743d3353e90136fe17b8c697083d25 (diff)
downloadchromium_src-104a608acbf0fe57728f95d21c59ed25f61b0482.zip
chromium_src-104a608acbf0fe57728f95d21c59ed25f61b0482.tar.gz
chromium_src-104a608acbf0fe57728f95d21c59ed25f61b0482.tar.bz2
Also build a 64-bit exe version of the 32-bit courgette
utility + library to support larger input sizes. BUG=63793 TEST=None Review URL: http://codereview.chromium.org/5096007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'courgette/disassembler.cc')
-rw-r--r--courgette/disassembler.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/courgette/disassembler.cc b/courgette/disassembler.cc
index b3b5577..2b4db2c 100644
--- a/courgette/disassembler.cc
+++ b/courgette/disassembler.cc
@@ -166,7 +166,7 @@ void DisassemblerWin32X86::ParseRel32RelocsFromSection(const Section* section) {
// Find the rel32 relocations.
const uint8* p = start_pointer;
while (p < end_pointer) {
- RVA current_rva = p - adjust_pointer_to_rva;
+ RVA current_rva = static_cast<RVA>(p - adjust_pointer_to_rva);
if (current_rva == relocs_start_rva) {
uint32 relocs_size = pe_info().base_relocation_table().size_;
if (relocs_size) {
@@ -195,7 +195,7 @@ void DisassemblerWin32X86::ParseRel32RelocsFromSection(const Section* section) {
}
}
if (rel32) {
- RVA rel32_rva = rel32 - adjust_pointer_to_rva;
+ RVA rel32_rva = static_cast<RVA>(rel32 - adjust_pointer_to_rva);
// Is there an abs32 reloc overlapping the candidate?
while (abs32_pos != abs32_locations_.end() && *abs32_pos < rel32_rva - 3)
@@ -297,7 +297,7 @@ void DisassemblerWin32X86::ParseFileRegion(
const uint8* p = start_pointer;
while (p < end_pointer) {
- RVA current_rva = p - adjust_pointer_to_rva;
+ RVA current_rva = static_cast<RVA>(p - adjust_pointer_to_rva);
// The base relocation table is usually in the .relocs section, but it could
// actually be anywhere. Make sure we skip it because we will regenerate it