annotate src/share/vm/classfile/classFileStream.cpp @ 1091:6aa7255741f3

6906727: UseCompressedOops: some card-marking fixes related to object arrays Summary: Introduced a new write_ref_array(HeapWords* start, size_t count) method that does the requisite MemRegion range calculation so (some of the) clients of the erstwhile write_ref_array(MemRegion mr) do not need to worry. This removed all external uses of array_size(), which was also simplified and made private. Asserts were added to catch other possible issues. Further, less essential, fixes stemming from this investigation are deferred to CR 6904516 (to follow shortly in hs17). Reviewed-by: kvn, coleenp, jmasa
author ysr
date Thu, 03 Dec 2009 15:01:57 -0800
parents a61af66fc99e
children c18cbe5936b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1 /*
a61af66fc99e Initial load
duke
parents:
diff changeset
2 * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
a61af66fc99e Initial load
duke
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a61af66fc99e Initial load
duke
parents:
diff changeset
4 *
a61af66fc99e Initial load
duke
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
a61af66fc99e Initial load
duke
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
a61af66fc99e Initial load
duke
parents:
diff changeset
7 * published by the Free Software Foundation.
a61af66fc99e Initial load
duke
parents:
diff changeset
8 *
a61af66fc99e Initial load
duke
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
a61af66fc99e Initial load
duke
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a61af66fc99e Initial load
duke
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a61af66fc99e Initial load
duke
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
a61af66fc99e Initial load
duke
parents:
diff changeset
13 * accompanied this code).
a61af66fc99e Initial load
duke
parents:
diff changeset
14 *
a61af66fc99e Initial load
duke
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
a61af66fc99e Initial load
duke
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
a61af66fc99e Initial load
duke
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a61af66fc99e Initial load
duke
parents:
diff changeset
18 *
a61af66fc99e Initial load
duke
parents:
diff changeset
19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
a61af66fc99e Initial load
duke
parents:
diff changeset
20 * CA 95054 USA or visit www.sun.com if you need additional information or
a61af66fc99e Initial load
duke
parents:
diff changeset
21 * have any questions.
a61af66fc99e Initial load
duke
parents:
diff changeset
22 *
a61af66fc99e Initial load
duke
parents:
diff changeset
23 */
a61af66fc99e Initial load
duke
parents:
diff changeset
24
a61af66fc99e Initial load
duke
parents:
diff changeset
25 #include "incls/_precompiled.incl"
a61af66fc99e Initial load
duke
parents:
diff changeset
26 #include "incls/_classFileStream.cpp.incl"
a61af66fc99e Initial load
duke
parents:
diff changeset
27
a61af66fc99e Initial load
duke
parents:
diff changeset
28 void ClassFileStream::truncated_file_error(TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
29 THROW_MSG(vmSymbols::java_lang_ClassFormatError(), "Truncated class file");
a61af66fc99e Initial load
duke
parents:
diff changeset
30 }
a61af66fc99e Initial load
duke
parents:
diff changeset
31
a61af66fc99e Initial load
duke
parents:
diff changeset
32 ClassFileStream::ClassFileStream(u1* buffer, int length, char* source) {
a61af66fc99e Initial load
duke
parents:
diff changeset
33 _buffer_start = buffer;
a61af66fc99e Initial load
duke
parents:
diff changeset
34 _buffer_end = buffer + length;
a61af66fc99e Initial load
duke
parents:
diff changeset
35 _current = buffer;
a61af66fc99e Initial load
duke
parents:
diff changeset
36 _source = source;
a61af66fc99e Initial load
duke
parents:
diff changeset
37 _need_verify = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
38 }
a61af66fc99e Initial load
duke
parents:
diff changeset
39
a61af66fc99e Initial load
duke
parents:
diff changeset
40 u1 ClassFileStream::get_u1(TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
41 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
42 guarantee_more(1, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
43 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
44 assert(1 <= _buffer_end - _current, "buffer overflow");
a61af66fc99e Initial load
duke
parents:
diff changeset
45 }
a61af66fc99e Initial load
duke
parents:
diff changeset
46 return *_current++;
a61af66fc99e Initial load
duke
parents:
diff changeset
47 }
a61af66fc99e Initial load
duke
parents:
diff changeset
48
a61af66fc99e Initial load
duke
parents:
diff changeset
49 u2 ClassFileStream::get_u2(TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
50 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
51 guarantee_more(2, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
52 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
53 assert(2 <= _buffer_end - _current, "buffer overflow");
a61af66fc99e Initial load
duke
parents:
diff changeset
54 }
a61af66fc99e Initial load
duke
parents:
diff changeset
55 u1* tmp = _current;
a61af66fc99e Initial load
duke
parents:
diff changeset
56 _current += 2;
a61af66fc99e Initial load
duke
parents:
diff changeset
57 return Bytes::get_Java_u2(tmp);
a61af66fc99e Initial load
duke
parents:
diff changeset
58 }
a61af66fc99e Initial load
duke
parents:
diff changeset
59
a61af66fc99e Initial load
duke
parents:
diff changeset
60 u4 ClassFileStream::get_u4(TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
61 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
62 guarantee_more(4, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
63 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
64 assert(4 <= _buffer_end - _current, "buffer overflow");
a61af66fc99e Initial load
duke
parents:
diff changeset
65 }
a61af66fc99e Initial load
duke
parents:
diff changeset
66 u1* tmp = _current;
a61af66fc99e Initial load
duke
parents:
diff changeset
67 _current += 4;
a61af66fc99e Initial load
duke
parents:
diff changeset
68 return Bytes::get_Java_u4(tmp);
a61af66fc99e Initial load
duke
parents:
diff changeset
69 }
a61af66fc99e Initial load
duke
parents:
diff changeset
70
a61af66fc99e Initial load
duke
parents:
diff changeset
71 u8 ClassFileStream::get_u8(TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
72 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
73 guarantee_more(8, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
74 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
75 assert(8 <= _buffer_end - _current, "buffer overflow");
a61af66fc99e Initial load
duke
parents:
diff changeset
76 }
a61af66fc99e Initial load
duke
parents:
diff changeset
77 u1* tmp = _current;
a61af66fc99e Initial load
duke
parents:
diff changeset
78 _current += 8;
a61af66fc99e Initial load
duke
parents:
diff changeset
79 return Bytes::get_Java_u8(tmp);
a61af66fc99e Initial load
duke
parents:
diff changeset
80 }
a61af66fc99e Initial load
duke
parents:
diff changeset
81
a61af66fc99e Initial load
duke
parents:
diff changeset
82 void ClassFileStream::skip_u1(int length, TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
83 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
84 guarantee_more(length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
85 }
a61af66fc99e Initial load
duke
parents:
diff changeset
86 _current += length;
a61af66fc99e Initial load
duke
parents:
diff changeset
87 }
a61af66fc99e Initial load
duke
parents:
diff changeset
88
a61af66fc99e Initial load
duke
parents:
diff changeset
89 void ClassFileStream::skip_u2(int length, TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
90 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
91 guarantee_more(length * 2, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
92 }
a61af66fc99e Initial load
duke
parents:
diff changeset
93 _current += length * 2;
a61af66fc99e Initial load
duke
parents:
diff changeset
94 }