Cleaned up CpuFeature scope handling.

test/cctest/test-disasm-ia32.cc

 // Copyright 2011 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 90 matching lines @@
   __ cmp(Operand(ebp, ecx, times_4, 0), Immediate(1000));
   Handle<FixedArray> foo2 = FACTORY->NewFixedArray(10, TENURED);
   __ cmp(ebx, foo2);
   __ cmpb(ebx, Operand(ebp, ecx, times_2, 0));
   __ cmpb(Operand(ebp, ecx, times_2, 0), ebx);
   __ or_(edx, 3);
   __ xor_(edx, 3);
   __ nop();
   {
     CHECK(CpuFeatures::IsSupported(CPUID));
-    CpuFeatures::Scope fscope(CPUID);
+    CpuFeatureScope fscope(&assm, CPUID);
     __ cpuid();
   }
   {
     CHECK(CpuFeatures::IsSupported(RDTSC));
-    CpuFeatures::Scope fscope(RDTSC);
+    CpuFeatureScope fscope(&assm, RDTSC);
     __ rdtsc();
   }
   __ movsx_b(edx, ecx);
   __ movsx_w(edx, ecx);
   __ movzx_b(edx, ecx);
   __ movzx_w(edx, ecx);
 
   __ nop();
   __ imul(edx, ecx);
   __ shld(edx, ecx);
@@ skipping 235 matching lines @@
 
   __ faddp(3);
   __ fsubp(3);
   __ fmulp(3);
   __ fdivp(3);
   __ fcompp();
   __ fwait();
   __ nop();
   {
     if (CpuFeatures::IsSupported(SSE2)) {
-      CpuFeatures::Scope fscope(SSE2);
+      CpuFeatureScope fscope(&assm, SSE2);
       __ cvttss2si(edx, Operand(ebx, ecx, times_4, 10000));
       __ cvtsi2sd(xmm1, Operand(ebx, ecx, times_4, 10000));
       __ addsd(xmm1, xmm0);
       __ mulsd(xmm1, xmm0);
       __ subsd(xmm1, xmm0);
       __ divsd(xmm1, xmm0);
       __ movdbl(xmm1, Operand(ebx, ecx, times_4, 10000));
       __ movdbl(Operand(ebx, ecx, times_4, 10000), xmm1);
       __ ucomisd(xmm0, xmm1);
 
       // 128 bit move instructions.
       __ movdqa(xmm0, Operand(ebx, ecx, times_4, 10000));
       __ movdqa(Operand(ebx, ecx, times_4, 10000), xmm0);
       __ movdqu(xmm0, Operand(ebx, ecx, times_4, 10000));
       __ movdqu(Operand(ebx, ecx, times_4, 10000), xmm0);
     }
   }
 
   // cmov.
   {
     if (CpuFeatures::IsSupported(CMOV)) {
-      CpuFeatures::Scope use_cmov(CMOV);
+      CpuFeatureScope use_cmov(&assm, CMOV);
       __ cmov(overflow, eax, Operand(eax, 0));
       __ cmov(no_overflow, eax, Operand(eax, 1));
       __ cmov(below, eax, Operand(eax, 2));
       __ cmov(above_equal, eax, Operand(eax, 3));
       __ cmov(equal, eax, Operand(ebx, 0));
       __ cmov(not_equal, eax, Operand(ebx, 1));
       __ cmov(below_equal, eax, Operand(ebx, 2));
       __ cmov(above, eax, Operand(ebx, 3));
       __ cmov(sign, eax, Operand(ecx, 0));
       __ cmov(not_sign, eax, Operand(ecx, 1));
       __ cmov(parity_even, eax, Operand(ecx, 2));
       __ cmov(parity_odd, eax, Operand(ecx, 3));
       __ cmov(less, eax, Operand(edx, 0));
       __ cmov(greater_equal, eax, Operand(edx, 1));
       __ cmov(less_equal, eax, Operand(edx, 2));
       __ cmov(greater, eax, Operand(edx, 3));
     }
   }
 
   // andpd, cmpltsd, movaps, psllq, psrlq, por.
   {
     if (CpuFeatures::IsSupported(SSE2)) {
-      CpuFeatures::Scope fscope(SSE2);
+      CpuFeatureScope fscope(&assm, SSE2);
       __ andpd(xmm0, xmm1);
       __ andpd(xmm1, xmm2);
 
       __ cmpltsd(xmm0, xmm1);
       __ cmpltsd(xmm1, xmm2);
 
       __ movaps(xmm0, xmm1);
       __ movaps(xmm1, xmm2);
 
       __ psllq(xmm0, 17);
       __ psllq(xmm1, 42);
 
       __ psllq(xmm0, xmm1);
       __ psllq(xmm1, xmm2);
 
       __ psrlq(xmm0, 17);
       __ psrlq(xmm1, 42);
 
       __ psrlq(xmm0, xmm1);
       __ psrlq(xmm1, xmm2);
 
       __ por(xmm0, xmm1);
       __ por(xmm1, xmm2);
     }
   }
 
   {
     if (CpuFeatures::IsSupported(SSE2) &&
         CpuFeatures::IsSupported(SSE4_1)) {
-      CpuFeatures::Scope scope(SSE4_1);
+      CpuFeatureScope scope(&assm, SSE4_1);
       __ pextrd(eax, xmm0, 1);
       __ pinsrd(xmm1, eax, 0);
     }
   }
 
   // Nop instructions
   for (int i = 0; i < 16; i++) {
     __ Nop(i);
   }
 
   __ ret(0);
 
   CodeDesc desc;
   assm.GetCode(&desc);
   Isolate* isolate = Isolate::Current();
   Object* code = isolate->heap()->CreateCode(
       desc,
       Code::ComputeFlags(Code::STUB),
       Handle<Code>())->ToObjectChecked();
   CHECK(code->IsCode());
 #ifdef OBJECT_PRINT
   Code::cast(code)->Print();
   byte* begin = Code::cast(code)->instruction_start();
   byte* end = begin + Code::cast(code)->instruction_size();
   disasm::Disassembler::Disassemble(stdout, begin, end);
 #endif
 }
 
 #undef __