Mercurial > hg > graal-compiler
diff graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java @ 18525:be44c1ca8f00
removed static access to HotSpotGraalRuntime from some AMD64 HotSpot classes
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 26 Nov 2014 12:05:56 +0100 |
| parents | ed29f7ff71eb |
| children | 8fc336a04d77 |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java Wed Nov 26 11:48:34 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java Wed Nov 26 12:05:56 2014 +0100 @@ -44,12 +44,14 @@ @Alive(REG) AllocatableValue framePc; @Alive(REG) AllocatableValue senderSp; @Alive(REG) AllocatableValue initialInfo; + private final HotSpotVMConfig config; - AMD64HotSpotPushInterpreterFrameOp(AllocatableValue frameSize, AllocatableValue framePc, AllocatableValue senderSp, AllocatableValue initialInfo) { + AMD64HotSpotPushInterpreterFrameOp(AllocatableValue frameSize, AllocatableValue framePc, AllocatableValue senderSp, AllocatableValue initialInfo, HotSpotVMConfig config) { this.frameSize = frameSize; this.framePc = framePc; this.senderSp = senderSp; this.initialInfo = initialInfo; + this.config = config; } @Override @@ -58,8 +60,7 @@ final Register framePcRegister = asRegister(framePc); final Register senderSpRegister = asRegister(senderSp); final Register initialInfoRegister = asRegister(initialInfo); - final HotSpotVMConfig config = HotSpotGraalRuntime.runtime().getConfig(); - final int wordSize = HotSpotGraalRuntime.runtime().getTarget().wordSize; + final int wordSize = 8; // We'll push PC and BP by hand. masm.subq(frameSizeRegister, 2 * wordSize);