[JDK-8348174] Adapt JDK-8334717: Add JVMCI support for APX EGPRs

Author: dougxc

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/EspressoJVMCIRuntime.java

@@ -76,11 +76,11 @@ private static TargetDescription getHostTarget() {
             case "x86_64":
                 EnumSet<AMD64.CPUFeature> x8664v2 = EnumSet.of(AMD64.CPUFeature.CMOV, AMD64.CPUFeature.CX8, AMD64.CPUFeature.FXSR, AMD64.CPUFeature.MMX, AMD64.CPUFeature.SSE, AMD64.CPUFeature.SSE2,
                                 AMD64.CPUFeature.POPCNT, AMD64.CPUFeature.SSE3, AMD64.CPUFeature.SSE4_1, AMD64.CPUFeature.SSE4_2, AMD64.CPUFeature.SSSE3);
-                arch = new AMD64(x8664v2, EnumSet.of(AMD64.Flag.UseCountLeadingZerosInstruction, AMD64.Flag.UseCountTrailingZerosInstruction));
+                arch = new AMD64(x8664v2);
                 break;
             case "aarch64":
             case "arm64":
-                arch = new AArch64(EnumSet.of(AArch64.CPUFeature.FP), EnumSet.noneOf(AArch64.Flag.class));
+                arch = new AArch64(EnumSet.of(AArch64.CPUFeature.FP));
                 break;
             default:
                 throw JVMCIError.unimplemented(archString);

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/WebImageNoRegisterConfig.java

@@ -29,13 +29,14 @@
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.Register;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.ValueKindFactory;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.PlatformKind;
 
+import java.util.List;
+
 public class WebImageNoRegisterConfig implements SubstrateRegisterConfig {
     @Override
     public Register getReturnRegister(JavaKind kind) {
@@ -48,32 +49,32 @@ public CallingConvention getCallingConvention(CallingConvention.Type type, JavaT
     }
 
     @Override
-    public RegisterArray getCallingConventionRegisters(CallingConvention.Type type, JavaKind kind) {
+    public List<Register> getCallingConventionRegisters(CallingConvention.Type type, JavaKind kind) {
         throw VMError.shouldNotReachHereAtRuntime();
     }
 
     @Override
-    public RegisterArray getAllocatableRegisters() {
+    public List<Register> getAllocatableRegisters() {
         throw VMError.shouldNotReachHereAtRuntime();
     }
 
     @Override
-    public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers) {
+    public List<Register> filterAllocatableRegisters(PlatformKind kind, List<Register> registers) {
         throw VMError.shouldNotReachHereAtRuntime();
     }
 
     @Override
-    public RegisterArray getCallerSaveRegisters() {
+    public List<Register> getCallerSaveRegisters() {
         throw VMError.shouldNotReachHereAtRuntime();
     }
 
     @Override
-    public RegisterArray getCalleeSaveRegisters() {
+    public List<Register> getCalleeSaveRegisters() {
         throw VMError.shouldNotReachHereAtRuntime();
     }
 
     @Override
-    public RegisterAttributes[] getAttributesMap() {
+    public List<RegisterAttributes> getAttributesMap() {
         throw VMError.shouldNotReachHereAtRuntime();
     }