Mercurial > hg > truffle

changeset 9883:477fb9a9a06d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Delegate compressed oop arguments from HotSpot to Graal
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Tue, 04 Jun 2013 13:54:44 +0200
parents cf071af51d94
children cecd40916b06
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java make/build-graal.xml src/share/vm/graal/graalCompilerToVM.cpp
diffstat 3 files changed, 13 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Tue Jun 04 13:46:58 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Tue Jun 04 13:54:44 2013 +0200
@@ -50,6 +50,13 @@
     public boolean useAESIntrinsics;
     public boolean useG1GC;
 
+    // Compressed Oops related values.
+    public boolean useCompressedOops;
+    public boolean useCompressedKlassPointers;
+    public long narrowOopBase;
+    public int narrowOopShift;
+    public int logMinObjAlignment;
+
     // CPU capabilities
     public int useSSE;
     public int useAVX;
--- a/make/build-graal.xml	Tue Jun 04 13:46:58 2013 +0200
+++ b/make/build-graal.xml	Tue Jun 04 13:54:44 2013 +0200
@@ -93,15 +93,6 @@
         <provider classname="com.oracle.graal.compiler.GraalDebugConfig_SummarizeDebugValues"/>
         <provider classname="com.oracle.graal.compiler.GraalDebugConfig_SummarizePerPhase"/>
         <provider classname="com.oracle.graal.compiler.GraalDebugConfig_Time"/>
-        <provider classname="com.oracle.graal.hotspot.CompilationTask_SlowQueueCutoff"/>
-        <provider classname="com.oracle.graal.hotspot.bridge.VMToCompilerImpl_BenchmarkDynamicCounters"/>
-        <provider classname="com.oracle.graal.hotspot.bridge.VMToCompilerImpl_GenericDynamicCounters"/>
-        <provider classname="com.oracle.graal.hotspot.bridge.VMToCompilerImpl_LogFile"/>
-        <provider classname="com.oracle.graal.hotspot.bridge.VMToCompilerImpl_PrintQueue"/>
-        <provider classname="com.oracle.graal.hotspot.bridge.VMToCompilerImpl_PriorityCompileQueue"/>
-        <provider classname="com.oracle.graal.hotspot.bridge.VMToCompilerImpl_SlowCompileThreads"/>
-        <provider classname="com.oracle.graal.hotspot.bridge.VMToCompilerImpl_Threads"/>
-        <provider classname="com.oracle.graal.hotspot.bridge.VMToCompilerImpl_TimedBootstrap"/>
       </service>
       <service type="com.oracle.graal.phases.tiers.CompilerConfiguration">
         <provider classname="com.oracle.graal.compiler.phases.BasicCompilerConfiguration"/>
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Tue Jun 04 13:46:58 2013 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Tue Jun 04 13:54:44 2013 +0200
@@ -831,6 +831,12 @@
   set_int("vmIntrinsicLinkToSpecial", vmIntrinsics::_linkToSpecial);
   set_int("vmIntrinsicLinkToInterface", vmIntrinsics::_linkToInterface);
 
+  set_boolean("useCompressedOops", UseCompressedOops);
+  set_boolean("useCompressedKlassPointers", UseCompressedKlassPointers);
+  set_address("narrowOopBase", Universe::narrow_oop_base());
+  set_int("narrowOopShift", Universe::narrow_oop_shift());
+  set_int("logMinObjAlignment", LogMinObjAlignmentInBytes);
+
   set_int("g1CardQueueIndexOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_index()));
   set_int("g1CardQueueBufferOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_buf()));
   set_int("logOfHRGrainBytes", HeapRegion::LogOfHRGrainBytes);