Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/vmStructs.cpp @ 6214:f0b82641fb7e
Merge
author | bdelsart |
---|---|
date | Mon, 02 Jul 2012 04:19:22 -0400 |
parents | 8c92982cbbc4 8150fa46d2ed |
children | e74da3c2b827 |
comparison
equal
deleted
inserted
replaced
6195:bcffa4c5eef6 | 6214:f0b82641fb7e |
---|---|
377 volatile_nonstatic_field(methodOopDesc, _from_compiled_entry, address) \ | 377 volatile_nonstatic_field(methodOopDesc, _from_compiled_entry, address) \ |
378 volatile_nonstatic_field(methodOopDesc, _from_interpreted_entry, address) \ | 378 volatile_nonstatic_field(methodOopDesc, _from_interpreted_entry, address) \ |
379 volatile_nonstatic_field(constMethodOopDesc, _fingerprint, uint64_t) \ | 379 volatile_nonstatic_field(constMethodOopDesc, _fingerprint, uint64_t) \ |
380 nonstatic_field(constMethodOopDesc, _constants, constantPoolOop) \ | 380 nonstatic_field(constMethodOopDesc, _constants, constantPoolOop) \ |
381 nonstatic_field(constMethodOopDesc, _stackmap_data, typeArrayOop) \ | 381 nonstatic_field(constMethodOopDesc, _stackmap_data, typeArrayOop) \ |
382 nonstatic_field(constMethodOopDesc, _exception_table, typeArrayOop) \ | |
383 nonstatic_field(constMethodOopDesc, _constMethod_size, int) \ | 382 nonstatic_field(constMethodOopDesc, _constMethod_size, int) \ |
384 nonstatic_field(constMethodOopDesc, _interpreter_kind, jbyte) \ | 383 nonstatic_field(constMethodOopDesc, _interpreter_kind, jbyte) \ |
385 nonstatic_field(constMethodOopDesc, _flags, jbyte) \ | 384 nonstatic_field(constMethodOopDesc, _flags, jbyte) \ |
386 nonstatic_field(constMethodOopDesc, _code_size, u2) \ | 385 nonstatic_field(constMethodOopDesc, _code_size, u2) \ |
387 nonstatic_field(constMethodOopDesc, _name_index, u2) \ | 386 nonstatic_field(constMethodOopDesc, _name_index, u2) \ |
414 nonstatic_field(LocalVariableTableElement, length, u2) \ | 413 nonstatic_field(LocalVariableTableElement, length, u2) \ |
415 nonstatic_field(LocalVariableTableElement, name_cp_index, u2) \ | 414 nonstatic_field(LocalVariableTableElement, name_cp_index, u2) \ |
416 nonstatic_field(LocalVariableTableElement, descriptor_cp_index, u2) \ | 415 nonstatic_field(LocalVariableTableElement, descriptor_cp_index, u2) \ |
417 nonstatic_field(LocalVariableTableElement, signature_cp_index, u2) \ | 416 nonstatic_field(LocalVariableTableElement, signature_cp_index, u2) \ |
418 nonstatic_field(LocalVariableTableElement, slot, u2) \ | 417 nonstatic_field(LocalVariableTableElement, slot, u2) \ |
418 nonstatic_field(ExceptionTableElement, start_pc, u2) \ | |
419 nonstatic_field(ExceptionTableElement, end_pc, u2) \ | |
420 nonstatic_field(ExceptionTableElement, handler_pc, u2) \ | |
421 nonstatic_field(ExceptionTableElement, catch_type_index, u2) \ | |
419 nonstatic_field(BreakpointInfo, _orig_bytecode, Bytecodes::Code) \ | 422 nonstatic_field(BreakpointInfo, _orig_bytecode, Bytecodes::Code) \ |
420 nonstatic_field(BreakpointInfo, _bci, int) \ | 423 nonstatic_field(BreakpointInfo, _bci, int) \ |
421 nonstatic_field(BreakpointInfo, _name_index, u2) \ | 424 nonstatic_field(BreakpointInfo, _name_index, u2) \ |
422 nonstatic_field(BreakpointInfo, _signature_index, u2) \ | 425 nonstatic_field(BreakpointInfo, _signature_index, u2) \ |
423 nonstatic_field(BreakpointInfo, _next, BreakpointInfo*) \ | 426 nonstatic_field(BreakpointInfo, _next, BreakpointInfo*) \ |
1449 /* MethodOop-related data structures */ \ | 1452 /* MethodOop-related data structures */ \ |
1450 /*************************************/ \ | 1453 /*************************************/ \ |
1451 \ | 1454 \ |
1452 declare_toplevel_type(CheckedExceptionElement) \ | 1455 declare_toplevel_type(CheckedExceptionElement) \ |
1453 declare_toplevel_type(LocalVariableTableElement) \ | 1456 declare_toplevel_type(LocalVariableTableElement) \ |
1457 declare_toplevel_type(ExceptionTableElement) \ | |
1454 \ | 1458 \ |
1455 /******************************************/ \ | 1459 /******************************************/ \ |
1456 /* Generation and space hierarchies */ \ | 1460 /* Generation and space hierarchies */ \ |
1457 /* (needed for run-time type information) */ \ | 1461 /* (needed for run-time type information) */ \ |
1458 /******************************************/ \ | 1462 /******************************************/ \ |
2290 /********************************/ \ | 2294 /********************************/ \ |
2291 \ | 2295 \ |
2292 declare_constant(constMethodOopDesc::_has_linenumber_table) \ | 2296 declare_constant(constMethodOopDesc::_has_linenumber_table) \ |
2293 declare_constant(constMethodOopDesc::_has_checked_exceptions) \ | 2297 declare_constant(constMethodOopDesc::_has_checked_exceptions) \ |
2294 declare_constant(constMethodOopDesc::_has_localvariable_table) \ | 2298 declare_constant(constMethodOopDesc::_has_localvariable_table) \ |
2299 declare_constant(constMethodOopDesc::_has_exception_table) \ | |
2295 \ | 2300 \ |
2296 /*************************************/ \ | 2301 /*************************************/ \ |
2297 /* instanceKlass enum */ \ | 2302 /* instanceKlass enum */ \ |
2298 /*************************************/ \ | 2303 /*************************************/ \ |
2299 \ | 2304 \ |