1.1 --- a/src/share/vm/interpreter/bytecodes.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/interpreter/bytecodes.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -353,7 +353,7 @@
1.11
1.12 // Verify that bcp points into method
1.13 #ifdef ASSERT
1.14 - static bool check_method(const methodOopDesc* method, address bcp);
1.15 + static bool check_method(const Method* method, address bcp);
1.16 #endif
1.17 static bool check_must_rewrite(Bytecodes::Code bc);
1.18
1.19 @@ -368,26 +368,26 @@
1.20 // argument is used for conversion of breakpoints into the original
1.21 // bytecode. The CI uses these methods but guarantees that
1.22 // breakpoints are hidden so the method argument should be passed as
1.23 - // NULL since in that case the bcp and methodOop are unrelated
1.24 + // NULL since in that case the bcp and Method* are unrelated
1.25 // memory.
1.26 - static Code code_at(const methodOopDesc* method, address bcp) {
1.27 + static Code code_at(const Method* method, address bcp) {
1.28 assert(method == NULL || check_method(method, bcp), "bcp must point into method");
1.29 Code code = cast(*bcp);
1.30 - assert(code != _breakpoint || method != NULL, "need methodOop to decode breakpoint");
1.31 + assert(code != _breakpoint || method != NULL, "need Method* to decode breakpoint");
1.32 return (code != _breakpoint) ? code : non_breakpoint_code_at(method, bcp);
1.33 }
1.34 - static Code java_code_at(const methodOopDesc* method, address bcp) {
1.35 + static Code java_code_at(const Method* method, address bcp) {
1.36 return java_code(code_at(method, bcp));
1.37 }
1.38
1.39 // Fetch a bytecode or a breakpoint:
1.40 static Code code_or_bp_at(address bcp) { return (Code)cast(*bcp); }
1.41
1.42 - static Code code_at(methodOop method, int bci);
1.43 + static Code code_at(Method* method, int bci);
1.44 static bool is_active_breakpoint_at(address bcp) { return (Code)*bcp == _breakpoint; }
1.45
1.46 // find a bytecode, behind a breakpoint if necessary:
1.47 - static Code non_breakpoint_code_at(const methodOopDesc* method, address bcp);
1.48 + static Code non_breakpoint_code_at(const Method* method, address bcp);
1.49
1.50 // Bytecode attributes
1.51 static bool is_defined (int code) { return 0 <= code && code < number_of_codes && flags(code, false) != 0; }
1.52 @@ -408,11 +408,11 @@
1.53 // if 'end' is provided, it indicates the end of the code buffer which
1.54 // should not be read past when parsing.
1.55 static int special_length_at(Bytecodes::Code code, address bcp, address end = NULL);
1.56 - static int special_length_at(methodOop method, address bcp, address end = NULL) { return special_length_at(code_at(method, bcp), bcp, end); }
1.57 + static int special_length_at(Method* method, address bcp, address end = NULL) { return special_length_at(code_at(method, bcp), bcp, end); }
1.58 static int raw_special_length_at(address bcp, address end = NULL);
1.59 static int length_for_code_at(Bytecodes::Code code, address bcp) { int l = length_for(code); return l > 0 ? l : special_length_at(code, bcp); }
1.60 - static int length_at (methodOop method, address bcp) { return length_for_code_at(code_at(method, bcp), bcp); }
1.61 - static int java_length_at (methodOop method, address bcp) { return length_for_code_at(java_code_at(method, bcp), bcp); }
1.62 + static int length_at (Method* method, address bcp) { return length_for_code_at(code_at(method, bcp), bcp); }
1.63 + static int java_length_at (Method* method, address bcp) { return length_for_code_at(java_code_at(method, bcp), bcp); }
1.64 static bool is_java_code (Code code) { return 0 <= code && code < number_of_java_codes; }
1.65
1.66 static bool is_aload (Code code) { return (code == _aload || code == _aload_0 || code == _aload_1
