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

Side by Side Diff: src/x64/assembler-x64.cc

Issue 7945009: Merge experimental/gc branch to the bleeding_edge. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 3 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 | « src/x64/assembler-x64.h ('k') | src/x64/assembler-x64-inl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 29 matching lines...) Expand all
40 40
41 41
42 #ifdef DEBUG 42 #ifdef DEBUG
43 bool CpuFeatures::initialized_ = false; 43 bool CpuFeatures::initialized_ = false;
44 #endif 44 #endif
45 uint64_t CpuFeatures::supported_ = CpuFeatures::kDefaultCpuFeatures; 45 uint64_t CpuFeatures::supported_ = CpuFeatures::kDefaultCpuFeatures;
46 uint64_t CpuFeatures::found_by_runtime_probing_ = 0; 46 uint64_t CpuFeatures::found_by_runtime_probing_ = 0;
47 47
48 48
49 void CpuFeatures::Probe() { 49 void CpuFeatures::Probe() {
50 ASSERT(!initialized_); 50 ASSERT(supported_ == CpuFeatures::kDefaultCpuFeatures);
51 #ifdef DEBUG 51 #ifdef DEBUG
52 initialized_ = true; 52 initialized_ = true;
53 #endif 53 #endif
54 supported_ = kDefaultCpuFeatures; 54 supported_ = kDefaultCpuFeatures;
55 if (Serializer::enabled()) { 55 if (Serializer::enabled()) {
56 supported_ |= OS::CpuFeaturesImpliedByPlatform(); 56 supported_ |= OS::CpuFeaturesImpliedByPlatform();
57 return; // No features if we might serialize. 57 return; // No features if we might serialize.
58 } 58 }
59 59
60 const int kBufferSize = 4 * KB; 60 const int kBufferSize = 4 * KB;
(...skipping 2915 matching lines...) Expand 10 before | Expand all | Expand 10 after
2976 if (rmode == RelocInfo::EXTERNAL_REFERENCE) { 2976 if (rmode == RelocInfo::EXTERNAL_REFERENCE) {
2977 #ifdef DEBUG 2977 #ifdef DEBUG
2978 if (!Serializer::enabled()) { 2978 if (!Serializer::enabled()) {
2979 Serializer::TooLateToEnableNow(); 2979 Serializer::TooLateToEnableNow();
2980 } 2980 }
2981 #endif 2981 #endif
2982 if (!Serializer::enabled() && !emit_debug_code()) { 2982 if (!Serializer::enabled() && !emit_debug_code()) {
2983 return; 2983 return;
2984 } 2984 }
2985 } 2985 }
2986 RelocInfo rinfo(pc_, rmode, data); 2986 RelocInfo rinfo(pc_, rmode, data, NULL);
2987 reloc_info_writer.Write(&rinfo); 2987 reloc_info_writer.Write(&rinfo);
2988 } 2988 }
2989 2989
2990 void Assembler::RecordJSReturn() { 2990 void Assembler::RecordJSReturn() {
2991 positions_recorder()->WriteRecordedPositions(); 2991 positions_recorder()->WriteRecordedPositions();
2992 EnsureSpace ensure_space(this); 2992 EnsureSpace ensure_space(this);
2993 RecordRelocInfo(RelocInfo::JS_RETURN); 2993 RecordRelocInfo(RelocInfo::JS_RETURN);
2994 } 2994 }
2995 2995
2996 2996
(...skipping 21 matching lines...) Expand all
3018 // specially coded on x64 means that it is a relative 32 bit address, as used 3018 // specially coded on x64 means that it is a relative 32 bit address, as used
3019 // by branch instructions. 3019 // by branch instructions.
3020 return (1 << rmode_) & kApplyMask; 3020 return (1 << rmode_) & kApplyMask;
3021 } 3021 }
3022 3022
3023 3023
3024 3024
3025 } } // namespace v8::internal 3025 } } // namespace v8::internal
3026 3026
3027 #endif // V8_TARGET_ARCH_X64 3027 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/assembler-x64.h ('k') | src/x64/assembler-x64-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698