Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/vmStructs.cpp @ 13098:d61687130412
move GRAAL_ONLY stuff from vmStructs.cpp to separate vmStructs_graal.hpp file
author | twisti |
---|---|
date | Wed, 20 Nov 2013 16:55:54 -0800 |
parents | 096c224171c4 |
children | 1dd9aa5a9ee5 |
comparison
equal
deleted
inserted
replaced
13097:14db5ffd5ed9 | 13098:d61687130412 |
---|---|
101 #include "runtime/vmStructs.hpp" | 101 #include "runtime/vmStructs.hpp" |
102 #include "utilities/array.hpp" | 102 #include "utilities/array.hpp" |
103 #include "utilities/globalDefinitions.hpp" | 103 #include "utilities/globalDefinitions.hpp" |
104 #include "utilities/hashtable.hpp" | 104 #include "utilities/hashtable.hpp" |
105 #include "utilities/macros.hpp" | 105 #include "utilities/macros.hpp" |
106 #ifdef GRAAL | |
107 # include "graal/vmStructs_graal.hpp" | |
108 #endif | |
106 #ifdef TARGET_ARCH_x86 | 109 #ifdef TARGET_ARCH_x86 |
107 # include "vmStructs_x86.hpp" | 110 # include "vmStructs_x86.hpp" |
108 #endif | 111 #endif |
109 #ifdef TARGET_ARCH_sparc | 112 #ifdef TARGET_ARCH_sparc |
110 # include "vmStructs_sparc.hpp" | 113 # include "vmStructs_sparc.hpp" |
874 nonstatic_field(nmethod, _compile_id, int) \ | 877 nonstatic_field(nmethod, _compile_id, int) \ |
875 nonstatic_field(nmethod, _comp_level, int) \ | 878 nonstatic_field(nmethod, _comp_level, int) \ |
876 nonstatic_field(nmethod, _exception_cache, ExceptionCache*) \ | 879 nonstatic_field(nmethod, _exception_cache, ExceptionCache*) \ |
877 nonstatic_field(nmethod, _marked_for_deoptimization, bool) \ | 880 nonstatic_field(nmethod, _marked_for_deoptimization, bool) \ |
878 \ | 881 \ |
879 unchecked_c2_static_field(Deoptimization, _trap_reason_name, void*) \ | 882 unchecked_c2_static_field(Deoptimization, _trap_reason_name, void*) \ |
883 \ | |
884 nonstatic_field(Deoptimization::UnrollBlock, _size_of_deoptimized_frame, int) \ | |
885 nonstatic_field(Deoptimization::UnrollBlock, _caller_adjustment, int) \ | |
886 nonstatic_field(Deoptimization::UnrollBlock, _number_of_frames, int) \ | |
887 nonstatic_field(Deoptimization::UnrollBlock, _total_frame_sizes, int) \ | |
888 nonstatic_field(Deoptimization::UnrollBlock, _frame_sizes, intptr_t*) \ | |
889 nonstatic_field(Deoptimization::UnrollBlock, _frame_pcs, address*) \ | |
890 nonstatic_field(Deoptimization::UnrollBlock, _register_block, intptr_t*) \ | |
891 nonstatic_field(Deoptimization::UnrollBlock, _return_type, BasicType) \ | |
892 nonstatic_field(Deoptimization::UnrollBlock, _initial_info, intptr_t) \ | |
893 nonstatic_field(Deoptimization::UnrollBlock, _caller_actual_parameters, int) \ | |
880 \ | 894 \ |
881 /********************************/ \ | 895 /********************************/ \ |
882 /* JavaCalls (NOTE: incomplete) */ \ | 896 /* JavaCalls (NOTE: incomplete) */ \ |
883 /********************************/ \ | 897 /********************************/ \ |
884 \ | 898 \ |
1250 \ | 1264 \ |
1251 static_field(java_lang_Class, _klass_offset, int) \ | 1265 static_field(java_lang_Class, _klass_offset, int) \ |
1252 static_field(java_lang_Class, _array_klass_offset, int) \ | 1266 static_field(java_lang_Class, _array_klass_offset, int) \ |
1253 static_field(java_lang_Class, _oop_size_offset, int) \ | 1267 static_field(java_lang_Class, _oop_size_offset, int) \ |
1254 static_field(java_lang_Class, _static_oop_field_count_offset, int) \ | 1268 static_field(java_lang_Class, _static_oop_field_count_offset, int) \ |
1255 GRAAL_ONLY(static_field(java_lang_Class, _graal_mirror_offset, int)) \ | |
1256 \ | 1269 \ |
1257 /************************/ \ | 1270 /************************/ \ |
1258 /* Miscellaneous fields */ \ | 1271 /* Miscellaneous fields */ \ |
1259 /************************/ \ | 1272 /************************/ \ |
1260 \ | 1273 \ |
1287 nonstatic_field(FreeChunk, _prev, FreeChunk*) \ | 1300 nonstatic_field(FreeChunk, _prev, FreeChunk*) \ |
1288 nonstatic_field(FreeList<FreeChunk>, _size, size_t) \ | 1301 nonstatic_field(FreeList<FreeChunk>, _size, size_t) \ |
1289 nonstatic_field(FreeList<Metablock>, _size, size_t) \ | 1302 nonstatic_field(FreeList<Metablock>, _size, size_t) \ |
1290 nonstatic_field(FreeList<FreeChunk>, _count, ssize_t) \ | 1303 nonstatic_field(FreeList<FreeChunk>, _count, ssize_t) \ |
1291 nonstatic_field(FreeList<Metablock>, _count, ssize_t) \ | 1304 nonstatic_field(FreeList<Metablock>, _count, ssize_t) \ |
1292 nonstatic_field(MetablockTreeDictionary, _total_size, size_t) \ | 1305 nonstatic_field(MetablockTreeDictionary, _total_size, size_t) |
1293 GRAAL_ONLY(nonstatic_field(CompilerStatistics, _standard, CompilerStatistics::Data)) \ | |
1294 GRAAL_ONLY(nonstatic_field(CompilerStatistics, _osr, CompilerStatistics::Data)) \ | |
1295 GRAAL_ONLY(nonstatic_field(CompilerStatistics, _nmethods_size, int)) \ | |
1296 GRAAL_ONLY(nonstatic_field(CompilerStatistics, _nmethods_code_size, int)) \ | |
1297 GRAAL_ONLY(nonstatic_field(CompilerStatistics::Data, _bytes, int)) \ | |
1298 GRAAL_ONLY(nonstatic_field(CompilerStatistics::Data, _count, int)) \ | |
1299 GRAAL_ONLY(nonstatic_field(CompilerStatistics::Data, _time, elapsedTimer)) | |
1300 | 1306 |
1301 //-------------------------------------------------------------------------------- | 1307 //-------------------------------------------------------------------------------- |
1302 // VM_TYPES | 1308 // VM_TYPES |
1303 // | 1309 // |
1304 // This list must enumerate at least all of the types in the above | 1310 // This list must enumerate at least all of the types in the above |
1668 declare_toplevel_type(ExceptionCache) \ | 1674 declare_toplevel_type(ExceptionCache) \ |
1669 declare_toplevel_type(PcDescCache) \ | 1675 declare_toplevel_type(PcDescCache) \ |
1670 declare_toplevel_type(Dependencies) \ | 1676 declare_toplevel_type(Dependencies) \ |
1671 declare_toplevel_type(CompileTask) \ | 1677 declare_toplevel_type(CompileTask) \ |
1672 declare_toplevel_type(Deoptimization) \ | 1678 declare_toplevel_type(Deoptimization) \ |
1679 declare_toplevel_type(Deoptimization::UnrollBlock) \ | |
1673 \ | 1680 \ |
1674 /************************/ \ | 1681 /************************/ \ |
1675 /* OopMap and OopMapSet */ \ | 1682 /* OopMap and OopMapSet */ \ |
1676 /************************/ \ | 1683 /************************/ \ |
1677 \ | 1684 \ |
2161 \ | 2168 \ |
2162 /***************/ \ | 2169 /***************/ \ |
2163 /* Miscellaneous types */ \ | 2170 /* Miscellaneous types */ \ |
2164 /***************/ \ | 2171 /***************/ \ |
2165 \ | 2172 \ |
2166 GRAAL_ONLY(declare_toplevel_type(CompilerStatistics)) \ | |
2167 GRAAL_ONLY(declare_toplevel_type(CompilerStatistics::Data)) \ | |
2168 declare_toplevel_type(PtrQueue) \ | 2173 declare_toplevel_type(PtrQueue) \ |
2169 \ | 2174 \ |
2170 /* freelist */ \ | 2175 /* freelist */ \ |
2171 declare_toplevel_type(FreeChunk*) \ | 2176 declare_toplevel_type(FreeChunk*) \ |
2172 declare_toplevel_type(Metablock*) \ | 2177 declare_toplevel_type(Metablock*) \ |
2508 declare_constant(Deoptimization::Action_reinterpret) \ | 2513 declare_constant(Deoptimization::Action_reinterpret) \ |
2509 declare_constant(Deoptimization::Action_make_not_entrant) \ | 2514 declare_constant(Deoptimization::Action_make_not_entrant) \ |
2510 declare_constant(Deoptimization::Action_make_not_compilable) \ | 2515 declare_constant(Deoptimization::Action_make_not_compilable) \ |
2511 declare_constant(Deoptimization::Action_LIMIT) \ | 2516 declare_constant(Deoptimization::Action_LIMIT) \ |
2512 \ | 2517 \ |
2518 declare_constant(Deoptimization::Unpack_deopt) \ | |
2519 declare_constant(Deoptimization::Unpack_exception) \ | |
2520 declare_constant(Deoptimization::Unpack_uncommon_trap) \ | |
2521 declare_constant(Deoptimization::Unpack_reexecute) \ | |
2522 \ | |
2513 /*********************/ \ | 2523 /*********************/ \ |
2514 /* Matcher (C2 only) */ \ | 2524 /* Matcher (C2 only) */ \ |
2515 /*********************/ \ | 2525 /*********************/ \ |
2516 \ | 2526 \ |
2517 declare_c2_preprocessor_constant("Matcher::interpreter_frame_pointer_reg", Matcher::interpreter_frame_pointer_reg()) \ | 2527 declare_c2_preprocessor_constant("Matcher::interpreter_frame_pointer_reg", Matcher::interpreter_frame_pointer_reg()) \ |
2903 GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY, | 2913 GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY, |
2904 GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY, | 2914 GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY, |
2905 GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY, | 2915 GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY, |
2906 GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY) | 2916 GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY) |
2907 | 2917 |
2918 #ifdef GRAAL | |
2919 VM_STRUCTS_GRAAL(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, | |
2920 GENERATE_STATIC_VM_STRUCT_ENTRY) | |
2921 #endif | |
2922 | |
2908 #if INCLUDE_ALL_GCS | 2923 #if INCLUDE_ALL_GCS |
2909 VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, | 2924 VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
2910 GENERATE_STATIC_VM_STRUCT_ENTRY) | 2925 GENERATE_STATIC_VM_STRUCT_ENTRY) |
2911 | 2926 |
2912 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, | 2927 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
2946 GENERATE_INTEGER_VM_TYPE_ENTRY, | 2961 GENERATE_INTEGER_VM_TYPE_ENTRY, |
2947 GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY, | 2962 GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY, |
2948 GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY, | 2963 GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY, |
2949 GENERATE_C2_VM_TYPE_ENTRY, | 2964 GENERATE_C2_VM_TYPE_ENTRY, |
2950 GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY) | 2965 GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY) |
2966 | |
2967 #ifdef GRAAL | |
2968 VM_TYPES_GRAAL(GENERATE_VM_TYPE_ENTRY, | |
2969 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) | |
2970 #endif | |
2951 | 2971 |
2952 #if INCLUDE_ALL_GCS | 2972 #if INCLUDE_ALL_GCS |
2953 VM_TYPES_PARALLELGC(GENERATE_VM_TYPE_ENTRY, | 2973 VM_TYPES_PARALLELGC(GENERATE_VM_TYPE_ENTRY, |
2954 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) | 2974 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) |
2955 | 2975 |