[arm] Clean up use of IsSupported and IsEnabled.

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 487 matching lines @@
   COMPARE(mrs(r2, CPSR, ge), "a10f2000       mrsge r2, CPSR");
   COMPARE(mrs(r3, SPSR, lt), "b14f3000       mrslt r3, SPSR");
 
   VERIFY_RUN();
 }
 
 
 TEST(Vfp) {
   SET_UP();
 
-  if (CpuFeatures::IsSupported(VFP3)) {
-    CpuFeatureScope scope(&assm, VFP3);
+  if (CpuFeatures::IsSupported(VFPv3)) {
+    CpuFeatureScope scope(&assm, VFPv3);
     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 210 matching lines @@
             "eefdbbcb       vcvt.s32.f64 s23, d11");
     COMPARE(vcvt_u32_f32(s22, s21),
             "eebcbaea       vcvt.u32.f32 s22, s21");
     COMPARE(vcvt_u32_f64(s20, d10),
             "eebcabca       vcvt.u32.f64 s20, d10");
 
     COMPARE(vcvt_f64_s32(d9, 2),
             "eeba9bcf       vcvt.f64.s32 d9, d9, #2");
 
     if (CpuFeatures::IsSupported(VFP32DREGS)) {
+      CpuFeatureScope scope(&assm, VFP32DREGS);
       COMPARE(vmov(d3, d27),
               "eeb03b6b       vmov.f64 d3, d27");
       COMPARE(vmov(d18, d7),
               "eef02b47       vmov.f64 d18, d7");
       COMPARE(vmov(d18, r2, r3),
               "ec432b32       vmov d18, r2, r3");
       COMPARE(vmov(r2, r3, d18),
               "ec532b32       vmov r2, r3, d18");
       COMPARE(vmov(d20, d31),
               "eef04b6f       vmov.f64 d20, d31");
@@ skipping 83 matching lines @@
   }
 
   VERIFY_RUN();
 }
 
 
 TEST(ARMv8_vrintX_disasm) {
   SET_UP();
 
   if (CpuFeatures::IsSupported(ARMv8)) {
+    CpuFeatureScope scope(&assm, ARMv8);
     COMPARE(vrinta(d0, d0), "feb80b40       vrinta.f64.f64 d0, d0");
     COMPARE(vrinta(d2, d3), "feb82b43       vrinta.f64.f64 d2, d3");
 
     COMPARE(vrintp(d0, d0), "feba0b40       vrintp.f64.f64 d0, d0");
     COMPARE(vrintp(d2, d3), "feba2b43       vrintp.f64.f64 d2, d3");
 
     COMPARE(vrintn(d0, d0), "feb90b40       vrintn.f64.f64 d0, d0");
     COMPARE(vrintn(d2, d3), "feb92b43       vrintn.f64.f64 d2, d3");
 
     COMPARE(vrintm(d0, d0), "febb0b40       vrintm.f64.f64 d0, d0");
     COMPARE(vrintm(d2, d3), "febb2b43       vrintm.f64.f64 d2, d3");
 
     COMPARE(vrintz(d0, d0), "eeb60bc0       vrintz.f64.f64 d0, d0");
     COMPARE(vrintz(d2, d3, ne), "1eb62bc3       vrintzne.f64.f64 d2, d3");
   }
 
   VERIFY_RUN();
 }
 
 
 TEST(ARMv8_vminmax_disasm) {
   SET_UP();
 
   if (CpuFeatures::IsSupported(ARMv8)) {
+    CpuFeatureScope scope(&assm, ARMv8);
     COMPARE(vmaxnm(d0, d1, d2), "fe810b02       vmaxnm.f64 d0, d1, d2");
     COMPARE(vminnm(d3, d4, d5), "fe843b45       vminnm.f64 d3, d4, d5");
     COMPARE(vmaxnm(s6, s7, s8), "fe833a84       vmaxnm.f32 s6, s7, s8");
     COMPARE(vminnm(s9, s10, s11), "fec54a65       vminnm.f32 s9, s10, s11");
   }
 
   VERIFY_RUN();
 }
 
 
 TEST(ARMv8_vselX_disasm) {
   SET_UP();
 
   if (CpuFeatures::IsSupported(ARMv8)) {
+    CpuFeatureScope scope(&assm, ARMv8);
     // Native instructions.
     COMPARE(vsel(eq, d0, d1, d2),
             "fe010b02       vseleq.f64 d0, d1, d2");
     COMPARE(vsel(eq, s0, s1, s2),
             "fe000a81       vseleq.f32 s0, s1, s2");
     COMPARE(vsel(ge, d0, d1, d2),
             "fe210b02       vselge.f64 d0, d1, d2");
     COMPARE(vsel(ge, s0, s1, s2),
             "fe200a81       vselge.f32 s0, s1, s2");
     COMPARE(vsel(gt, d0, d1, d2),
@@ skipping 328 matching lines @@
 
   COMPARE(ldrexb(r0, r1), "e1d10f9f       ldrexb r0, [r1]");
   COMPARE(strexb(r0, r1, r2), "e1c20f91       strexb r0, r1, [r2]");
   COMPARE(ldrexh(r0, r1), "e1f10f9f       ldrexh r0, [r1]");
   COMPARE(strexh(r0, r1, r2), "e1e20f91       strexh r0, r1, [r2]");
   COMPARE(ldrex(r0, r1), "e1910f9f       ldrex r0, [r1]");
   COMPARE(strex(r0, r1, r2), "e1820f91       strex r0, r1, [r2]");
 
   VERIFY_RUN();
 }