| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 2974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2985 | 2985 |
| 2986 | 2986 |
| 2987 void Assembler::RecordComment(const char* msg, bool force) { | 2987 void Assembler::RecordComment(const char* msg, bool force) { |
| 2988 if (FLAG_code_comments || force) { | 2988 if (FLAG_code_comments || force) { |
| 2989 EnsureSpace ensure_space(this); | 2989 EnsureSpace ensure_space(this); |
| 2990 RecordRelocInfo(RelocInfo::COMMENT, reinterpret_cast<intptr_t>(msg)); | 2990 RecordRelocInfo(RelocInfo::COMMENT, reinterpret_cast<intptr_t>(msg)); |
| 2991 } | 2991 } |
| 2992 } | 2992 } |
| 2993 | 2993 |
| 2994 | 2994 |
| 2995 MaybeObject* Assembler::AllocateConstantPool(Heap* heap) { | 2995 Handle<ConstantPoolArray> Assembler::NewConstantPool(Isolate* isolate) { |
| 2996 // No out-of-line constant pool support. | 2996 // No out-of-line constant pool support. |
| 2997 UNREACHABLE(); | 2997 ASSERT(!FLAG_enable_ool_constant_pool); |
| 2998 return NULL; | 2998 return isolate->factory()->empty_constant_pool_array(); |
| 2999 } | 2999 } |
| 3000 | 3000 |
| 3001 | 3001 |
| 3002 void Assembler::PopulateConstantPool(ConstantPoolArray* constant_pool) { | 3002 void Assembler::PopulateConstantPool(ConstantPoolArray* constant_pool) { |
| 3003 // No out-of-line constant pool support. | 3003 // No out-of-line constant pool support. |
| 3004 UNREACHABLE(); | 3004 ASSERT(!FLAG_enable_ool_constant_pool); |
| 3005 return; |
| 3005 } | 3006 } |
| 3006 | 3007 |
| 3007 | 3008 |
| 3008 const int RelocInfo::kApplyMask = RelocInfo::kCodeTargetMask | | 3009 const int RelocInfo::kApplyMask = RelocInfo::kCodeTargetMask | |
| 3009 1 << RelocInfo::RUNTIME_ENTRY | | 3010 1 << RelocInfo::RUNTIME_ENTRY | |
| 3010 1 << RelocInfo::INTERNAL_REFERENCE | | 3011 1 << RelocInfo::INTERNAL_REFERENCE | |
| 3011 1 << RelocInfo::CODE_AGE_SEQUENCE; | 3012 1 << RelocInfo::CODE_AGE_SEQUENCE; |
| 3012 | 3013 |
| 3013 | 3014 |
| 3014 bool RelocInfo::IsCodedSpecially() { | 3015 bool RelocInfo::IsCodedSpecially() { |
| 3015 // The deserializer needs to know whether a pointer is specially coded. Being | 3016 // The deserializer needs to know whether a pointer is specially coded. Being |
| 3016 // specially coded on x64 means that it is a relative 32 bit address, as used | 3017 // specially coded on x64 means that it is a relative 32 bit address, as used |
| 3017 // by branch instructions. | 3018 // by branch instructions. |
| 3018 return (1 << rmode_) & kApplyMask; | 3019 return (1 << rmode_) & kApplyMask; |
| 3019 } | 3020 } |
| 3020 | 3021 |
| 3021 | 3022 |
| 3022 bool RelocInfo::IsInConstantPool() { | 3023 bool RelocInfo::IsInConstantPool() { |
| 3023 return false; | 3024 return false; |
| 3024 } | 3025 } |
| 3025 | 3026 |
| 3026 | 3027 |
| 3027 } } // namespace v8::internal | 3028 } } // namespace v8::internal |
| 3028 | 3029 |
| 3029 #endif // V8_TARGET_ARCH_X64 | 3030 #endif // V8_TARGET_ARCH_X64 |
| OLD | NEW |