From: karlklose@chromium.org Date: Sun, 13 Feb 2011 18:39:14 +0000 (+0000) Subject: Revert r6759. X-Git-Tag: upstream/4.7.83~20234 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d52e6f76494c5ce74e27e7b6da270e05cc132e36;p=platform%2Fupstream%2Fv8.git Revert r6759. TBR=sgjesse@chromium.org Review URL: http://codereview.chromium.org/6484025 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6761 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/arm/deoptimizer-arm.cc b/src/arm/deoptimizer-arm.cc index c0884cf..caec55a 100644 --- a/src/arm/deoptimizer-arm.cc +++ b/src/arm/deoptimizer-arm.cc @@ -124,62 +124,14 @@ void Deoptimizer::DeoptimizeFunction(JSFunction* function) { void Deoptimizer::PatchStackCheckCodeAt(Address pc_after, Code* check_code, Code* replacement_code) { - const int kInstrSize = Assembler::kInstrSize; - // The call of the stack guard check has the following form: - // e1 5d 00 0c cmp sp, - // 2a 00 00 01 bcs ok - // e5 9f c? ?? ldr ip, [pc, ] - // e1 2f ff 3c blx ip - ASSERT(Memory::int32_at(pc_after - kInstrSize) == - (al | B24 | B21 | 15*B16 | 15*B12 | 15*B8 | BLX | ip.code())); - ASSERT(Assembler::IsLdrPcImmediateOffset( - Assembler::instr_at(pc_after - 2 * kInstrSize))); - - // We patch the code to the following form: - // e1 5d 00 0c cmp sp, - // e1 a0 00 00 mov r0, r0 (NOP) - // e5 9f c? ?? ldr ip, [pc, ] - // e1 2f ff 3c blx ip - // and overwrite the constant containing the - // address of the stack check stub. - - // Replace conditional jump with NOP. - CodePatcher patcher(pc_after - 3 * kInstrSize, 1); - patcher.masm()->nop(); - - // Replace the stack check address in the constant pool - // with the entry address of the replacement code. - uint32_t stack_check_address_offset = Memory::uint16_at(pc_after - - 2 * kInstrSize) & 0xfff; - Address stack_check_address_pointer = pc_after + stack_check_address_offset; - ASSERT(Memory::uint32_at(stack_check_address_pointer) == - reinterpret_cast(check_code->entry())); - Memory::uint32_at(stack_check_address_pointer) = - reinterpret_cast(replacement_code->entry()); + UNIMPLEMENTED(); } void Deoptimizer::RevertStackCheckCodeAt(Address pc_after, Code* check_code, Code* replacement_code) { - const int kInstrSize = Assembler::kInstrSize; - ASSERT(Memory::uint32_at(pc_after - kInstrSize) == 0xe12fff3c); - ASSERT(Memory::uint8_at(pc_after - kInstrSize - 1) == 0xe5); - ASSERT(Memory::uint8_at(pc_after - kInstrSize - 2) == 0x9f); - - // Replace NOP wi th conditional jump. - CodePatcher patcher(pc_after - 3 * kInstrSize, 1); - patcher.masm()->b(+4, cs); - - // Replace the stack check address in the constant pool - // with the entry address of the replacement code. - uint32_t stack_check_address_offset = Memory::uint16_at(pc_after - - 2 * kInstrSize) & 0xfff; - Address stack_check_address_pointer = pc_after + stack_check_address_offset; - ASSERT(Memory::uint32_at(stack_check_address_pointer) == - reinterpret_cast(replacement_code->entry())); - Memory::uint32_at(stack_check_address_pointer) = - reinterpret_cast(check_code->entry()); + UNIMPLEMENTED(); }