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

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

Issue 1094014: Merge the partial_snapshots branch back into bleeding_edge. For... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 10 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
OLDNEW
1 // Copyright 2006-2009 the V8 project authors. All rights reserved. 1 // Copyright 2006-2009 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 : "=r" (beg) 115 : "=r" (beg)
116 : "0" (beg), "r" (end), "r" (flg) 116 : "0" (beg), "r" (end), "r" (flg)
117 : "r3"); 117 : "r3");
118 #endif 118 #endif
119 #endif 119 #endif
120 #endif 120 #endif
121 } 121 }
122 122
123 123
124 void CPU::DebugBreak() { 124 void CPU::DebugBreak() {
125 #if !defined (__arm__) 125 #if !defined (__arm__) || !defined(CAN_USE_ARMV5_INSTRUCTIONS)
126 UNIMPLEMENTED(); // when building ARM emulator target 126 UNIMPLEMENTED(); // when building ARM emulator target
127 #else 127 #else
128 asm volatile("bkpt 0"); 128 asm volatile("bkpt 0");
129 #endif 129 #endif
130 } 130 }
131 131
132 } } // namespace v8::internal 132 } } // namespace v8::internal
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698