Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Side by Side Diff: src/arm/debug-arm.cc

Issue 6676037: ARM: Fix the debugger using wrong break stub for slot breaks... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // #endif 108 // #endif
109 // <debug break slot code entry point address> 109 // <debug break slot code entry point address>
110 CodePatcher patcher(rinfo()->pc(), Assembler::kDebugBreakSlotInstructions); 110 CodePatcher patcher(rinfo()->pc(), Assembler::kDebugBreakSlotInstructions);
111 #ifdef USE_BLX 111 #ifdef USE_BLX
112 patcher.masm()->ldr(v8::internal::ip, MemOperand(v8::internal::pc, 0)); 112 patcher.masm()->ldr(v8::internal::ip, MemOperand(v8::internal::pc, 0));
113 patcher.masm()->blx(v8::internal::ip); 113 patcher.masm()->blx(v8::internal::ip);
114 #else 114 #else
115 patcher.masm()->mov(v8::internal::lr, v8::internal::pc); 115 patcher.masm()->mov(v8::internal::lr, v8::internal::pc);
116 patcher.masm()->ldr(v8::internal::pc, MemOperand(v8::internal::pc, -4)); 116 patcher.masm()->ldr(v8::internal::pc, MemOperand(v8::internal::pc, -4));
117 #endif 117 #endif
118 patcher.Emit(Debug::debug_break_return()->entry()); 118 patcher.Emit(Debug::debug_break_slot()->entry());
119 } 119 }
120 120
121 121
122 void BreakLocationIterator::ClearDebugBreakAtSlot() { 122 void BreakLocationIterator::ClearDebugBreakAtSlot() {
123 ASSERT(IsDebugBreakSlot()); 123 ASSERT(IsDebugBreakSlot());
124 rinfo()->PatchCode(original_rinfo()->pc(), 124 rinfo()->PatchCode(original_rinfo()->pc(),
125 Assembler::kDebugBreakSlotInstructions); 125 Assembler::kDebugBreakSlotInstructions);
126 } 126 }
127 127
128 128
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 306
307 #undef __ 307 #undef __
308 308
309 309
310 310
311 #endif // ENABLE_DEBUGGER_SUPPORT 311 #endif // ENABLE_DEBUGGER_SUPPORT
312 312
313 } } // namespace v8::internal 313 } } // namespace v8::internal
314 314
315 #endif // V8_TARGET_ARCH_ARM 315 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698