Revision: 7237 Author: [email protected] Date: Thu Mar 17 06:00:24 2011 Log: ARM: Fix the debugger using wrong break stub for slot breaks
Porting r7203 to 2.2 branch. Review URL: http://codereview.chromium.org/6676064 http://code.google.com/p/v8/source/detail?r=7237 Modified: /branches/2.2/src/arm/debug-arm.cc /branches/2.2/src/version.cc ======================================= --- /branches/2.2/src/arm/debug-arm.cc Wed Aug 25 23:33:29 2010 +++ /branches/2.2/src/arm/debug-arm.cc Thu Mar 17 06:00:24 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.2/src/version.cc Wed Mar 16 01:48:18 2011 +++ /branches/2.2/src/version.cc Thu Mar 17 06:00:24 2011 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 2 #define BUILD_NUMBER 24 -#define PATCH_LEVEL 30 +#define PATCH_LEVEL 31 #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
