Mercurial > hg > truffle

changeset 15629:55be15d24e45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use HotSpotVMType for sizeof information
author twisti
date Tue, 13 May 2014 15:03:34 -0700
parents 4e9176d70690
children dcaf3993ad17
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java src/gpu/hsail/vm/vmStructs_hsail.hpp src/share/vm/runtime/vmStructs.cpp
diffstat 3 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Tue May 13 14:13:15 2014 -0700
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Tue May 13 15:03:34 2014 -0700
@@ -1033,9 +1033,9 @@
     @HotSpotVMField(name = "HSAILFrame::_pc_offset", type = "jint", get = HotSpotVMField.Type.OFFSET) @Stable public int hsailFramePcOffset;
     @HotSpotVMField(name = "HSAILFrame::_num_s_regs", type = "jbyte", get = HotSpotVMField.Type.OFFSET) @Stable public int hsailFrameNumSRegOffset;
     @HotSpotVMField(name = "HSAILFrame::_num_d_regs", type = "jbyte", get = HotSpotVMField.Type.OFFSET) @Stable public int hsailFrameNumDRegOffset;
-    @HotSpotVMConstant(name = "sizeof(HSAILFrame)") @Stable public int hsailFrameHeaderSize;
-    @HotSpotVMConstant(name = "sizeof(Hsail::HSAILKernelDeoptimization)") @Stable public int hsailKernelDeoptimizationHeaderSize;
-    @HotSpotVMConstant(name = "sizeof(Hsail::HSAILDeoptimizationInfo)") @Stable public int hsailDeoptimizationInfoHeaderSize;
+    @HotSpotVMType(name = "HSAILFrame", get = HotSpotVMType.Type.SIZE) @Stable public int hsailFrameHeaderSize;
+    @HotSpotVMType(name = "Hsail::HSAILKernelDeoptimization", get = HotSpotVMType.Type.SIZE) @Stable public int hsailKernelDeoptimizationHeaderSize;
+    @HotSpotVMType(name = "Hsail::HSAILDeoptimizationInfo", get = HotSpotVMType.Type.SIZE) @Stable public int hsailDeoptimizationInfoHeaderSize;
 
     /**
      * Mark word right shift to get identity hash code.
--- a/src/gpu/hsail/vm/vmStructs_hsail.hpp	Tue May 13 14:13:15 2014 -0700
+++ b/src/gpu/hsail/vm/vmStructs_hsail.hpp	Tue May 13 15:03:34 2014 -0700
@@ -53,9 +53,4 @@
   declare_toplevel_type(Hsail::HSAILKernelDeoptimization)            \
   declare_toplevel_type(Hsail::HSAILDeoptimizationInfo)
 
-#define VM_INT_CONSTANTS_GPU_HSAIL(declare_constant)                                                                                  \
-  declare_constant(sizeof(HSAILFrame))                                                                                                \
-  declare_constant(sizeof(Hsail::HSAILKernelDeoptimization))                                                                          \
-  declare_constant(sizeof(Hsail::HSAILDeoptimizationInfo))                                                                           \
-
 #endif // GPU_HSAIL_VM_VMSTRUCTS_HSAIL_HPP
--- a/src/share/vm/runtime/vmStructs.cpp	Tue May 13 14:13:15 2014 -0700
+++ b/src/share/vm/runtime/vmStructs.cpp	Tue May 13 15:03:34 2014 -0700
@@ -3124,7 +3124,6 @@
   VM_INT_CONSTANTS_GRAAL(GENERATE_VM_INT_CONSTANT_ENTRY,
                          GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
-  VM_INT_CONSTANTS_GPU_HSAIL(GENERATE_VM_INT_CONSTANT_ENTRY)
 #endif
 
 #if INCLUDE_ALL_GCS