Mercurial > hg > graal-compiler
annotate src/share/vm/interpreter/bytecodeStream.cpp @ 1570:de91a2f25c7e
6956164: nightly regressions from 6939207
Summary: Fix errors in 6939207.
Reviewed-by: kvn
author | jrose |
---|---|
date | Thu, 27 May 2010 09:54:07 -0700 |
parents | ab102d5d923e |
children | e9ff18c4ace7 |
rev | line source |
---|---|
0 | 1 /* |
1565 | 2 * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
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 | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | |
20 * CA 95054 USA or visit www.sun.com if you need additional information or | |
21 * have any questions. | |
22 * | |
23 */ | |
24 | |
25 # include "incls/_precompiled.incl" | |
26 # include "incls/_bytecodeStream.cpp.incl" | |
27 | |
28 Bytecodes::Code RawBytecodeStream::raw_next_special(Bytecodes::Code code) { | |
29 assert(!is_last_bytecode(), "should have been checked"); | |
30 // set next bytecode position | |
413
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
31 address bcp = RawBytecodeStream::bcp(); |
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
32 address end = method()->code_base() + end_bci(); |
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
33 int l = Bytecodes::raw_special_length_at(bcp, end); |
0 | 34 if (l <= 0 || (_bci + l) > _end_bci) { |
35 code = Bytecodes::_illegal; | |
36 } else { | |
37 _next_bci += l; | |
38 assert(_bci < _next_bci, "length must be > 0"); | |
39 // set attributes | |
40 _is_wide = false; | |
41 // check for special (uncommon) cases | |
42 if (code == Bytecodes::_wide) { | |
413
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
43 if (bcp + 1 >= end) { |
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
44 code = Bytecodes::_illegal; |
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
45 } else { |
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
46 code = (Bytecodes::Code)bcp[1]; |
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
47 _is_wide = true; |
c7ec737733a6
6756528: Bytecodes::special_length_at reads past end of code buffer
kamg
parents:
0
diff
changeset
|
48 } |
0 | 49 } |
50 } | |
1565 | 51 _raw_code = code; |
0 | 52 return code; |
53 } | |
1565 | 54 |
55 #ifdef ASSERT | |
56 void BaseBytecodeStream::assert_raw_index_size(int size) const { | |
57 if (raw_code() == Bytecodes::_invokedynamic && is_raw()) { | |
58 // in raw mode, pretend indy is "bJJ__" | |
59 assert(size == 2, "raw invokedynamic instruction has 2-byte index only"); | |
60 } else { | |
61 bytecode()->assert_index_size(size, raw_code(), is_wide()); | |
62 } | |
63 } | |
64 | |
65 void BaseBytecodeStream::assert_raw_stream(bool want_raw) const { | |
66 if (want_raw) { | |
67 assert( is_raw(), "this function only works on raw streams"); | |
68 } else { | |
69 assert(!is_raw(), "this function only works on non-raw streams"); | |
70 } | |
71 } | |
72 #endif //ASSERT |