comparison src/share/vm/runtime/vmStructs.cpp @ 6217:e74da3c2b827

Merge
author jiangli
date Fri, 13 Jul 2012 20:14:27 -0400
parents 04ade88d9712 f0b82641fb7e
children 1d7922586cf6
comparison
equal deleted inserted replaced
6208:cc787232c4c5 6217:e74da3c2b827
386 volatile_nonstatic_field(methodOopDesc, _from_compiled_entry, address) \ 386 volatile_nonstatic_field(methodOopDesc, _from_compiled_entry, address) \
387 volatile_nonstatic_field(methodOopDesc, _from_interpreted_entry, address) \ 387 volatile_nonstatic_field(methodOopDesc, _from_interpreted_entry, address) \
388 volatile_nonstatic_field(constMethodOopDesc, _fingerprint, uint64_t) \ 388 volatile_nonstatic_field(constMethodOopDesc, _fingerprint, uint64_t) \
389 nonstatic_field(constMethodOopDesc, _constants, constantPoolOop) \ 389 nonstatic_field(constMethodOopDesc, _constants, constantPoolOop) \
390 nonstatic_field(constMethodOopDesc, _stackmap_data, typeArrayOop) \ 390 nonstatic_field(constMethodOopDesc, _stackmap_data, typeArrayOop) \
391 nonstatic_field(constMethodOopDesc, _exception_table, typeArrayOop) \
392 nonstatic_field(constMethodOopDesc, _constMethod_size, int) \ 391 nonstatic_field(constMethodOopDesc, _constMethod_size, int) \
393 nonstatic_field(constMethodOopDesc, _interpreter_kind, jbyte) \ 392 nonstatic_field(constMethodOopDesc, _interpreter_kind, jbyte) \
394 nonstatic_field(constMethodOopDesc, _flags, jbyte) \ 393 nonstatic_field(constMethodOopDesc, _flags, jbyte) \
395 nonstatic_field(constMethodOopDesc, _code_size, u2) \ 394 nonstatic_field(constMethodOopDesc, _code_size, u2) \
396 nonstatic_field(constMethodOopDesc, _name_index, u2) \ 395 nonstatic_field(constMethodOopDesc, _name_index, u2) \
423 nonstatic_field(LocalVariableTableElement, length, u2) \ 422 nonstatic_field(LocalVariableTableElement, length, u2) \
424 nonstatic_field(LocalVariableTableElement, name_cp_index, u2) \ 423 nonstatic_field(LocalVariableTableElement, name_cp_index, u2) \
425 nonstatic_field(LocalVariableTableElement, descriptor_cp_index, u2) \ 424 nonstatic_field(LocalVariableTableElement, descriptor_cp_index, u2) \
426 nonstatic_field(LocalVariableTableElement, signature_cp_index, u2) \ 425 nonstatic_field(LocalVariableTableElement, signature_cp_index, u2) \
427 nonstatic_field(LocalVariableTableElement, slot, u2) \ 426 nonstatic_field(LocalVariableTableElement, slot, u2) \
427 nonstatic_field(ExceptionTableElement, start_pc, u2) \
428 nonstatic_field(ExceptionTableElement, end_pc, u2) \
429 nonstatic_field(ExceptionTableElement, handler_pc, u2) \
430 nonstatic_field(ExceptionTableElement, catch_type_index, u2) \
428 nonstatic_field(BreakpointInfo, _orig_bytecode, Bytecodes::Code) \ 431 nonstatic_field(BreakpointInfo, _orig_bytecode, Bytecodes::Code) \
429 nonstatic_field(BreakpointInfo, _bci, int) \ 432 nonstatic_field(BreakpointInfo, _bci, int) \
430 nonstatic_field(BreakpointInfo, _name_index, u2) \ 433 nonstatic_field(BreakpointInfo, _name_index, u2) \
431 nonstatic_field(BreakpointInfo, _signature_index, u2) \ 434 nonstatic_field(BreakpointInfo, _signature_index, u2) \
432 nonstatic_field(BreakpointInfo, _next, BreakpointInfo*) \ 435 nonstatic_field(BreakpointInfo, _next, BreakpointInfo*) \
1458 /* MethodOop-related data structures */ \ 1461 /* MethodOop-related data structures */ \
1459 /*************************************/ \ 1462 /*************************************/ \
1460 \ 1463 \
1461 declare_toplevel_type(CheckedExceptionElement) \ 1464 declare_toplevel_type(CheckedExceptionElement) \
1462 declare_toplevel_type(LocalVariableTableElement) \ 1465 declare_toplevel_type(LocalVariableTableElement) \
1466 declare_toplevel_type(ExceptionTableElement) \
1463 \ 1467 \
1464 /******************************************/ \ 1468 /******************************************/ \
1465 /* Generation and space hierarchies */ \ 1469 /* Generation and space hierarchies */ \
1466 /* (needed for run-time type information) */ \ 1470 /* (needed for run-time type information) */ \
1467 /******************************************/ \ 1471 /******************************************/ \
2299 /********************************/ \ 2303 /********************************/ \
2300 \ 2304 \
2301 declare_constant(constMethodOopDesc::_has_linenumber_table) \ 2305 declare_constant(constMethodOopDesc::_has_linenumber_table) \
2302 declare_constant(constMethodOopDesc::_has_checked_exceptions) \ 2306 declare_constant(constMethodOopDesc::_has_checked_exceptions) \
2303 declare_constant(constMethodOopDesc::_has_localvariable_table) \ 2307 declare_constant(constMethodOopDesc::_has_localvariable_table) \
2308 declare_constant(constMethodOopDesc::_has_exception_table) \
2304 \ 2309 \
2305 /*************************************/ \ 2310 /*************************************/ \
2306 /* instanceKlass enum */ \ 2311 /* instanceKlass enum */ \
2307 /*************************************/ \ 2312 /*************************************/ \
2308 \ 2313 \