From 83c3cb14a4a8629df75b509e926e3c06438391d1 Mon Sep 17 00:00:00 2001 From: "piman@chromium.org" Date: Mon, 23 Sep 2013 21:56:39 +0000 Subject: Revert 224789 "Add PE64 support to courgette" Caused failures: http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/23037/steps/courgette_unittests/logs/stdio > Add PE64 support to courgette > > Add tests for PE64 > > BUG=38784 > > Review URL: https://chromiumcodereview.appspot.com/23600063 TBR=wfh@chromium.org Review URL: https://codereview.chromium.org/23591065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224806 0039d316-1c4b-4281-b951-d872f2087c98 --- courgette/disassembler_elf_32_arm.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'courgette/disassembler_elf_32_arm.cc') diff --git a/courgette/disassembler_elf_32_arm.cc b/courgette/disassembler_elf_32_arm.cc index 3633061..d367716 100644 --- a/courgette/disassembler_elf_32_arm.cc +++ b/courgette/disassembler_elf_32_arm.cc @@ -106,8 +106,8 @@ CheckBool DisassemblerElf32ARM::Compress(ARM_RVA type, uint32 arm_op, RVA rva, } case ARM_OFF21: { uint32 temp = 0; - temp |= (arm_op & 0x000007FF) << 1; // imm11 - temp |= (arm_op & 0x003F0000) >> 4; // imm6 + temp |= (arm_op & 0x000007FF) << 1; // imm11 + temp |= (arm_op & 0x003F0000) >> 4; // imm6 uint32 S = (arm_op & (1 << 26)) >> 26; uint32 j2 = (arm_op & (1 << 11)) >> 11; @@ -115,7 +115,7 @@ CheckBool DisassemblerElf32ARM::Compress(ARM_RVA type, uint32 arm_op, RVA rva, temp |= (S << 20) | (j1 << 19) | (j2 << 18); - if (temp & 0x00100000) // sign extension + if (temp & 0x00100000) // sign extension temp |= 0xFFE00000; temp += 4; (*addr) = temp; -- cgit v1.1