# HG changeset patch
# User twisti
# Date 1400018614 25200
# Node ID 55be15d24e45e5636ee14d657616c6ffac039178
# Parent  4e9176d70690d088f84f2375339476002ea08868
use HotSpotVMType for sizeof information

diff -r 4e9176d70690 -r 55be15d24e45 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java
--- 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.
diff -r 4e9176d70690 -r 55be15d24e45 src/gpu/hsail/vm/vmStructs_hsail.hpp
--- 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
diff -r 4e9176d70690 -r 55be15d24e45 src/share/vm/runtime/vmStructs.cpp
--- 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