Mercurial > hg > truffle

diff src/share/vm/graal/graalCodeInstaller.cpp @ 3554:b20889b42d12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added jdk tests to the runtest.sh script.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Mon, 22 Aug 2011 19:55:06 +0200
parents aee1479c0a4b
children 22d11b3bc561
line wrap: on
line diff
--- 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()) {