Cleaned up CpuFeature scope handling.

test/cctest/test-disasm-arm.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 406 matching lines @@
 
   VERIFY_RUN();
 }
 
 
 
 TEST(Vfp) {
   SET_UP();
 
   if (CpuFeatures::IsSupported(VFP3)) {
-    CpuFeatures::Scope scope(VFP3);
+    CpuFeatureScope scope(&assm, VFP3);
     COMPARE(vmov(d0, r2, r3),
             "ec432b10       vmov d0, r2, r3");
     COMPARE(vmov(r2, r3, d0),
             "ec532b10       vmov r2, r3, d0");
     COMPARE(vmov(d0, d1),
             "eeb00b41       vmov.f64 d0, d1");
     COMPARE(vmov(d3, d3, eq),
             "0eb03b43       vmoveq.f64 d3, d3");
 
     COMPARE(vmov(s0, s31),
@@ skipping 389 matching lines @@
   COMPARE(str(r0, MemOperand(r1, r2, PostIndex)),
           "e6810002       str r0, [r1], +r2");
   COMPARE(str(r0, MemOperand(r1, r2, NegPostIndex)),
           "e6010002       str r0, [r1], -r2");
   COMPARE(str(r0, MemOperand(r1, r2, PreIndex)),
           "e7a10002       str r0, [r1, +r2]!");
   COMPARE(str(r0, MemOperand(r1, r2, NegPreIndex)),
           "e7210002       str r0, [r1, -r2]!");
 
   if (CpuFeatures::IsSupported(ARMv7)) {
-    CpuFeatures::Scope scope(ARMv7);
+    CpuFeatureScope scope(&assm, ARMv7);
     COMPARE(ldrd(r0, r1, MemOperand(r1)),
             "e1c100d0       ldrd r0, [r1, #+0]");
     COMPARE(ldrd(r2, r3, MemOperand(r3, 127)),
             "e1c327df       ldrd r2, [r3, #+127]");
     COMPARE(ldrd(r4, r5, MemOperand(r5, -127)),
             "e14547df       ldrd r4, [r5, #-127]");
     COMPARE(ldrd(r6, r7, MemOperand(r7, 127, PostIndex)),
             "e0c767df       ldrd r6, [r7], #+127");
     COMPARE(ldrd(r8, r9, MemOperand(r9, -127, PostIndex)),
             "e04987df       ldrd r8, [r9], #-127");
@@ skipping 13 matching lines @@
     COMPARE(strd(r8, r9, MemOperand(r9, -127, PostIndex)),
             "e04987ff       strd r8, [r9], #-127");
     COMPARE(strd(r10, fp, MemOperand(fp, 127, PreIndex)),
             "e1eba7ff       strd r10, [fp, #+127]!");
     COMPARE(strd(ip, sp, MemOperand(sp, -127, PreIndex)),
             "e16dc7ff       strd ip, [sp, #-127]!");
   }
 
   VERIFY_RUN();
 }