From: jkummerow@chromium.org Date: Fri, 28 Feb 2014 14:08:39 +0000 (+0000) Subject: Fix ARM/MIPS versions of r19607 X-Git-Tag: upstream/4.7.83~10525 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b4c59fc8198624e4a1cb4e44814b7f40e1de91e;p=platform%2Fupstream%2Fv8.git Fix ARM/MIPS versions of r19607 kNoCodeAgeSequenceLength is in bytes on ia32/x64, but in instructions on arm/mips. R=ulan@chromium.org Review URL: https://codereview.chromium.org/183893006 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19617 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/arm/deoptimizer-arm.cc b/src/arm/deoptimizer-arm.cc index 9b5f6e2..7855cbe 100644 --- a/src/arm/deoptimizer-arm.cc +++ b/src/arm/deoptimizer-arm.cc @@ -54,7 +54,7 @@ void Deoptimizer::PatchCodeForDeoptimization(Isolate* isolate, Code* code) { // Fail hard and early if we enter this code object again. byte* pointer = code->FindCodeAgeSequence(); if (pointer != NULL) { - pointer += kNoCodeAgeSequenceLength; + pointer += kNoCodeAgeSequenceLength * Assembler::kInstrSize; } else { pointer = code->instruction_start(); } diff --git a/src/mips/deoptimizer-mips.cc b/src/mips/deoptimizer-mips.cc index f0deef7..9d7dbc6 100644 --- a/src/mips/deoptimizer-mips.cc +++ b/src/mips/deoptimizer-mips.cc @@ -53,7 +53,7 @@ void Deoptimizer::PatchCodeForDeoptimization(Isolate* isolate, Code* code) { // Fail hard and early if we enter this code object again. byte* pointer = code->FindCodeAgeSequence(); if (pointer != NULL) { - pointer += kNoCodeAgeSequenceLength; + pointer += kNoCodeAgeSequenceLength * Assembler::kInstrSize; } else { pointer = code->instruction_start(); }