jdk-sandbox: comparison hotspot/src/share/vm/interpreter/bytecode.hpp

equal deleted inserted replaced

-:caf5eb7dd4a7
+:882756847a04
 /*
-* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #ifndef SHARE_VM_INTERPRETER_BYTECODE_HPP
 #define SHARE_VM_INTERPRETER_BYTECODE_HPP
 #include "interpreter/bytecodes.hpp"
 #include "memory/allocation.hpp"
-#include "oops/methodOop.hpp"
+#include "oops/method.hpp"
 #ifdef TARGET_ARCH_x86
 # include "bytes_x86.hpp"
 #endif
 #ifdef TARGET_ARCH_sparc
 # include "bytes_sparc.hpp"
 int     get_Java_u4_at     (int offset)        const     { return Bytes::get_Java_u4(addr_at(offset)); }
 int     get_native_u2_at   (int offset)        const     { return Bytes::get_native_u2(addr_at(offset)); }
 int     get_native_u4_at   (int offset)        const     { return Bytes::get_native_u4(addr_at(offset)); }
 public:
-Bytecode(methodOop method, address bcp): _bcp(bcp), _code(Bytecodes::code_at(method, addr_at(0))) {
+Bytecode(Method* method, address bcp): _bcp(bcp), _code(Bytecodes::code_at(method, addr_at(0))) {
-assert(method != NULL, "this form requires a valid methodOop");
+assert(method != NULL, "this form requires a valid Method*");
 }
 // Defined in ciStreams.hpp
 inline Bytecode(const ciBytecodeStream* stream, address bcp = NULL);
 // Attributes
 return Bytes::get_native_u2(p);
 else  return Bytes::get_Java_u2(p);
 }
 int get_index_u1_cpcache(Bytecodes::Code bc) const {
 assert_same_format_as(bc); assert_index_size(1, bc);
-return *(jubyte*)addr_at(1) + constantPoolOopDesc::CPCACHE_INDEX_TAG;
+return *(jubyte*)addr_at(1) + ConstantPool::CPCACHE_INDEX_TAG;
 }
 int get_index_u2_cpcache(Bytecodes::Code bc) const {
 assert_same_format_as(bc); assert_index_size(2, bc); assert_native_index(bc);
-return Bytes::get_native_u2(addr_at(1)) + constantPoolOopDesc::CPCACHE_INDEX_TAG;
+return Bytes::get_native_u2(addr_at(1)) + ConstantPool::CPCACHE_INDEX_TAG;
 }
 int get_index_u4(Bytecodes::Code bc) const {
 assert_same_format_as(bc); assert_index_size(4, bc);
 assert(can_use_native_byte_order(bc), "");
 return Bytes::get_native_u4(addr_at(1));
 };
 class Bytecode_lookupswitch: public Bytecode {
 public:
-Bytecode_lookupswitch(methodOop method, address bcp): Bytecode(method, bcp) { verify(); }
+Bytecode_lookupswitch(Method* method, address bcp): Bytecode(method, bcp) { verify(); }
 // Defined in ciStreams.hpp
 inline Bytecode_lookupswitch(const ciBytecodeStream* stream);
 void verify() const PRODUCT_RETURN;
 // Attributes
 }
 };
 class Bytecode_tableswitch: public Bytecode {
 public:
-Bytecode_tableswitch(methodOop method, address bcp): Bytecode(method, bcp) { verify(); }
+Bytecode_tableswitch(Method* method, address bcp): Bytecode(method, bcp) { verify(); }
 // Defined in ciStreams.hpp
 inline Bytecode_tableswitch(const ciBytecodeStream* stream);
 void verify() const PRODUCT_RETURN;
 // Attributes
 const methodHandle _method;                          // method containing the bytecode
 Bytecode_member_ref(methodHandle method, int bci)  : Bytecode(method(), method()->bcp_from(bci)), _method(method) {}
 methodHandle method() const                    { return _method; }
-constantPoolOop constants() const              { return _method->constants(); }
+ConstantPool* constants() const              { return _method->constants(); }
-constantPoolCacheOop cpcache() const           { return _method->constants()->cache(); }
+ConstantPoolCache* cpcache() const           { return _method->constants()->cache(); }
 ConstantPoolCacheEntry* cpcache_entry() const;
 public:
 int          index() const;                    // cache index (loaded from instruction)
 int          pool_index() const;               // constant pool index
 };
 // Abstraction for checkcast
 class Bytecode_checkcast: public Bytecode {
 public:
-Bytecode_checkcast(methodOop method, address bcp): Bytecode(method, bcp) { verify(); }
+Bytecode_checkcast(Method* method, address bcp): Bytecode(method, bcp) { verify(); }
 void verify() const { assert(Bytecodes::java_code(code()) == Bytecodes::_checkcast, "check checkcast"); }
 // Returns index
 long index() const   { return get_index_u2(Bytecodes::_checkcast); };
 };
 // Abstraction for instanceof
 class Bytecode_instanceof: public Bytecode {
 public:
-Bytecode_instanceof(methodOop method, address bcp): Bytecode(method, bcp) { verify(); }
+Bytecode_instanceof(Method* method, address bcp): Bytecode(method, bcp) { verify(); }
 void verify() const { assert(code() == Bytecodes::_instanceof, "check instanceof"); }
 // Returns index
 long index() const   { return get_index_u2(Bytecodes::_instanceof); };
 };
 class Bytecode_new: public Bytecode {
 public:
-Bytecode_new(methodOop method, address bcp): Bytecode(method, bcp) { verify(); }
+Bytecode_new(Method* method, address bcp): Bytecode(method, bcp) { verify(); }
 void verify() const { assert(java_code() == Bytecodes::_new, "check new"); }
 // Returns index
 long index() const   { return get_index_u2(Bytecodes::_new); };
 };
 class Bytecode_multianewarray: public Bytecode {
 public:
-Bytecode_multianewarray(methodOop method, address bcp): Bytecode(method, bcp) { verify(); }
+Bytecode_multianewarray(Method* method, address bcp): Bytecode(method, bcp) { verify(); }
 void verify() const { assert(java_code() == Bytecodes::_multianewarray, "check new"); }
 // Returns index
 long index() const   { return get_index_u2(Bytecodes::_multianewarray); };
 };
 class Bytecode_anewarray: public Bytecode {
 public:
-Bytecode_anewarray(methodOop method, address bcp): Bytecode(method, bcp) { verify(); }
+Bytecode_anewarray(Method* method, address bcp): Bytecode(method, bcp) { verify(); }
 void verify() const { assert(java_code() == Bytecodes::_anewarray, "check anewarray"); }
 // Returns index
 long index() const   { return get_index_u2(Bytecodes::_anewarray); };
 };
 assert(stdc == Bytecodes::_ldc ||
 stdc == Bytecodes::_ldc_w ||
 stdc == Bytecodes::_ldc2_w, "load constant");
 }
-// Only non-standard bytecodes (fast_aldc) have CP cache indexes.
+// Only non-standard bytecodes (fast_aldc) have reference cache indexes.
 bool has_cache_index() const { return code() >= Bytecodes::number_of_java_codes; }
 int pool_index() const;               // index into constant pool
-int cache_index() const {             // index into CP cache (or -1 if none)
+int cache_index() const {             // index into reference cache (or -1 if none)
 return has_cache_index() ? raw_index() : -1;
 }
 BasicType result_type() const;        // returns the result type of the ldc

changeset 13728	882756847a04
parent 13391	30245956af37
child 25715	d5a8dbdc5150