| OLD | NEW |
| 1 // Copyright (c) 1994-2006 Sun Microsystems Inc. | 1 // Copyright (c) 1994-2006 Sun Microsystems Inc. |
| 2 // All Rights Reserved. | 2 // All Rights Reserved. |
| 3 // | 3 // |
| 4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
| 5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
| 6 // met: | 6 // met: |
| 7 // | 7 // |
| 8 // - Redistributions of source code must retain the above copyright notice, | 8 // - Redistributions of source code must retain the above copyright notice, |
| 9 // this list of conditions and the following disclaimer. | 9 // this list of conditions and the following disclaimer. |
| 10 // | 10 // |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 // Implementation of CpuFeatureScope | 184 // Implementation of CpuFeatureScope |
| 185 | 185 |
| 186 #ifdef DEBUG | 186 #ifdef DEBUG |
| 187 CpuFeatureScope::CpuFeatureScope(AssemblerBase* assembler, CpuFeature f) | 187 CpuFeatureScope::CpuFeatureScope(AssemblerBase* assembler, CpuFeature f) |
| 188 : assembler_(assembler) { | 188 : assembler_(assembler) { |
| 189 ASSERT(CpuFeatures::IsSafeForSnapshot(f)); | 189 ASSERT(CpuFeatures::IsSafeForSnapshot(f)); |
| 190 old_enabled_ = assembler_->enabled_cpu_features(); | 190 old_enabled_ = assembler_->enabled_cpu_features(); |
| 191 uint64_t mask = static_cast<uint64_t>(1) << f; | 191 uint64_t mask = static_cast<uint64_t>(1) << f; |
| 192 // TODO(svenpanne) This special case below doesn't belong here! | 192 // TODO(svenpanne) This special case below doesn't belong here! |
| 193 #if V8_TARGET_ARCH_ARM | 193 #if V8_TARGET_ARCH_ARM |
| 194 // VFP2 and ARMv7 are implied by VFP3. | 194 // ARMv7 is implied by VFP3. |
| 195 if (f == VFP3) { | 195 if (f == VFP3) { |
| 196 mask |= | 196 mask |= static_cast<uint64_t>(1) << ARMv7; |
| 197 static_cast<uint64_t>(1) << VFP2 | | |
| 198 static_cast<uint64_t>(1) << ARMv7; | |
| 199 } | 197 } |
| 200 #endif | 198 #endif |
| 201 assembler_->set_enabled_cpu_features(old_enabled_ | mask); | 199 assembler_->set_enabled_cpu_features(old_enabled_ | mask); |
| 202 } | 200 } |
| 203 | 201 |
| 204 | 202 |
| 205 CpuFeatureScope::~CpuFeatureScope() { | 203 CpuFeatureScope::~CpuFeatureScope() { |
| 206 assembler_->set_enabled_cpu_features(old_enabled_); | 204 assembler_->set_enabled_cpu_features(old_enabled_); |
| 207 } | 205 } |
| 208 #endif | 206 #endif |
| (...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1640 assembler_->RecordRelocInfo(RelocInfo::POSITION, state_.current_position); | 1638 assembler_->RecordRelocInfo(RelocInfo::POSITION, state_.current_position); |
| 1641 state_.written_position = state_.current_position; | 1639 state_.written_position = state_.current_position; |
| 1642 written = true; | 1640 written = true; |
| 1643 } | 1641 } |
| 1644 | 1642 |
| 1645 // Return whether something was written. | 1643 // Return whether something was written. |
| 1646 return written; | 1644 return written; |
| 1647 } | 1645 } |
| 1648 | 1646 |
| 1649 } } // namespace v8::internal | 1647 } } // namespace v8::internal |
| OLD | NEW |