stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8146100: compiler/jvmci/code/SimpleCodeInstallationTest.java JUnit Failure: expected:<12> but was:<109710641>

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Christian Thalinger 2015-12-23 11:36:46 -10:00
parent 066e504bba
commit ffa21cb2b2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/test/compiler/jvmci/code/amd64/AMD64TestAssembler.java
View File

@ -34,8 +34,10 @@ import jdk.vm.ci.code.DebugInfo;
import jdk.vm.ci.code.InfopointReason; import jdk.vm.ci.code.InfopointReason;
import jdk.vm.ci.code.Register; import jdk.vm.ci.code.Register;
import jdk.vm.ci.code.StackSlot; import jdk.vm.ci.code.StackSlot;
import jdk.vm.ci.code.CallingConvention.Type;
import jdk.vm.ci.hotspot.HotSpotConstant; import jdk.vm.ci.hotspot.HotSpotConstant;
import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.LIRKind; import jdk.vm.ci.meta.LIRKind;
import jdk.vm.ci.meta.VMConstant; import jdk.vm.ci.meta.VMConstant;
@ -61,11 +63,11 @@ public class AMD64TestAssembler extends TestAssembler {
} }
public Register emitIntArg0() { public Register emitIntArg0() {
return AMD64.rsi; return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, JavaKind.Int)[0];
} }
public Register emitIntArg1() { 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) { private void emitREX(boolean w, int r, int x, int b) {

6
hotspot/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java
View File

@ -32,8 +32,10 @@ import jdk.vm.ci.code.DebugInfo;
import jdk.vm.ci.code.InfopointReason; import jdk.vm.ci.code.InfopointReason;
import jdk.vm.ci.code.Register; import jdk.vm.ci.code.Register;
import jdk.vm.ci.code.StackSlot; import jdk.vm.ci.code.StackSlot;
import jdk.vm.ci.code.CallingConvention.Type;
import jdk.vm.ci.hotspot.HotSpotConstant; import jdk.vm.ci.hotspot.HotSpotConstant;
import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.LIRKind; import jdk.vm.ci.meta.LIRKind;
import jdk.vm.ci.meta.VMConstant; import jdk.vm.ci.meta.VMConstant;
import jdk.vm.ci.sparc.SPARC; import jdk.vm.ci.sparc.SPARC;
@ -80,11 +82,11 @@ public class SPARCTestAssembler extends TestAssembler {
} }
public Register emitIntArg0() { public Register emitIntArg0() {
return SPARC.i0; return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCallee, JavaKind.Int)[0];
} }
public Register emitIntArg1() { public Register emitIntArg1() {
return SPARC.i1; return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCallee, JavaKind.Int)[1];
} }
public Register emitLoadInt(int c) { public Register emitLoadInt(int c) {