--- a/hotspot/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java Wed Jan 20 16:33:51 2016 +0100
+++ b/hotspot/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java Wed Jan 20 14:22:46 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,16 @@
package compiler.jvmci.code.sparc;
+import jdk.vm.ci.code.CallingConvention.Type;
import jdk.vm.ci.code.CodeCacheProvider;
-import jdk.vm.ci.code.CompilationResult;
-import jdk.vm.ci.code.CompilationResult.ConstantReference;
-import jdk.vm.ci.code.CompilationResult.DataSectionReference;
-import jdk.vm.ci.code.DataSection.Data;
import jdk.vm.ci.code.DebugInfo;
-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.code.site.ConstantReference;
+import jdk.vm.ci.code.site.DataSectionReference;
+import jdk.vm.ci.hotspot.HotSpotCompiledCode;
import jdk.vm.ci.hotspot.HotSpotConstant;
-import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.LIRKind;
import jdk.vm.ci.meta.VMConstant;
@@ -47,48 +45,53 @@
private static final int MASK13 = (1 << 13) - 1;
- public SPARCTestAssembler(CompilationResult result, CodeCacheProvider codeCache) {
- super(result, codeCache, 0, 16, SPARCKind.WORD, SPARC.l0, SPARC.l1, SPARC.l2, SPARC.l3, SPARC.l4, SPARC.l5, SPARC.l6, SPARC.l7);
+ public SPARCTestAssembler(CodeCacheProvider codeCache) {
+ super(codeCache, 0, 16, SPARCKind.WORD, SPARC.l0, SPARC.l1, SPARC.l2, SPARC.l3, SPARC.l4, SPARC.l5, SPARC.l6, SPARC.l7);
}
private void emitOp2(Register rd, int op2, int imm22) {
- emitInt((0b00 << 30) | (rd.encoding << 25) | (op2 << 22) | imm22);
+ code.emitInt((0b00 << 30) | (rd.encoding << 25) | (op2 << 22) | imm22);
}
private void emitOp3(int op, Register rd, int op3, Register rs1, Register rs2) {
- emitInt((op << 30) | (rd.encoding << 25) | (op3 << 19) | (rs1.encoding << 14) | rs2.encoding);
+ code.emitInt((op << 30) | (rd.encoding << 25) | (op3 << 19) | (rs1.encoding << 14) | rs2.encoding);
}
private void emitOp3(int op, Register rd, int op3, Register rs1, int simm13) {
- emitInt((op << 30) | (rd.encoding << 25) | (op3 << 19) | (rs1.encoding << 14) | (1 << 13) | (simm13 & MASK13));
+ code.emitInt((op << 30) | (rd.encoding << 25) | (op3 << 19) | (rs1.encoding << 14) | (1 << 13) | (simm13 & MASK13));
}
private void emitNop() {
- emitInt(1 << 24);
+ code.emitInt(1 << 24);
}
+ @Override
public void emitPrologue() {
emitOp3(0b10, SPARC.sp, 0b111100, SPARC.sp, -SPARC.REGISTER_SAFE_AREA_SIZE); // SAVE sp, -128, sp
}
@Override
- public void finish() {
+ public HotSpotCompiledCode finish(HotSpotResolvedJavaMethod method) {
frameSize += SPARC.REGISTER_SAFE_AREA_SIZE;
- super.finish();
+ return super.finish(method);
}
+ @Override
public void emitGrowStack(int size) {
emitOp3(0b10, SPARC.sp, 0b000100, SPARC.sp, size); // SUB sp, size, sp
}
+ @Override
public Register emitIntArg0() {
return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCallee, JavaKind.Int)[0];
}
+ @Override
public Register emitIntArg1() {
return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCallee, JavaKind.Int)[1];
}
+ @Override
public Register emitLoadInt(int c) {
Register ret = newRegister();
int hi = c >>> 10;
@@ -104,41 +107,46 @@
return ret;
}
+ @Override
public Register emitLoadLong(long c) {
if ((c & 0xFFFFFFFF) == c) {
return emitLoadInt((int) c);
} else {
- Data data = codeCache.createDataItem(JavaConstant.forLong(c));
- DataSectionReference ref = result.getDataSection().insertData(data);
+ DataSectionReference ref = new DataSectionReference();
+ ref.setOffset(data.position());
+ data.emitLong(c);
return emitLoadPointer(ref);
}
}
private void emitPatchableSethi(Register ret, boolean wide) {
- int startPos = position();
+ int startPos = code.position();
emitOp2(ret, 0b100, 0); // SETHI 0, ret
if (wide) {
// pad for later patching
- while (position() < (startPos + 28)) {
+ while (code.position() < (startPos + 28)) {
emitNop();
}
}
}
+ @Override
public Register emitLoadFloat(float c) {
- Data data = codeCache.createDataItem(JavaConstant.forFloat(c));
- DataSectionReference ref = result.getDataSection().insertData(data);
+ DataSectionReference ref = new DataSectionReference();
+ ref.setOffset(data.position());
+ data.emitFloat(c);
Register ptr = newRegister();
- result.recordDataPatch(position(), ref);
+ recordDataPatchInCode(ref);
emitPatchableSethi(ptr, true);
emitOp3(0b11, SPARC.f0, 0b100000, ptr, 0); // LDF [ptr+0], f0
return SPARC.f0;
}
+ @Override
public Register emitLoadPointer(HotSpotConstant c) {
Register ret = newRegister();
- result.recordDataPatch(position(), new ConstantReference((VMConstant) c));
+ recordDataPatchInCode(new ConstantReference((VMConstant) c));
emitPatchableSethi(ret, !c.isCompressed());
emitOp3(0b10, ret, 0b000010, ret, 0); // OR ret, 0, ret
@@ -146,58 +154,67 @@
return ret;
}
+ @Override
public Register emitLoadPointer(DataSectionReference ref) {
Register ret = newRegister();
- result.recordDataPatch(position(), ref);
+ recordDataPatchInCode(ref);
emitPatchableSethi(ret, true);
emitOp3(0b11, ret, 0b001011, ret, 0); // LDX [ret+0], ret
return ret;
}
+ @Override
public Register emitLoadNarrowPointer(DataSectionReference ref) {
Register ret = newRegister();
- result.recordDataPatch(position(), ref);
+ recordDataPatchInCode(ref);
emitPatchableSethi(ret, true);
emitOp3(0b11, ret, 0b000000, ret, 0); // LDUW [ret+0], ret
return ret;
}
+ @Override
public Register emitLoadPointer(Register b, int offset) {
Register ret = newRegister();
emitOp3(0b11, ret, 0b001011, b, offset); // LDX [b+offset], ret
return ret;
}
+ @Override
public StackSlot emitIntToStack(Register a) {
StackSlot ret = newStackSlot(LIRKind.value(SPARCKind.WORD));
emitOp3(0b11, a, 0b000100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS); // STW a, [fp+offset]
return ret;
}
+ @Override
public StackSlot emitLongToStack(Register a) {
StackSlot ret = newStackSlot(LIRKind.value(SPARCKind.XWORD));
emitOp3(0b11, a, 0b001110, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS); // STX a, [fp+offset]
return ret;
}
+ @Override
public StackSlot emitFloatToStack(Register a) {
StackSlot ret = newStackSlot(LIRKind.value(SPARCKind.SINGLE));
emitOp3(0b11, a, 0b100100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS); // STF a, [fp+offset]
return ret;
}
+ @Override
public StackSlot emitPointerToStack(Register a) {
StackSlot ret = newStackSlot(LIRKind.reference(SPARCKind.XWORD));
emitOp3(0b11, a, 0b001110, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS); // STX a, [fp+offset]
return ret;
}
+ @Override
public StackSlot emitNarrowPointerToStack(Register a) {
StackSlot ret = newStackSlot(LIRKind.reference(SPARCKind.WORD));
emitOp3(0b11, a, 0b000100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS); // STW a, [fp+offset]
return ret;
}
+ @Override
public Register emitUncompressPointer(Register compressed, long base, int shift) {
Register ret;
if (shift > 0) {
@@ -215,6 +232,7 @@
}
}
+ @Override
public Register emitIntAdd(Register a, Register b) {
Register ret = newRegister();
emitOp3(0b10, ret, 0b00000, a, b); // ADD a, b, ret
@@ -227,18 +245,21 @@
}
}
+ @Override
public void emitIntRet(Register a) {
emitPointerRet(a);
}
+ @Override
public void emitPointerRet(Register a) {
emitMove(SPARC.i0, a);
emitOp3(0b10, SPARC.g0, 0b111000, SPARC.i7, 8); // JMPL [i7+8], g0
emitOp3(0b10, SPARC.g0, 0b111101, SPARC.g0, SPARC.g0); // RESTORE g0, g0, g0
}
+ @Override
public void emitTrap(DebugInfo info) {
- result.recordInfopoint(position(), info, InfopointReason.IMPLICIT_EXCEPTION);
+ recordImplicitException(info);
emitOp3(0b11, SPARC.g0, 0b001011, SPARC.g0, 0); // LDX [g0+0], g0
}
}