diff options
| author | scottmg <scottmg@chromium.org> | 2016-03-12 15:54:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-12 23:56:45 +0000 |
| commit | 4a95ca5a4bab60f9f54325036516b640d263e2ec (patch) | |
| tree | e4cb16184171a68d73caed9b37f3f0ee977c5a3d /courgette/disassembler_win32_x64_unittest.cc | |
| parent | 2eb2d38dde83688f266012a04120c3253156d2b7 (diff) | |
| download | chromium_src-4a95ca5a4bab60f9f54325036516b640d263e2ec.zip chromium_src-4a95ca5a4bab60f9f54325036516b640d263e2ec.tar.gz chromium_src-4a95ca5a4bab60f9f54325036516b640d263e2ec.tar.bz2 | |
Revert of [Courgette] Clean up Disassembler; fix ELF Memory leaks. (patchset #15 id:270001 of https://codereview.chromium.org/1676683002/ )
Reason for revert:
Regressed linux sizes (iostream maybe?)
https://build.chromium.org/p/chromium/builders/Linux/builds/72899/steps/sizes/logs/stdio
Original issue's description:
> [Courgette] Clean up Disassembler; fix ELF Memory leaks.
>
> Cleaning up code surrounding Disassembler:
> - Extract AddressTranslator interface to be used across subclasses.
> - Use FileOffset = size_t by context.
> - Detailed comments & TODOs in DisassemblerElf32ARM.
> - Fix DisassemblerElf32ARM memory leaks.
> - Lots of superficial stylistic changes.
>
> Except for AddressTranslator routines and unit tests, shying away
> from control flow and logic changes.
>
> BUG=579206
>
> Committed: https://crrev.com/58b822d441f5c982e879e536fa3c1cbac8fd339a
> Cr-Commit-Position: refs/heads/master@{#380881}
TBR=grt@chromium.org,wfh@chromium.org,chrisha@chromium.org,andrewhayden@chromium.org,huangs@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=579206
Review URL: https://codereview.chromium.org/1792603006
Cr-Commit-Position: refs/heads/master@{#380885}
Diffstat (limited to 'courgette/disassembler_win32_x64_unittest.cc')
| -rw-r--r-- | courgette/disassembler_win32_x64_unittest.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/courgette/disassembler_win32_x64_unittest.cc b/courgette/disassembler_win32_x64_unittest.cc index 1121c10..8f732b3 100644 --- a/courgette/disassembler_win32_x64_unittest.cc +++ b/courgette/disassembler_win32_x64_unittest.cc @@ -6,9 +6,6 @@ #include <stdint.h> -#include <string> -#include <vector> - #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "courgette/base_test_unittest.h" @@ -40,16 +37,16 @@ void DisassemblerWin32X64Test::TestExe() const { disassembler->RVAToSection(0x00401234 - 0x00400000)), std::string(".text")); - EXPECT_EQ(0U, disassembler->RVAToFileOffset(0)); - EXPECT_EQ(1024U, disassembler->RVAToFileOffset(4096)); - EXPECT_EQ(46928U, disassembler->RVAToFileOffset(50000)); + EXPECT_EQ(0, disassembler->RVAToFileOffset(0)); + EXPECT_EQ(1024, disassembler->RVAToFileOffset(4096)); + EXPECT_EQ(46928, disassembler->RVAToFileOffset(50000)); std::vector<courgette::RVA> relocs; bool can_parse_relocs = disassembler->ParseRelocs(&relocs); EXPECT_TRUE(can_parse_relocs); EXPECT_TRUE(base::STLIsSorted(relocs)); - const uint8_t* offset_p = disassembler->FileOffsetToPointer(0); + const uint8_t* offset_p = disassembler->OffsetToPointer(0); EXPECT_EQ(reinterpret_cast<const void*>(file1.c_str()), reinterpret_cast<const void*>(offset_p)); EXPECT_EQ('M', offset_p[0]); |