Index: src/x87/debug-x87.cc |
diff --git a/src/x87/debug-x87.cc b/src/x87/debug-x87.cc |
index cdbcbad966254ee8625889a53280f10616769b1c..8da8c2f063b7ae2731998c668da7b9ee12da0592 100644 |
--- a/src/x87/debug-x87.cc |
+++ b/src/x87/debug-x87.cc |
@@ -13,60 +13,60 @@ |
namespace v8 { |
namespace internal { |
-bool BreakLocationIterator::IsDebugBreakAtReturn() { |
- return Debug::IsDebugBreakAtReturn(rinfo()); |
-} |
+// Patch the code at the current PC with a call to the target address. |
+// Additional guard int3 instructions can be added if required. |
+void RelocInfo::PatchCodeWithCall(Address pc, Address target, int guard_bytes) { |
+ // Call instruction takes up 5 bytes and int3 takes up one byte. |
+ static const int kCallCodeSize = 5; |
+ int code_size = kCallCodeSize + guard_bytes; |
+ // Create a code patcher. |
+ CodePatcher patcher(pc, code_size); |
-// Patch the JS frame exit code with a debug break call. See |
-// CodeGenerator::VisitReturnStatement and VirtualFrame::Exit in codegen-x87.cc |
-// for the precise return instructions sequence. |
-void BreakLocationIterator::SetDebugBreakAtReturn() { |
- DCHECK(Assembler::kJSReturnSequenceLength >= |
- Assembler::kCallInstructionLength); |
- rinfo()->PatchCodeWithCall( |
- debug_info_->GetIsolate()->builtins()->Return_DebugBreak()->entry(), |
- Assembler::kJSReturnSequenceLength - Assembler::kCallInstructionLength); |
-} |
+// Add a label for checking the size of the code used for returning. |
+#ifdef DEBUG |
+ Label check_codesize; |
+ patcher.masm()->bind(&check_codesize); |
+#endif |
+ // Patch the code. |
+ patcher.masm()->call(target, RelocInfo::NONE32); |
-// Restore the JS frame exit code. |
-void BreakLocationIterator::ClearDebugBreakAtReturn() { |
- rinfo()->PatchCode(original_rinfo()->pc(), |
- Assembler::kJSReturnSequenceLength); |
-} |
+ // Check that the size of the code generated is as expected. |
+ DCHECK_EQ(kCallCodeSize, |
+ patcher.masm()->SizeOfCodeGeneratedSince(&check_codesize)); |
+ // Add the requested number of int3 instructions after the call. |
+ DCHECK_GE(guard_bytes, 0); |
+ for (int i = 0; i < guard_bytes; i++) { |
+ patcher.masm()->int3(); |
+ } |
-// A debug break in the frame exit code is identified by the JS frame exit code |
-// having been patched with a call instruction. |
-bool Debug::IsDebugBreakAtReturn(RelocInfo* rinfo) { |
- DCHECK(RelocInfo::IsJSReturn(rinfo->rmode())); |
- return rinfo->IsPatchedReturnSequence(); |
+ CpuFeatures::FlushICache(pc, code_size); |
} |
-bool BreakLocationIterator::IsDebugBreakAtSlot() { |
- DCHECK(IsDebugBreakSlot()); |
- // Check whether the debug break slot instructions have been patched. |
- return rinfo()->IsPatchedDebugBreakSlotSequence(); |
+// Patch the JS frame exit code with a debug break call. See |
+// CodeGenerator::VisitReturnStatement and VirtualFrame::Exit in codegen-x87.cc |
+// for the precise return instructions sequence. |
+void BreakLocation::SetDebugBreakAtReturn() { |
+ DCHECK(Assembler::kJSReturnSequenceLength >= |
+ Assembler::kCallInstructionLength); |
+ PatchCodeWithCall( |
+ pc(), debug_info_->GetIsolate()->builtins()->Return_DebugBreak()->entry(), |
+ Assembler::kJSReturnSequenceLength - Assembler::kCallInstructionLength); |
} |
void BreakLocationIterator::SetDebugBreakAtSlot() { |
DCHECK(IsDebugBreakSlot()); |
Isolate* isolate = debug_info_->GetIsolate(); |
- rinfo()->PatchCodeWithCall( |
- isolate->builtins()->Slot_DebugBreak()->entry(), |
+ rinfo().PatchCodeWithCall( |
+ pc(), isolate->builtins()->Slot_DebugBreak()->entry(), |
Assembler::kDebugBreakSlotLength - Assembler::kCallInstructionLength); |
} |
-void BreakLocationIterator::ClearDebugBreakAtSlot() { |
- DCHECK(IsDebugBreakSlot()); |
- rinfo()->PatchCode(original_rinfo()->pc(), Assembler::kDebugBreakSlotLength); |
-} |
- |
- |
#define __ ACCESS_MASM(masm) |
static void Generate_DebugBreakCallHelper(MacroAssembler* masm, |