Cleaned up CpuFeature scope handling.

src/assembler.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // All Rights Reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 // - Redistributions of source code must retain the above copyright notice,
 // this list of conditions and the following disclaimer.
 //
@@ skipping 97 matching lines @@
 static Mutex* math_exp_data_mutex = NULL;
 static double* math_exp_constants_array = NULL;
 static double* math_exp_log_table_array = NULL;
 
 // -----------------------------------------------------------------------------
 // Implementation of AssemblerBase
 
 AssemblerBase::AssemblerBase(Isolate* isolate, void* buffer, int buffer_size)
     : isolate_(isolate),
       jit_cookie_(0),
+      enabled_cpu_features_(0),
       emit_debug_code_(FLAG_debug_code),
       predictable_code_size_(false) {
   if (FLAG_mask_constants_with_cookie && isolate != NULL)  {
     jit_cookie_ = V8::RandomPrivate(isolate);
   }
 
   if (buffer == NULL) {
     // Do our own buffer management.
     if (buffer_size <= kMinimalBufferSize) {
       buffer_size = kMinimalBufferSize;
@@ skipping 45 matching lines @@
 PredictableCodeSizeScope::~PredictableCodeSizeScope() {
   // TODO(svenpanne) Remove the 'if' when everything works.
   if (expected_size_ >= 0) {
     CHECK_EQ(expected_size_, assembler_->pc_offset() - start_offset_);
   }
   assembler_->set_predictable_code_size(old_value_);
 }
 
 
 // -----------------------------------------------------------------------------
+// Implementation of PredictableCodeSizeScope

[Michael Starzinger, 2013/03/05 09:31:11]

Comment should say s/PredictableCodeSizeScope/CpuFeatureScope/ here.

[Sven Panne, 2013/03/05 10:38:01]

Done.

+
+#ifdef DEBUG
+CpuFeatureScope::CpuFeatureScope(AssemblerBase* assembler, CpuFeature f)
+    : assembler_(assembler) {
+  ASSERT(CpuFeatures::IsSupported(f));
+  ASSERT(!Serializer::enabled() ||
+         !CpuFeatures::IsFoundByRuntimeProbingOnly(f));
+  old_enabled_ = assembler_->enabled_cpu_features();
+  uint64_t mask = static_cast<uint64_t>(1) << f;
+  // TODO(svenpanne) This special case below doesn't belong here!
+#if V8_TARGET_ARCH_ARM
+  // VFP2 and ARMv7 are implied by VFP3.
+  if (f == VFP3) {
+    mask |=
+        static_cast<uint64_t>(1) << VFP2 |
+        static_cast<uint64_t>(1) << ARMv7;
+  }
+#endif
+  assembler_->set_enabled_cpu_features(old_enabled_ | mask);
+}
+
+
+CpuFeatureScope::~CpuFeatureScope() {
+  assembler_->set_enabled_cpu_features(old_enabled_);
+}
+#endif
+
+
+// -----------------------------------------------------------------------------
 // Implementation of Label
 
 int Label::pos() const {
   if (pos_ < 0) return -pos_ - 1;
   if (pos_ > 0) return  pos_ - 1;
   UNREACHABLE();
   return 0;
 }
 
 
@@ skipping 1415 matching lines @@
     assembler_->RecordRelocInfo(RelocInfo::POSITION, state_.current_position);
     state_.written_position = state_.current_position;
     written = true;
   }
 
   // Return whether something was written.
   return written;
 }
 
 } }  // namespace v8::internal