Revision: 8928
Author: [email protected]
Date: Fri Aug 12 07:27:06 2011
Log: Merge r8868 into 3.2 branch, fix deoptimizer for two-word call
sites.
[email protected]
BUG=v8:1584
Review URL: http://codereview.chromium.org/7635018
http://code.google.com/p/v8/source/detail?r=8928
Modified:
/branches/3.2/src/arm/deoptimizer-arm.cc
/branches/3.2/src/arm/macro-assembler-arm.h
/branches/3.2/src/version.cc
=======================================
--- /branches/3.2/src/arm/deoptimizer-arm.cc Mon Apr 4 01:25:31 2011
+++ /branches/3.2/src/arm/deoptimizer-arm.cc Fri Aug 12 07:27:06 2011
@@ -65,8 +65,6 @@
// For each return after a safepoint insert an absolute call to the
// corresponding deoptimization entry.
- ASSERT(patch_size() % Assembler::kInstrSize == 0);
- int call_size_in_words = patch_size() / Assembler::kInstrSize;
unsigned last_pc_offset = 0;
SafepointTable table(function->code());
for (unsigned i = 0; i < table.length(); i++) {
@@ -87,13 +85,18 @@
#endif
last_pc_offset = pc_offset;
if (deoptimization_index != Safepoint::kNoDeoptimizationIndex) {
+ Address deoptimization_entry = Deoptimizer::GetDeoptimizationEntry(
+ deoptimization_index, Deoptimizer::LAZY);
last_pc_offset += gap_code_size;
+ int call_size_in_bytes =
MacroAssembler::CallSize(deoptimization_entry,
+ RelocInfo::NONE);
+ int call_size_in_words = call_size_in_bytes / Assembler::kInstrSize;
+ ASSERT(call_size_in_bytes % Assembler::kInstrSize == 0);
+ ASSERT(call_size_in_bytes <= patch_size());
CodePatcher patcher(code->instruction_start() + last_pc_offset,
call_size_in_words);
- Address deoptimization_entry = Deoptimizer::GetDeoptimizationEntry(
- deoptimization_index, Deoptimizer::LAZY);
patcher.masm()->Call(deoptimization_entry, RelocInfo::NONE);
- last_pc_offset += patch_size();
+ last_pc_offset += call_size_in_bytes;
}
}
=======================================
--- /branches/3.2/src/arm/macro-assembler-arm.h Mon Apr 4 01:25:31 2011
+++ /branches/3.2/src/arm/macro-assembler-arm.h Fri Aug 12 07:27:06 2011
@@ -100,11 +100,13 @@
void Jump(Register target, Condition cond = al);
void Jump(byte* target, RelocInfo::Mode rmode, Condition cond = al);
void Jump(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);
- int CallSize(Register target, Condition cond = al);
+ static int CallSize(Register target, Condition cond = al);
void Call(Register target, Condition cond = al);
- int CallSize(byte* target, RelocInfo::Mode rmode, Condition cond = al);
+ static int CallSize(byte* target, RelocInfo::Mode rmode, Condition cond
= al);
void Call(byte* target, RelocInfo::Mode rmode, Condition cond = al);
- int CallSize(Handle<Code> code, RelocInfo::Mode rmode, Condition cond =
al);
+ static int CallSize(Handle<Code> code,
+ RelocInfo::Mode rmode,
+ Condition cond = al);
void Call(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);
void Ret(Condition cond = al);
@@ -957,7 +959,9 @@
int num_arguments);
void Jump(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);
- int CallSize(intptr_t target, RelocInfo::Mode rmode, Condition cond =
al);
+ static int CallSize(intptr_t target,
+ RelocInfo::Mode rmode,
+ Condition cond = al);
void Call(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);
// Helper functions for generating invokes.
=======================================
--- /branches/3.2/src/version.cc Thu Aug 11 09:03:21 2011
+++ /branches/3.2/src/version.cc Fri Aug 12 07:27:06 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 36
+#define PATCH_LEVEL 37
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
