Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/vmStructs.cpp @ 3464:be4ca325525a
Merge.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Wed, 27 Jul 2011 17:32:44 -0700 |
parents | a80577f854f9 |
children | d17bd0b18663 |
comparison
equal
deleted
inserted
replaced
3239:7c4b4daac19b | 3464:be4ca325525a |
---|---|
781 nonstatic_field(nmethod, _method, methodOop) \ | 781 nonstatic_field(nmethod, _method, methodOop) \ |
782 nonstatic_field(nmethod, _entry_bci, int) \ | 782 nonstatic_field(nmethod, _entry_bci, int) \ |
783 nonstatic_field(nmethod, _osr_link, nmethod*) \ | 783 nonstatic_field(nmethod, _osr_link, nmethod*) \ |
784 nonstatic_field(nmethod, _scavenge_root_link, nmethod*) \ | 784 nonstatic_field(nmethod, _scavenge_root_link, nmethod*) \ |
785 nonstatic_field(nmethod, _scavenge_root_state, jbyte) \ | 785 nonstatic_field(nmethod, _scavenge_root_state, jbyte) \ |
786 nonstatic_field(nmethod, _state, unsigned char) \ | |
786 nonstatic_field(nmethod, _exception_offset, int) \ | 787 nonstatic_field(nmethod, _exception_offset, int) \ |
787 nonstatic_field(nmethod, _deoptimize_offset, int) \ | 788 nonstatic_field(nmethod, _deoptimize_offset, int) \ |
788 nonstatic_field(nmethod, _orig_pc_offset, int) \ | 789 nonstatic_field(nmethod, _orig_pc_offset, int) \ |
789 nonstatic_field(nmethod, _stub_offset, int) \ | 790 nonstatic_field(nmethod, _stub_offset, int) \ |
790 nonstatic_field(nmethod, _consts_offset, int) \ | 791 nonstatic_field(nmethod, _consts_offset, int) \ |
798 nonstatic_field(nmethod, _entry_point, address) \ | 799 nonstatic_field(nmethod, _entry_point, address) \ |
799 nonstatic_field(nmethod, _verified_entry_point, address) \ | 800 nonstatic_field(nmethod, _verified_entry_point, address) \ |
800 nonstatic_field(nmethod, _osr_entry_point, address) \ | 801 nonstatic_field(nmethod, _osr_entry_point, address) \ |
801 nonstatic_field(nmethod, _lock_count, jint) \ | 802 nonstatic_field(nmethod, _lock_count, jint) \ |
802 nonstatic_field(nmethod, _stack_traversal_mark, long) \ | 803 nonstatic_field(nmethod, _stack_traversal_mark, long) \ |
804 nonstatic_field(nmethod, _compile_id, int) \ | |
805 nonstatic_field(nmethod, _marked_for_deoptimization, bool) \ | |
803 \ | 806 \ |
804 /********************************/ \ | 807 /********************************/ \ |
805 /* JavaCalls (NOTE: incomplete) */ \ | 808 /* JavaCalls (NOTE: incomplete) */ \ |
806 /********************************/ \ | 809 /********************************/ \ |
807 \ | 810 \ |
1308 /* CodeBlob hierarchy (needed for run-time type information) */ \ | 1311 /* CodeBlob hierarchy (needed for run-time type information) */ \ |
1309 /*************************************************************/ \ | 1312 /*************************************************************/ \ |
1310 \ | 1313 \ |
1311 declare_toplevel_type(CodeBlob) \ | 1314 declare_toplevel_type(CodeBlob) \ |
1312 declare_type(BufferBlob, CodeBlob) \ | 1315 declare_type(BufferBlob, CodeBlob) \ |
1313 declare_type(nmethod, CodeBlob) \ | 1316 declare_type(AdapterBlob, BufferBlob) \ |
1317 declare_type(nmethod, CodeBlob) \ | |
1314 declare_type(RuntimeStub, CodeBlob) \ | 1318 declare_type(RuntimeStub, CodeBlob) \ |
1315 declare_type(SingletonBlob, CodeBlob) \ | 1319 declare_type(SingletonBlob, CodeBlob) \ |
1316 declare_type(SafepointBlob, SingletonBlob) \ | 1320 declare_type(SafepointBlob, SingletonBlob) \ |
1317 declare_type(DeoptimizationBlob, SingletonBlob) \ | 1321 declare_type(DeoptimizationBlob, SingletonBlob) \ |
1322 declare_type(RicochetBlob, SingletonBlob) \ | |
1318 declare_c2_type(ExceptionBlob, SingletonBlob) \ | 1323 declare_c2_type(ExceptionBlob, SingletonBlob) \ |
1319 declare_c2_type(UncommonTrapBlob, CodeBlob) \ | 1324 declare_c2_type(UncommonTrapBlob, CodeBlob) \ |
1320 \ | 1325 \ |
1321 /***************************************/ \ | 1326 /***************************************/ \ |
1322 /* PcDesc and other compiled code info */ \ | 1327 /* PcDesc and other compiled code info */ \ |