Revision: 6551
Author: [email protected]
Date: Tue Feb 1 03:18:45 2011
Log: Change OSR stack check patching to use the stack check table.
Change OSR stack check patching to use the stack check table to iterate
over the calls to stack guards platform independent. Introduce
Deoptimizer::PatchStackCheckAt for each platform to perform the platform
specific patch at a given pc.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6392027
http://code.google.com/p/v8/source/detail?r=6551
Modified:
/branches/bleeding_edge/src/arm/deoptimizer-arm.cc
/branches/bleeding_edge/src/deoptimizer.cc
/branches/bleeding_edge/src/deoptimizer.h
/branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc
/branches/bleeding_edge/src/x64/deoptimizer-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/deoptimizer-arm.cc Mon Jan 24 23:57:56
2011
+++ /branches/bleeding_edge/src/arm/deoptimizer-arm.cc Tue Feb 1 03:18:45
2011
@@ -112,9 +112,9 @@
}
-void Deoptimizer::PatchStackCheckCode(Code* unoptimized_code,
- Code* check_code,
- Code* replacement_code) {
+void Deoptimizer::PatchStackCheckAt(Address pc_after,
+ Code* check_code,
+ Code* replacement_code) {
UNIMPLEMENTED();
}
=======================================
--- /branches/bleeding_edge/src/deoptimizer.cc Thu Jan 6 07:53:56 2011
+++ /branches/bleeding_edge/src/deoptimizer.cc Tue Feb 1 03:18:45 2011
@@ -808,6 +808,25 @@
if (!duplicate) *input_offset -= kPointerSize;
return true;
}
+
+
+void Deoptimizer::PatchStackCheckCode(Code* unoptimized_code,
+ Code* check_code,
+ Code* replacement_code) {
+ // Iterate over the stack check table and patch every stack check
+ // call to an unconditional call to the replacement code.
+ ASSERT(unoptimized_code->kind() == Code::FUNCTION);
+ Address stack_check_cursor = unoptimized_code->instruction_start() +
+ unoptimized_code->stack_check_table_start();
+ uint32_t table_length = Memory::uint32_at(stack_check_cursor);
+ stack_check_cursor += kIntSize;
+ for (uint32_t i = 0; i < table_length; ++i) {
+ uint32_t pc_offset = Memory::uint32_at(stack_check_cursor + kIntSize);
+ Address pc_after = unoptimized_code->instruction_start() + pc_offset;
+ PatchStackCheckAt(pc_after, check_code, replacement_code);
+ stack_check_cursor += 2 * kIntSize;
+ }
+}
unsigned Deoptimizer::ComputeInputFrameSize() const {
=======================================
--- /branches/bleeding_edge/src/deoptimizer.h Mon Jan 24 06:54:45 2011
+++ /branches/bleeding_edge/src/deoptimizer.h Tue Feb 1 03:18:45 2011
@@ -134,6 +134,12 @@
Code* check_code,
Code* replacement_code);
+ // Patch stack guard check at instruction before pc_after in
+ // the unoptimized code to unconditionally call replacement_code.
+ static void PatchStackCheckAt(Address pc_after,
+ Code* check_code,
+ Code* replacement_code);
+
// Change all patched stack guard checks in the unoptimized code
// back to a normal stack guard check.
static void RevertStackCheckCode(Code* unoptimized_code,
=======================================
--- /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc Tue Jan 25
00:59:16 2011
+++ /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc Tue Feb 1
03:18:45 2011
@@ -106,48 +106,35 @@
}
-void Deoptimizer::PatchStackCheckCode(Code* unoptimized_code,
- Code* check_code,
- Code* replacement_code) {
- // Iterate the unoptimized code and patch every stack check except at
- // the function entry. This code assumes the function entry stack
- // check appears first i.e., is not deferred or otherwise reordered.
- ASSERT(unoptimized_code->kind() == Code::FUNCTION);
- bool first = true;
- for (RelocIterator it(unoptimized_code, RelocInfo::kCodeTargetMask);
- !it.done();
- it.next()) {
- RelocInfo* rinfo = it.rinfo();
- if (rinfo->target_address() == Code::cast(check_code)->entry()) {
- if (first) {
- first = false;
- } else {
- // The stack check code matches the pattern:
- //
- // cmp esp, <limit>
- // jae ok
- // call <stack guard>
- // test eax, <loop nesting depth>
- // ok: ...
- //
- // We will patch away the branch so the code is:
- //
- // cmp esp, <limit> ;; Not changed
- // nop
- // nop
- // call <on-stack replacment>
- // test eax, <loop nesting depth>
- // ok:
- Address call_target_address = rinfo->pc();
- ASSERT(*(call_target_address - 3) == 0x73 && // jae
- *(call_target_address - 2) == 0x07 && // offset
- *(call_target_address - 1) == 0xe8); // call
- *(call_target_address - 3) = 0x90; // nop
- *(call_target_address - 2) = 0x90; // nop
- rinfo->set_target_address(replacement_code->entry());
- }
- }
- }
+void Deoptimizer::PatchStackCheckAt(Address pc_after,
+ Code* check_code,
+ Code* replacement_code) {
+ Address call_target_address = pc_after - kPointerSize;
+ ASSERT(check_code->entry() ==
+ Assembler::target_address_at(call_target_address));
+ // The stack check code matches the pattern:
+ //
+ // cmp esp, <limit>
+ // jae ok
+ // call <stack guard>
+ // test eax, <loop nesting depth>
+ // ok: ...
+ //
+ // We will patch away the branch so the code is:
+ //
+ // cmp esp, <limit> ;; Not changed
+ // nop
+ // nop
+ // call <on-stack replacment>
+ // test eax, <loop nesting depth>
+ // ok:
+ ASSERT(*(call_target_address - 3) == 0x73 && // jae
+ *(call_target_address - 2) == 0x07 && // offset
+ *(call_target_address - 1) == 0xe8); // call
+ *(call_target_address - 3) = 0x90; // nop
+ *(call_target_address - 2) = 0x90; // nop
+ Assembler::set_target_address_at(call_target_address,
+ replacement_code->entry());
}
=======================================
--- /branches/bleeding_edge/src/x64/deoptimizer-x64.cc Thu Jan 27 03:58:31
2011
+++ /branches/bleeding_edge/src/x64/deoptimizer-x64.cc Tue Feb 1 03:18:45
2011
@@ -107,9 +107,9 @@
}
-void Deoptimizer::PatchStackCheckCode(Code* unoptimized_code,
- Code* check_code,
- Code* replacement_code) {
+void Deoptimizer::PatchStackCheckAt(Address pc_after,
+ Code* check_code,
+ Code* replacement_code) {
UNIMPLEMENTED();
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
