Cleaned up some debugger stuff on ia32 and x64

src/x64/assembler-x64.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 156 matching lines @@
 }
 
 
 // -----------------------------------------------------------------------------
 // Implementation of RelocInfo
 
 // 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 target, int guard_bytes) {
   // Call instruction takes up 13 bytes and int3 takes up one byte.
+  static const int kCallInstructionSize = 13;
   Address patch_site = pc_;
   Memory::uint16_at(patch_site) = 0xBA49u;  // movq r10, imm64
   // Write "0x00, call r10" starting at last byte of address.  We overwrite
   // the 0x00 later, and this lets us write a uint32.
   Memory::uint32_at(patch_site + 9) = 0xD2FF4900u;  // 0x00, call r10
   Memory::Address_at(patch_site + 2) = target;
 
   // Add the requested number of int3 instructions after the call.
   for (int i = 0; i < guard_bytes; i++) {
-    *(patch_site + 13 + i) = 0xCC;  // int3
+    *(patch_site + kCallInstructionSize + i) = 0xCC;  // int3
   }
+
+  // Indicate that code has changed.
+  CPU::FlushICache(patch_site, kCallInstructionSize + guard_bytes);
 }
 
 
 void RelocInfo::PatchCode(byte* instructions, int instruction_count) {
   // Patch the code at the current address with the supplied instructions.
   for (int i = 0; i < instruction_count; i++) {
     *(pc_ + i) = *(instructions + i);
   }
 }
 
@@ skipping 70 matching lines @@
   } else {
     // use externally provided buffer instead
     ASSERT(buffer_size > 0);
     buffer_ = static_cast<byte*>(buffer);
     buffer_size_ = buffer_size;
     own_buffer_ = false;
   }
 
   // Clear the buffer in debug mode unless it was provided by the
   // caller in which case we can't be sure it's okay to overwrite
-  // existing code in it; see CodePatcher::CodePatcher(...).
+  // existing code in it.
 #ifdef DEBUG
   if (own_buffer_) {
     memset(buffer_, 0xCC, buffer_size);  // int3
   }
 #endif
 
   // setup buffer pointers
   ASSERT(buffer_ != NULL);
   pc_ = buffer_;
   reloc_info_writer.Reposition(buffer_ + buffer_size, pc_);
@@ skipping 2069 matching lines @@
     RecordRelocInfo(RelocInfo::POSITION, current_position_);
     written_position_ = current_position_;
   }
 }
 
 
 const int RelocInfo::kApplyMask = 1 << RelocInfo::INTERNAL_REFERENCE;
 
 
 } }  // namespace v8::internal