Revision: 7231 Author: [email protected] Date: Thu Mar 17 05:54:39 2011 Log: ARM: Fix the debugger using wrong break stub for slot breaks
Porting r7203 to 2.5 branch. Review URL: http://codereview.chromium.org/6676062 http://code.google.com/p/v8/source/detail?r=7231 Modified: /branches/2.5/src/arm/debug-arm.cc /branches/2.5/src/version.cc ======================================= --- /branches/2.5/src/arm/debug-arm.cc Mon Nov 29 00:02:25 2010 +++ /branches/2.5/src/arm/debug-arm.cc Thu Mar 17 05:54:39 2011 @@ -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()); } ======================================= --- /branches/2.5/src/version.cc Tue Mar 15 14:59:05 2011 +++ /branches/2.5/src/version.cc Thu Mar 17 05:54:39 2011 @@ -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
