Moved some IA32 specific code from to the architecture dependent part of the ...

src/debug.cc

 // Copyright 2006-2008 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 267 matching lines @@
 void BreakLocationIterator::SetDebugBreak() {
   // If there is already a break point here just return. This might happen if
   // the same code is flooded with break points twice. Flooding the same
   // function twice might happen when stepping in a function with an exception
   // handler as the handler and the function is the same.
   if (IsDebugBreak()) {
     return;
   }
 
   if (RelocInfo::IsJSReturn(rmode())) {
-    // This path is currently only used on IA32 as JSExitFrame on ARM uses a
-    // stub.
-    // Patch the JS frame exit code with a debug break call. See
-    // VisitReturnStatement and ExitJSFrame in codegen-ia32.cc for the
-    // precise return instructions sequence.
-    ASSERT(Debug::kIa32JSReturnSequenceLength >=
-           Debug::kIa32CallInstructionLength);
-    rinfo()->patch_code_with_call(Debug::debug_break_return_entry()->entry(),
-        Debug::kIa32JSReturnSequenceLength - Debug::kIa32CallInstructionLength);
+    // Patch the frame exit code with a break point.
+    SetDebugBreakAtReturn();
   } else {
     // Patch the original code with the current address as the current address
     // might have changed by the inline caching since the code was copied.
     original_rinfo()->set_target_address(rinfo()->target_address());
 
     // Patch the code to invoke the builtin debug break function matching the
     // calling convention used by the call site.
     Handle<Code> dbgbrk_code(Debug::FindDebugBreak(rinfo()));
     rinfo()->set_target_address(dbgbrk_code->entry());
   }
   ASSERT(IsDebugBreak());
 }
 
 
 void BreakLocationIterator::ClearDebugBreak() {
   if (RelocInfo::IsJSReturn(rmode())) {
-    // Restore the JS frame exit code.
-    rinfo()->patch_code(original_rinfo()->pc(),
-                        Debug::kIa32JSReturnSequenceLength);
+    // Restore the frame exit code.
+    ClearDebugBreakAtReturn();
   } else {
     // Patch the code to the original invoke.
     rinfo()->set_target_address(original_rinfo()->target_address());
   }
   ASSERT(!IsDebugBreak());
 }
 
 
 void BreakLocationIterator::PrepareStepIn() {
   // Step in can only be prepared if currently positioned on an IC call or
@@ skipping 26 matching lines @@
 
 
 bool BreakLocationIterator::HasBreakPoint() {
   return debug_info_->HasBreakPoint(code_position());
 }
 
 
 // Check whether there is a debug break at the current position.
 bool BreakLocationIterator::IsDebugBreak() {
   if (RelocInfo::IsJSReturn(rmode())) {
-    // This is IA32 specific but works as long as the ARM version
-    // still uses a stub for JSExitFrame.
-    //
-    // TODO(1240753): Make the test architecture independent or split
-    // parts of the debugger into architecture dependent files.
-    return (*(rinfo()->pc()) == 0xE8);
+    return IsDebugBreakAtReturn();
   } else {
     return Debug::IsDebugBreak(rinfo()->target_address());
   }
 }
 
 
 Object* BreakLocationIterator::BreakPointObjects() {
   return debug_info_->GetBreakPointObjects(code_position());
 }
 
@@ skipping 1657 matching lines @@
 }
 
 
 void LockingMessageQueue::Clear() {
   ScopedLock sl(lock_);
   queue_.Clear();
 }
 
 
 } }  // namespace v8::internal