Cleaned up CpuFeature scope handling.

test/cctest/test-assembler-arm.cc

 // Copyright 2012 the V8 project authors. 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.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 234 matching lines @@
   T t;
 
   // Create a function that accepts &t, and loads, manipulates, and stores
   // the doubles and floats.
   Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
   Label L, C;
 
 
   if (CpuFeatures::IsSupported(VFP3)) {
-    CpuFeatures::Scope scope(VFP3);
+    CpuFeatureScope scope(&assm, VFP3);
 
     __ mov(ip, Operand(sp));
     __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
     __ sub(fp, ip, Operand(4));
 
     __ mov(r4, Operand(r0));
     __ vldr(d6, r4, OFFSET_OF(T, a));
     __ vldr(d7, r4, OFFSET_OF(T, b));
     __ vadd(d5, d6, d7);
     __ vstr(d5, r4, OFFSET_OF(T, c));
@@ skipping 97 matching lines @@
 
 TEST(5) {
   // Test the ARMv7 bitfield instructions.
   InitializeVM();
   v8::HandleScope scope;
 
   Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(ARMv7)) {
-    CpuFeatures::Scope scope(ARMv7);
+    CpuFeatureScope scope(&assm, ARMv7);
     // On entry, r0 = 0xAAAAAAAA = 0b10..10101010.
     __ ubfx(r0, r0, 1, 12);  // 0b00..010101010101 = 0x555
     __ sbfx(r0, r0, 0, 5);   // 0b11..111111110101 = -11
     __ bfc(r0, 1, 3);        // 0b11..111111110001 = -15
     __ mov(r1, Operand(7));
     __ bfi(r0, r1, 3, 3);    // 0b11..111111111001 = -7
     __ mov(pc, Operand(lr));
 
     CodeDesc desc;
     assm.GetCode(&desc);
@@ skipping 16 matching lines @@
 
 TEST(6) {
   // Test saturating instructions.
   InitializeVM();
   v8::HandleScope scope;
 
   Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(ARMv7)) {
-    CpuFeatures::Scope scope(ARMv7);
+    CpuFeatureScope scope(&assm, ARMv7);
     __ usat(r1, 8, Operand(r0));           // Sat 0xFFFF to 0-255 = 0xFF.
     __ usat(r2, 12, Operand(r0, ASR, 9));  // Sat (0xFFFF>>9) to 0-4095 = 0x7F.
     __ usat(r3, 1, Operand(r0, LSL, 16));  // Sat (0xFFFF<<16) to 0-1 = 0x0.
     __ add(r0, r1, Operand(r2));
     __ add(r0, r0, Operand(r3));
     __ mov(pc, Operand(lr));
 
     CodeDesc desc;
     assm.GetCode(&desc);
     Object* code = isolate->heap()->CreateCode(
@@ skipping 23 matching lines @@
                              double value,
                              int expected,
                              bool expected_exception = false) {
   InitializeVM();
   v8::HandleScope scope;
 
   Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(VFP3)) {
-    CpuFeatures::Scope scope(VFP3);
+    CpuFeatureScope scope(&assm, VFP3);
 
     Label wrong_exception;
 
     __ vmrs(r1);
     // Set custom FPSCR.
     __ bic(r2, r1, Operand(kVFPRoundingModeMask | kVFPExceptionMask));
     __ orr(r2, r2, Operand(mode));
     __ vmsr(r2);
 
     // Load value, convert, and move back result to r0 if everything went well.
@@ skipping 183 matching lines @@
     float h;
   } F;
   F f;
 
   // Create a function that uses vldm/vstm to move some double and
   // single precision values around in memory.
   Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(VFP2)) {
-    CpuFeatures::Scope scope(VFP2);
+    CpuFeatureScope scope(&assm, VFP2);
 
     __ mov(ip, Operand(sp));
     __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
     __ sub(fp, ip, Operand(4));
 
     __ add(r4, r0, Operand(OFFSET_OF(D, a)));
     __ vldm(ia_w, r4, d0, d3);
     __ vldm(ia_w, r4, d4, d7);
 
     __ add(r4, r0, Operand(OFFSET_OF(D, a)));
@@ skipping 91 matching lines @@
     float h;
   } F;
   F f;
 
   // Create a function that uses vldm/vstm to move some double and
   // single precision values around in memory.
   Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(VFP2)) {
-    CpuFeatures::Scope scope(VFP2);
+    CpuFeatureScope scope(&assm, VFP2);
 
     __ mov(ip, Operand(sp));
     __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
     __ sub(fp, ip, Operand(4));
 
     __ add(r4, r0, Operand(OFFSET_OF(D, a)));
     __ vldm(ia, r4, d0, d3);
     __ add(r4, r4, Operand(4 * 8));
     __ vldm(ia, r4, d4, d7);
 
@@ skipping 95 matching lines @@
     float h;
   } F;
   F f;
 
   // Create a function that uses vldm/vstm to move some double and
   // single precision values around in memory.
   Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
 
   if (CpuFeatures::IsSupported(VFP2)) {
-    CpuFeatures::Scope scope(VFP2);
+    CpuFeatureScope scope(&assm, VFP2);
 
     __ mov(ip, Operand(sp));
     __ stm(db_w, sp, r4.bit() | fp.bit() | lr.bit());
     __ sub(fp, ip, Operand(4));
 
     __ add(r4, r0, Operand(OFFSET_OF(D, h) + 8));
     __ vldm(db_w, r4, d4, d7);
     __ vldm(db_w, r4, d0, d3);
 
     __ add(r4, r0, Operand(OFFSET_OF(D, h) + 8));
@@ skipping 166 matching lines @@
   T t;
 
   // Create a function that accepts &t, and loads, manipulates, and stores
   // the doubles and floats.
   Isolate* isolate = Isolate::Current();
   Assembler assm(isolate, NULL, 0);
   Label L, C;
 
 
   if (CpuFeatures::IsSupported(VFP3)) {
-    CpuFeatures::Scope scope(VFP3);
+    CpuFeatureScope scope(&assm, VFP3);
 
     __ stm(db_w, sp, r4.bit() | lr.bit());
 
     // Load a, b, c into d16, d17, d18.
     __ mov(r4, Operand(r0));
     __ vldr(d16, r4, OFFSET_OF(T, a));
     __ vldr(d17, r4, OFFSET_OF(T, b));
     __ vldr(d18, r4, OFFSET_OF(T, c));
 
     __ vneg(d25, d16);
@@ skipping 68 matching lines @@
     CHECK_EQ(2.75, t.x);
     CHECK_EQ(1.5, t.y);
     CHECK_EQ(17.0, t.z);
     CHECK_EQ(14.7610017472335499, t.i);
     CHECK_EQ(16.0, t.j);
     CHECK_EQ(73.8818412254460241, t.k);
   }
 }
 
 #undef __