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

Side by Side Diff: src/platform-freebsd.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-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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 185 }
186 186
187 187
188 void OS::Abort() { 188 void OS::Abort() {
189 // Redirect to std abort to signal abnormal program termination. 189 // Redirect to std abort to signal abnormal program termination.
190 abort(); 190 abort();
191 } 191 }
192 192
193 193
194 void OS::DebugBreak() { 194 void OS::DebugBreak() {
195 #if defined(__arm__) || defined(__thumb__) 195 #if (defined(__arm__) || defined(__thumb__)) && \
196 defined(CAN_USE_ARMV5_INSTRUCTIONS)
196 asm("bkpt 0"); 197 asm("bkpt 0");
197 #else 198 #else
198 asm("int $3"); 199 asm("int $3");
199 #endif 200 #endif
200 } 201 }
201 202
202 203
203 class PosixMemoryMappedFile : public OS::MemoryMappedFile { 204 class PosixMemoryMappedFile : public OS::MemoryMappedFile {
204 public: 205 public:
205 PosixMemoryMappedFile(FILE* file, void* memory, int size) 206 PosixMemoryMappedFile(FILE* file, void* memory, int size)
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 } 655 }
655 656
656 // This sampler is no longer the active sampler. 657 // This sampler is no longer the active sampler.
657 active_sampler_ = NULL; 658 active_sampler_ = NULL;
658 active_ = false; 659 active_ = false;
659 } 660 }
660 661
661 #endif // ENABLE_LOGGING_AND_PROFILING 662 #endif // ENABLE_LOGGING_AND_PROFILING
662 663
663 } } // namespace v8::internal 664 } } // namespace v8::internal
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698