changeset 35144:f2381983e98e

8146100: compiler/jvmci/code/SimpleCodeInstallationTest.java JUnit Failure: expected:<12> but was:<109710641> Reviewed-by: kvn
author twisti
date Wed, 23 Dec 2015 11:36:46 -1000
parents 33daaea9d5c2
children a4ffa2fa7f4d
files hotspot/test/compiler/jvmci/code/amd64/AMD64TestAssembler.java hotspot/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/compiler/jvmci/code/amd64/AMD64TestAssembler.java	Wed Dec 23 07:27:42 2015 -1000
+++ b/hotspot/test/compiler/jvmci/code/amd64/AMD64TestAssembler.java	Wed Dec 23 11:36:46 2015 -1000
@@ -34,8 +34,10 @@
 import jdk.vm.ci.code.InfopointReason;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.StackSlot;
+import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.LIRKind;
 import jdk.vm.ci.meta.VMConstant;
 
@@ -61,11 +63,11 @@
     }
 
     public Register emitIntArg0() {
-        return AMD64.rsi;
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, JavaKind.Int)[0];
     }
 
     public Register emitIntArg1() {
-        return AMD64.rdx;
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, JavaKind.Int)[1];
     }
 
     private void emitREX(boolean w, int r, int x, int b) {
--- a/hotspot/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java	Wed Dec 23 07:27:42 2015 -1000
+++ b/hotspot/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java	Wed Dec 23 11:36:46 2015 -1000
@@ -32,8 +32,10 @@
 import jdk.vm.ci.code.InfopointReason;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.StackSlot;
+import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.LIRKind;
 import jdk.vm.ci.meta.VMConstant;
 import jdk.vm.ci.sparc.SPARC;
@@ -80,11 +82,11 @@
     }
 
     public Register emitIntArg0() {
-        return SPARC.i0;
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCallee, JavaKind.Int)[0];
     }
 
     public Register emitIntArg1() {
-        return SPARC.i1;
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCallee, JavaKind.Int)[1];
     }
 
     public Register emitLoadInt(int c) {