Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 6147:5ba29a1db46e hs24-b14
Merge
| author | amurillo |
|---|---|
| date | Fri, 15 Jun 2012 14:07:00 -0700 |
| parents | eba1d5bce9e8 |
| children | 8c92982cbbc4 d2a62e0f25eb 8150fa46d2ed |
comparison
equal
deleted
inserted
replaced
| 6114:b38fb5f31e31 | 6147:5ba29a1db46e |
|---|---|
| 356 nonstatic_field(methodDataOopDesc, _eflags, intx) \ | 356 nonstatic_field(methodDataOopDesc, _eflags, intx) \ |
| 357 nonstatic_field(methodDataOopDesc, _arg_local, intx) \ | 357 nonstatic_field(methodDataOopDesc, _arg_local, intx) \ |
| 358 nonstatic_field(methodDataOopDesc, _arg_stack, intx) \ | 358 nonstatic_field(methodDataOopDesc, _arg_stack, intx) \ |
| 359 nonstatic_field(methodDataOopDesc, _arg_returned, intx) \ | 359 nonstatic_field(methodDataOopDesc, _arg_returned, intx) \ |
| 360 nonstatic_field(methodOopDesc, _constMethod, constMethodOop) \ | 360 nonstatic_field(methodOopDesc, _constMethod, constMethodOop) \ |
| 361 nonstatic_field(methodOopDesc, _constants, constantPoolOop) \ | |
| 362 nonstatic_field(methodOopDesc, _method_data, methodDataOop) \ | 361 nonstatic_field(methodOopDesc, _method_data, methodDataOop) \ |
| 363 nonstatic_field(methodOopDesc, _interpreter_invocation_count, int) \ | 362 nonstatic_field(methodOopDesc, _interpreter_invocation_count, int) \ |
| 364 nonstatic_field(methodOopDesc, _access_flags, AccessFlags) \ | 363 nonstatic_field(methodOopDesc, _access_flags, AccessFlags) \ |
| 365 nonstatic_field(methodOopDesc, _vtable_index, int) \ | 364 nonstatic_field(methodOopDesc, _vtable_index, int) \ |
| 366 nonstatic_field(methodOopDesc, _method_size, u2) \ | 365 nonstatic_field(methodOopDesc, _method_size, u2) \ |
| 376 nonstatic_field(methodOopDesc, _i2i_entry, address) \ | 375 nonstatic_field(methodOopDesc, _i2i_entry, address) \ |
| 377 nonstatic_field(methodOopDesc, _adapter, AdapterHandlerEntry*) \ | 376 nonstatic_field(methodOopDesc, _adapter, AdapterHandlerEntry*) \ |
| 378 volatile_nonstatic_field(methodOopDesc, _from_compiled_entry, address) \ | 377 volatile_nonstatic_field(methodOopDesc, _from_compiled_entry, address) \ |
| 379 volatile_nonstatic_field(methodOopDesc, _from_interpreted_entry, address) \ | 378 volatile_nonstatic_field(methodOopDesc, _from_interpreted_entry, address) \ |
| 380 volatile_nonstatic_field(constMethodOopDesc, _fingerprint, uint64_t) \ | 379 volatile_nonstatic_field(constMethodOopDesc, _fingerprint, uint64_t) \ |
| 381 nonstatic_field(constMethodOopDesc, _method, methodOop) \ | 380 nonstatic_field(constMethodOopDesc, _constants, constantPoolOop) \ |
| 382 nonstatic_field(constMethodOopDesc, _stackmap_data, typeArrayOop) \ | 381 nonstatic_field(constMethodOopDesc, _stackmap_data, typeArrayOop) \ |
| 383 nonstatic_field(constMethodOopDesc, _exception_table, typeArrayOop) \ | 382 nonstatic_field(constMethodOopDesc, _exception_table, typeArrayOop) \ |
| 384 nonstatic_field(constMethodOopDesc, _constMethod_size, int) \ | 383 nonstatic_field(constMethodOopDesc, _constMethod_size, int) \ |
| 385 nonstatic_field(constMethodOopDesc, _interpreter_kind, jbyte) \ | 384 nonstatic_field(constMethodOopDesc, _interpreter_kind, jbyte) \ |
| 386 nonstatic_field(constMethodOopDesc, _flags, jbyte) \ | 385 nonstatic_field(constMethodOopDesc, _flags, jbyte) \ |
| 1874 declare_c2_type(StoreDNode, StoreNode) \ | 1873 declare_c2_type(StoreDNode, StoreNode) \ |
| 1875 declare_c2_type(StorePNode, StoreNode) \ | 1874 declare_c2_type(StorePNode, StoreNode) \ |
| 1876 declare_c2_type(StoreNNode, StoreNode) \ | 1875 declare_c2_type(StoreNNode, StoreNode) \ |
| 1877 declare_c2_type(StoreCMNode, StoreNode) \ | 1876 declare_c2_type(StoreCMNode, StoreNode) \ |
| 1878 declare_c2_type(LoadPLockedNode, LoadPNode) \ | 1877 declare_c2_type(LoadPLockedNode, LoadPNode) \ |
| 1879 declare_c2_type(LoadLLockedNode, LoadLNode) \ | |
| 1880 declare_c2_type(SCMemProjNode, ProjNode) \ | 1878 declare_c2_type(SCMemProjNode, ProjNode) \ |
| 1881 declare_c2_type(LoadStoreNode, Node) \ | 1879 declare_c2_type(LoadStoreNode, Node) \ |
| 1882 declare_c2_type(StorePConditionalNode, LoadStoreNode) \ | 1880 declare_c2_type(StorePConditionalNode, LoadStoreNode) \ |
| 1883 declare_c2_type(StoreLConditionalNode, LoadStoreNode) \ | 1881 declare_c2_type(StoreLConditionalNode, LoadStoreNode) \ |
| 1884 declare_c2_type(CompareAndSwapLNode, LoadStoreNode) \ | 1882 declare_c2_type(CompareAndSwapLNode, LoadStoreNode) \ |