comparison src/share/vm/runtime/vmStructs.cpp @ 18125:2a69cbe850a8

Reduce diff with upstream
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 20 Oct 2014 19:07:20 +0200
parents 3498d73280c8
children 8f2fb6bec986
comparison
equal deleted inserted replaced
18124:689092d5cf44 18125:2a69cbe850a8
158 # include "vmStructs_bsd_x86.hpp" 158 # include "vmStructs_bsd_x86.hpp"
159 #endif 159 #endif
160 #ifdef TARGET_OS_ARCH_bsd_zero 160 #ifdef TARGET_OS_ARCH_bsd_zero
161 # include "vmStructs_bsd_zero.hpp" 161 # include "vmStructs_bsd_zero.hpp"
162 #endif 162 #endif
163
164 #if INCLUDE_ALL_GCS 163 #if INCLUDE_ALL_GCS
165 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" 164 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
166 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" 165 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
167 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" 166 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
168 #include "gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp" 167 #include "gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp"
402 nonstatic_field(ConstMethod, _max_locals, u2) \ 401 nonstatic_field(ConstMethod, _max_locals, u2) \
403 nonstatic_field(ConstMethod, _size_of_parameters, u2) \ 402 nonstatic_field(ConstMethod, _size_of_parameters, u2) \
404 nonstatic_field(ObjArrayKlass, _element_klass, Klass*) \ 403 nonstatic_field(ObjArrayKlass, _element_klass, Klass*) \
405 nonstatic_field(ObjArrayKlass, _bottom_klass, Klass*) \ 404 nonstatic_field(ObjArrayKlass, _bottom_klass, Klass*) \
406 volatile_nonstatic_field(Symbol, _refcount, short) \ 405 volatile_nonstatic_field(Symbol, _refcount, short) \
406 nonstatic_field(Symbol, _identity_hash, int) \
407 nonstatic_field(Symbol, _length, unsigned short) \ 407 nonstatic_field(Symbol, _length, unsigned short) \
408 nonstatic_field(Symbol, _identity_hash, int) \
409 unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \ 408 unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \
410 nonstatic_field(Symbol, _body[0], jbyte) \ 409 nonstatic_field(Symbol, _body[0], jbyte) \
411 nonstatic_field(TypeArrayKlass, _max_length, int) \ 410 nonstatic_field(TypeArrayKlass, _max_length, int) \
412 \ 411 \
413 /***********************/ \ 412 /***********************/ \
1343 nonstatic_field(FreeList<FreeChunk>, _size, size_t) \ 1342 nonstatic_field(FreeList<FreeChunk>, _size, size_t) \
1344 nonstatic_field(FreeList<Metablock>, _size, size_t) \ 1343 nonstatic_field(FreeList<Metablock>, _size, size_t) \
1345 nonstatic_field(FreeList<FreeChunk>, _count, ssize_t) \ 1344 nonstatic_field(FreeList<FreeChunk>, _count, ssize_t) \
1346 nonstatic_field(FreeList<Metablock>, _count, ssize_t) \ 1345 nonstatic_field(FreeList<Metablock>, _count, ssize_t) \
1347 nonstatic_field(MetablockTreeDictionary, _total_size, size_t) 1346 nonstatic_field(MetablockTreeDictionary, _total_size, size_t)
1347
1348 1348
1349 //-------------------------------------------------------------------------------- 1349 //--------------------------------------------------------------------------------
1350 // VM_TYPES 1350 // VM_TYPES
1351 // 1351 //
1352 // This list must enumerate at least all of the types in the above 1352 // This list must enumerate at least all of the types in the above