comparison src/share/vm/runtime/vmStructs.cpp @ 1579:e9ff18c4ace7

Merge
author jrose
date Wed, 02 Jun 2010 22:45:42 -0700
parents c18cbe5936b8 2d127394260e
children 2a47bd84841f
comparison
equal deleted inserted replaced
1562:dfe27f03244a 1579:e9ff18c4ace7
1 /* 1 /*
2 * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2010, 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.
605 nonstatic_field(CodeBlob, _header_size, int) \ 605 nonstatic_field(CodeBlob, _header_size, int) \
606 nonstatic_field(CodeBlob, _relocation_size, int) \ 606 nonstatic_field(CodeBlob, _relocation_size, int) \
607 nonstatic_field(CodeBlob, _instructions_offset, int) \ 607 nonstatic_field(CodeBlob, _instructions_offset, int) \
608 nonstatic_field(CodeBlob, _frame_complete_offset, int) \ 608 nonstatic_field(CodeBlob, _frame_complete_offset, int) \
609 nonstatic_field(CodeBlob, _data_offset, int) \ 609 nonstatic_field(CodeBlob, _data_offset, int) \
610 nonstatic_field(CodeBlob, _oops_offset, int) \
611 nonstatic_field(CodeBlob, _oops_length, int) \
612 nonstatic_field(CodeBlob, _frame_size, int) \ 610 nonstatic_field(CodeBlob, _frame_size, int) \
613 nonstatic_field(CodeBlob, _oop_maps, OopMapSet*) \ 611 nonstatic_field(CodeBlob, _oop_maps, OopMapSet*) \
614 \ 612 \
615 /**************************************************/ \ 613 /**************************************************/ \
616 /* NMethods (NOTE: incomplete, but only a little) */ \ 614 /* NMethods (NOTE: incomplete, but only a little) */ \
624 nonstatic_field(nmethod, _scavenge_root_state, jbyte) \ 622 nonstatic_field(nmethod, _scavenge_root_state, jbyte) \
625 nonstatic_field(nmethod, _exception_offset, int) \ 623 nonstatic_field(nmethod, _exception_offset, int) \
626 nonstatic_field(nmethod, _deoptimize_offset, int) \ 624 nonstatic_field(nmethod, _deoptimize_offset, int) \
627 nonstatic_field(nmethod, _orig_pc_offset, int) \ 625 nonstatic_field(nmethod, _orig_pc_offset, int) \
628 nonstatic_field(nmethod, _stub_offset, int) \ 626 nonstatic_field(nmethod, _stub_offset, int) \
627 nonstatic_field(nmethod, _consts_offset, int) \
628 nonstatic_field(nmethod, _oops_offset, int) \
629 nonstatic_field(nmethod, _scopes_data_offset, int) \ 629 nonstatic_field(nmethod, _scopes_data_offset, int) \
630 nonstatic_field(nmethod, _scopes_pcs_offset, int) \ 630 nonstatic_field(nmethod, _scopes_pcs_offset, int) \
631 nonstatic_field(nmethod, _dependencies_offset, int) \ 631 nonstatic_field(nmethod, _dependencies_offset, int) \
632 nonstatic_field(nmethod, _handler_table_offset, int) \ 632 nonstatic_field(nmethod, _handler_table_offset, int) \
633 nonstatic_field(nmethod, _nul_chk_table_offset, int) \ 633 nonstatic_field(nmethod, _nul_chk_table_offset, int) \
1325 /****************/ \ 1325 /****************/ \
1326 \ 1326 \
1327 declare_constant(oopSize) \ 1327 declare_constant(oopSize) \
1328 declare_constant(LogBytesPerWord) \ 1328 declare_constant(LogBytesPerWord) \
1329 declare_constant(BytesPerLong) \ 1329 declare_constant(BytesPerLong) \
1330 \
1331 /********************/ \
1332 /* Object alignment */ \
1333 /********************/ \
1334 \
1335 declare_constant(MinObjAlignment) \
1336 declare_constant(MinObjAlignmentInBytes) \
1337 declare_constant(LogMinObjAlignmentInBytes) \
1338 \ 1330 \
1339 /********************************************/ \ 1331 /********************************************/ \
1340 /* Generation and Space Hierarchy Constants */ \ 1332 /* Generation and Space Hierarchy Constants */ \
1341 /********************************************/ \ 1333 /********************************************/ \
1342 \ 1334 \