Mercurial > hg > graal-compiler
changeset 22743:bcfb44655eb9
Updated imported jvmci version: updated InstalledCodeInvalidationTest
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Wed, 30 Sep 2015 17:59:48 -0700 |
| parents | 6ce390f5375f |
| children | 339272c9d519 |
| files | graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InstalledCodeInvalidationTest.java graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java graal/com.oracle.graal.truffle.hotspot.sparc/src/com/oracle/graal/truffle/hotspot/sparc/SPARCOptimizedCallTargetInstumentationFactory.java mx.graal/suite.py |
| diffstat | 4 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InstalledCodeInvalidationTest.java Wed Sep 30 15:30:59 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InstalledCodeInvalidationTest.java Wed Sep 30 17:59:48 2015 -0700 @@ -43,7 +43,9 @@ */ GraalDirectives.deoptimizeAndInvalidate(); + assert code.isAlive() && !code.isValid(); code.invalidate(); + assert !code.isAlive(); } if (GraalDirectives.inCompiledCode()) { /*
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java Wed Sep 30 15:30:59 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java Wed Sep 30 17:59:48 2015 -0700 @@ -57,13 +57,10 @@ Register spillRegister = AMD64.r10; // TODO(mg): fix me Label doProlog = new Label(); - AMD64Address codeBlobAddress = new AMD64Address(thisRegister, getFieldOffset("address", InstalledCode.class)); + AMD64Address codeBlobAddress = new AMD64Address(thisRegister, getFieldOffset("entryPoint", InstalledCode.class)); asm.movq(spillRegister, codeBlobAddress); - asm.cmpq(spillRegister, 0); + asm.testq(spillRegister, spillRegister); asm.jcc(ConditionFlag.Equal, doProlog); - - AMD64Address verifiedEntryPointAddress = new AMD64Address(spillRegister, config.nmethodEntryOffset); - asm.movq(spillRegister, verifiedEntryPointAddress); asm.jmp(spillRegister); asm.bind(doProlog);
--- a/graal/com.oracle.graal.truffle.hotspot.sparc/src/com/oracle/graal/truffle/hotspot/sparc/SPARCOptimizedCallTargetInstumentationFactory.java Wed Sep 30 15:30:59 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot.sparc/src/com/oracle/graal/truffle/hotspot/sparc/SPARCOptimizedCallTargetInstumentationFactory.java Wed Sep 30 17:59:48 2015 -0700 @@ -59,12 +59,10 @@ Register thisRegister = codeCache.getRegisterConfig().getCallingConventionRegisters(JavaCall, Object)[0]; Register spillRegister = scratch.getRegister(); Label doProlog = new Label(); - SPARCAddress codeBlobAddress = new SPARCAddress(thisRegister, getFieldOffset("address", InstalledCode.class)); - SPARCAddress verifiedEntryPointAddress = new SPARCAddress(spillRegister, config.nmethodEntryOffset); + SPARCAddress entryPointAddress = new SPARCAddress(thisRegister, getFieldOffset("entryPoint", InstalledCode.class)); - asm.ldx(codeBlobAddress, spillRegister); + asm.ldx(entryPointAddress, spillRegister); asm.compareBranch(spillRegister, 0, Equal, Xcc, doProlog, PREDICT_NOT_TAKEN, null); - asm.ldx(verifiedEntryPointAddress, spillRegister); // in delay slot asm.jmp(spillRegister); asm.nop(); asm.bind(doProlog);
--- a/mx.graal/suite.py Wed Sep 30 15:30:59 2015 -0700 +++ b/mx.graal/suite.py Wed Sep 30 17:59:48 2015 -0700 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "461dc858dc618019f68606349082146de7bf216c", + "version" : "cefe66df34551309bdda19adcb8ab4b226483e32", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},