Mercurial > hg > graal-compiler
changeset 3554:b20889b42d12
Added jdk tests to the runtest.sh script.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Mon, 22 Aug 2011 19:55:06 +0200 |
parents | 077add4e3ccc |
children | 22d11b3bc561 dbad39c24069 |
files | runtests.sh src/share/vm/graal/graalCodeInstaller.cpp |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/runtests.sh Mon Aug 22 14:51:23 2011 +0200 +++ b/runtests.sh Mon Aug 22 19:55:06 2011 +0200 @@ -12,4 +12,4 @@ exit 1; fi TESTDIR=${MAXINE}/com.oracle.max.vm/test -${JDK7}/bin/java -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt $@ -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads ${TESTDIR}/jtt/hotspot +${JDK7}/bin/java -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt $@ -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads ${TESTDIR}/jtt/hotspot
--- a/src/share/vm/graal/graalCodeInstaller.cpp Mon Aug 22 14:51:23 2011 +0200 +++ b/src/share/vm/graal/graalCodeInstaller.cpp Mon Aug 22 19:55:06 2011 +0200 @@ -603,11 +603,11 @@ _instructions->relocate(call->instruction_address(), runtime_call_Relocation::spec(), Assembler::call32_operand); TRACE_graal_3("CiRuntimeCall::CreateOutOfBoundsException()"); } else if (runtime_call == CiRuntimeCall::JavaTimeMillis()) { - call->set_destination((address)os::javaTimeMillis); + call->set_destination(CAST_FROM_FN_PTR(address, os::javaTimeMillis)); _instructions->relocate(call->instruction_address(), runtime_call_Relocation::spec(), Assembler::call32_operand); TRACE_graal_3("CiRuntimeCall::JavaTimeMillis()"); } else if (runtime_call == CiRuntimeCall::JavaTimeNanos()) { - call->set_destination((address)os::javaTimeNanos); + call->set_destination(CAST_FROM_FN_PTR(address, os::javaTimeNanos)); _instructions->relocate(call->instruction_address(), runtime_call_Relocation::spec(), Assembler::call32_operand); TRACE_graal_3("CiRuntimeCall::JavaTimeNanos()"); } else if (runtime_call == CiRuntimeCall::ArithmeticFrem()) {