Disentangle assembler from isolate.

src/debug/arm/debug-arm.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_ARM
 
 #include "src/debug/debug.h"
 
 #include "src/assembler-inl.h"
 #include "src/codegen.h"
 #include "src/debug/liveedit.h"
 #include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {
 
 #define __ ACCESS_MASM(masm)
 
-
-void EmitDebugBreakSlot(MacroAssembler* masm) {
+namespace {
+void EmitDebugBreakSlot(Assembler* assembler) {
   Label check_size;
-  __ bind(&check_size);
+  assembler->bind(&check_size);
   for (int i = 0; i < Assembler::kDebugBreakSlotInstructions; i++) {
-    __ nop(MacroAssembler::DEBUG_BREAK_NOP);
+    assembler->nop(MacroAssembler::DEBUG_BREAK_NOP);
   }
   DCHECK_EQ(Assembler::kDebugBreakSlotInstructions,
-            masm->InstructionsGeneratedSince(&check_size));
+            assembler->InstructionsGeneratedSince(&check_size));
 }
-
+}  // anonymous namespace
 
 void DebugCodegen::GenerateSlot(MacroAssembler* masm, RelocInfo::Mode mode) {
   // Generate enough nop's to make space for a call instruction. Avoid emitting
   // the constant pool in the debug break slot code.
   Assembler::BlockConstPoolScope block_const_pool(masm);
   masm->RecordDebugBreakSlot(mode);
   EmitDebugBreakSlot(masm);
 }
 
 
 void DebugCodegen::ClearDebugBreakSlot(Isolate* isolate, Address pc) {
-  CodePatcher patcher(isolate, pc, Assembler::kDebugBreakSlotInstructions);
-  EmitDebugBreakSlot(patcher.masm());
+  PatchingAssembler patcher(Assembler::IsolateData(isolate), pc,
+                            Assembler::kDebugBreakSlotInstructions);
+  EmitDebugBreakSlot(&patcher);
+  patcher.FlushICache(isolate);
 }
 
 
 void DebugCodegen::PatchDebugBreakSlot(Isolate* isolate, Address pc,
                                        Handle<Code> code) {
   DCHECK(code->is_debug_stub());
-  CodePatcher patcher(isolate, pc, Assembler::kDebugBreakSlotInstructions);
+  PatchingAssembler patcher(Assembler::IsolateData(isolate), pc,
+                            Assembler::kDebugBreakSlotInstructions);
   // Patch the code changing the debug break slot code from
   //   mov r2, r2
   //   mov r2, r2
   //   mov r2, r2
   //   mov r2, r2
   // to a call to the debug break slot code.
   //   ldr ip, [pc, #0]
   //   b skip
   //   <debug break slot code entry point address>
   //   skip:
   //   blx ip
   Label skip_constant;
-  patcher.masm()->ldr(ip, MemOperand(v8::internal::pc, 0));
-  patcher.masm()->b(&skip_constant);
+  patcher.ldr(ip, MemOperand(v8::internal::pc, 0));
+  patcher.b(&skip_constant);
   patcher.Emit(code->entry());
-  patcher.masm()->bind(&skip_constant);
-  patcher.masm()->blx(ip);
+  patcher.bind(&skip_constant);
+  patcher.blx(ip);
+  patcher.FlushICache(isolate);
 }
 
 bool DebugCodegen::DebugBreakSlotIsPatched(Address pc) {
   Instr current_instr = Assembler::instr_at(pc);
   return !Assembler::IsNop(current_instr, Assembler::DEBUG_BREAK_NOP);
 }
 
 void DebugCodegen::GenerateDebugBreakStub(MacroAssembler* masm,
                                           DebugBreakCallHelperMode mode) {
   __ RecordComment("Debug break");
@@ skipping 69 matching lines @@
 
 
 const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM