Mercurial > hg > truffle
changeset 10026:2beeb916aa31
Add arrayKlassOffset field to HotSpotVMConfig.
| author | Roland Schatz <roland.schatz@oracle.com> |
|---|---|
| date | Wed, 12 Jun 2013 16:28:43 +0200 |
| parents | 0c717bcb2988 |
| children | e561e0a6f727 |
| files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java src/share/vm/graal/graalCompilerToVM.cpp |
| diffstat | 3 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java Thu Jun 13 14:47:32 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java Wed Jun 12 16:28:43 2013 +0200 @@ -329,6 +329,11 @@ public int klassOffset; /** + * The offset of the injected array klass field in a {@link Class}. + */ + public int arrayKlassOffset; + + /** * The offset of the injected graal_mirror field in a {@link Class}. */ public int graalMirrorInClassOffset;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Thu Jun 13 14:47:32 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Wed Jun 12 16:28:43 2013 +0200 @@ -521,6 +521,11 @@ } @Fold + public static int arrayKlassOffset() { + return config().arrayKlassOffset; + } + + @Fold public static int classMirrorOffset() { return config().classMirrorOffset; }
--- a/src/share/vm/graal/graalCompilerToVM.cpp Thu Jun 13 14:47:32 2013 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Wed Jun 12 16:28:43 2013 +0200 @@ -726,6 +726,7 @@ set_int("klassModifierFlagsOffset", in_bytes(Klass::modifier_flags_offset())); set_int("klassAccessFlagsOffset", in_bytes(Klass::access_flags_offset())); set_int("klassOffset", java_lang_Class::klass_offset_in_bytes()); + set_int("arrayKlassOffset", java_lang_Class::array_klass_offset_in_bytes()); set_int("graalMirrorInClassOffset", java_lang_Class::graal_mirror_offset_in_bytes()); set_int("klassLayoutHelperOffset", in_bytes(Klass::layout_helper_offset())); set_int("klassSuperKlassOffset", in_bytes(Klass::super_offset()));