Reviewers: Karl Klose,

Description:
ARM: Fix the debugger using wrong break stub for slot breaks

Porting r7203 to 2.5 branch.

Please review this at http://codereview.chromium.org/6676062/

SVN Base: http://v8.googlecode.com/svn/branches/2.5/

Affected files:
  M     src/arm/debug-arm.cc
  M     src/version.cc


Index: src/arm/debug-arm.cc
===================================================================
--- src/arm/debug-arm.cc        (revision 7203)
+++ src/arm/debug-arm.cc        (working copy)
@@ -115,7 +115,7 @@
   patcher.masm()->mov(v8::internal::lr, v8::internal::pc);
   patcher.masm()->ldr(v8::internal::pc, MemOperand(v8::internal::pc, -4));
 #endif
-  patcher.Emit(Debug::debug_break_return()->entry());
+  patcher.Emit(Debug::debug_break_slot()->entry());
 }


Index: src/version.cc
===================================================================
--- src/version.cc      (revision 7203)
+++ src/version.cc      (working copy)
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     2
 #define MINOR_VERSION     5
 #define BUILD_NUMBER      9
-#define PATCH_LEVEL       20
+#define PATCH_LEVEL       21
 #define CANDIDATE_VERSION false

 // Define SONAME to have the SCons build the put a specific SONAME into the


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to