comparison src/share/vm/runtime/vmStructs.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents f400f9554f09 b7b8b6d2f97d
children 0ebca2e35ca5
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
1 /* 1 /*
2 * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
293 nonstatic_field(instanceKlass, _local_interfaces, objArrayOop) \ 293 nonstatic_field(instanceKlass, _local_interfaces, objArrayOop) \
294 nonstatic_field(instanceKlass, _transitive_interfaces, objArrayOop) \ 294 nonstatic_field(instanceKlass, _transitive_interfaces, objArrayOop) \
295 nonstatic_field(instanceKlass, _nof_implementors, int) \ 295 nonstatic_field(instanceKlass, _nof_implementors, int) \
296 nonstatic_field(instanceKlass, _implementors[0], klassOop) \ 296 nonstatic_field(instanceKlass, _implementors[0], klassOop) \
297 nonstatic_field(instanceKlass, _fields, typeArrayOop) \ 297 nonstatic_field(instanceKlass, _fields, typeArrayOop) \
298 nonstatic_field(instanceKlass, _java_fields_count, int) \ 298 nonstatic_field(instanceKlass, _java_fields_count, u2) \
299 nonstatic_field(instanceKlass, _constants, constantPoolOop) \ 299 nonstatic_field(instanceKlass, _constants, constantPoolOop) \
300 nonstatic_field(instanceKlass, _class_loader, oop) \ 300 nonstatic_field(instanceKlass, _class_loader, oop) \
301 nonstatic_field(instanceKlass, _protection_domain, oop) \ 301 nonstatic_field(instanceKlass, _protection_domain, oop) \
302 nonstatic_field(instanceKlass, _signers, objArrayOop) \ 302 nonstatic_field(instanceKlass, _signers, objArrayOop) \
303 nonstatic_field(instanceKlass, _source_file_name, Symbol*) \ 303 nonstatic_field(instanceKlass, _source_file_name, Symbol*) \
304 nonstatic_field(instanceKlass, _source_debug_extension, Symbol*) \ 304 nonstatic_field(instanceKlass, _source_debug_extension, Symbol*) \
305 nonstatic_field(instanceKlass, _inner_classes, typeArrayOop) \ 305 nonstatic_field(instanceKlass, _inner_classes, typeArrayOop) \
306 nonstatic_field(instanceKlass, _nonstatic_field_size, int) \ 306 nonstatic_field(instanceKlass, _nonstatic_field_size, int) \
307 nonstatic_field(instanceKlass, _static_field_size, int) \ 307 nonstatic_field(instanceKlass, _static_field_size, int) \
308 nonstatic_field(instanceKlass, _static_oop_field_count, int) \ 308 nonstatic_field(instanceKlass, _static_oop_field_count, u2) \
309 nonstatic_field(instanceKlass, _nonstatic_oop_map_size, int) \ 309 nonstatic_field(instanceKlass, _nonstatic_oop_map_size, int) \
310 nonstatic_field(instanceKlass, _is_marked_dependent, bool) \ 310 nonstatic_field(instanceKlass, _is_marked_dependent, bool) \
311 nonstatic_field(instanceKlass, _minor_version, u2) \ 311 nonstatic_field(instanceKlass, _minor_version, u2) \
312 nonstatic_field(instanceKlass, _major_version, u2) \ 312 nonstatic_field(instanceKlass, _major_version, u2) \
313 nonstatic_field(instanceKlass, _init_state, instanceKlass::ClassState) \ 313 nonstatic_field(instanceKlass, _init_state, u1) \
314 nonstatic_field(instanceKlass, _init_thread, Thread*) \ 314 nonstatic_field(instanceKlass, _init_thread, Thread*) \
315 nonstatic_field(instanceKlass, _vtable_len, int) \ 315 nonstatic_field(instanceKlass, _vtable_len, int) \
316 nonstatic_field(instanceKlass, _itable_len, int) \ 316 nonstatic_field(instanceKlass, _itable_len, int) \
317 nonstatic_field(instanceKlass, _reference_type, ReferenceType) \ 317 nonstatic_field(instanceKlass, _reference_type, u1) \
318 volatile_nonstatic_field(instanceKlass, _oop_map_cache, OopMapCache*) \ 318 volatile_nonstatic_field(instanceKlass, _oop_map_cache, OopMapCache*) \
319 nonstatic_field(instanceKlass, _jni_ids, JNIid*) \ 319 nonstatic_field(instanceKlass, _jni_ids, JNIid*) \
320 nonstatic_field(instanceKlass, _osr_nmethods_head, nmethod*) \ 320 nonstatic_field(instanceKlass, _osr_nmethods_head, nmethod*) \
321 nonstatic_field(instanceKlass, _breakpoints, BreakpointInfo*) \ 321 nonstatic_field(instanceKlass, _breakpoints, BreakpointInfo*) \
322 nonstatic_field(instanceKlass, _generic_signature, Symbol*) \ 322 nonstatic_field(instanceKlass, _generic_signature, Symbol*) \
1360 declare_unsigned_integer_type(jushort) \ 1360 declare_unsigned_integer_type(jushort) \
1361 declare_unsigned_integer_type(unsigned long) \ 1361 declare_unsigned_integer_type(unsigned long) \
1362 /* The compiler thinks this is a different type than */ \ 1362 /* The compiler thinks this is a different type than */ \
1363 /* unsigned short on Win32 */ \ 1363 /* unsigned short on Win32 */ \
1364 declare_unsigned_integer_type(u2) \ 1364 declare_unsigned_integer_type(u2) \
1365 declare_unsigned_integer_type(u1) \
1365 declare_unsigned_integer_type(unsigned) \ 1366 declare_unsigned_integer_type(unsigned) \
1366 \ 1367 \
1367 /*****************************/ \ 1368 /*****************************/ \
1368 /* C primitive pointer types */ \ 1369 /* C primitive pointer types */ \
1369 /*****************************/ \ 1370 /*****************************/ \
2258 /* SymbolTable */ \ 2259 /* SymbolTable */ \
2259 /***************/ \ 2260 /***************/ \
2260 \ 2261 \
2261 declare_constant(SymbolTable::symbol_table_size) \ 2262 declare_constant(SymbolTable::symbol_table_size) \
2262 \ 2263 \
2263 /********************/ \
2264 /* SystemDictionary */ \
2265 /********************/ \
2266 \
2267 declare_constant(SystemDictionary::_loader_constraint_size) \
2268 declare_constant(SystemDictionary::_nof_buckets) \
2269 \
2270 /***********************************/ \ 2264 /***********************************/ \
2271 /* LoaderConstraintTable constants */ \ 2265 /* LoaderConstraintTable constants */ \
2272 /***********************************/ \ 2266 /***********************************/ \
2273 \ 2267 \
2274 declare_constant(LoaderConstraintTable::_loader_constraint_size) \ 2268 declare_constant(LoaderConstraintTable::_loader_constraint_size) \