jdk-sandbox: comparison hotspot/src/share/vm/code/relocInfo.cpp

equal deleted inserted replaced

-:261ecc5bb65e
+:5435e77aa3df
 /*
-* Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1997-2010 Sun Microsystems, Inc.  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.
 // ----------------------------------------------------------------------------------------------------
 // Implementation of RelocIterator
-void RelocIterator::initialize(CodeBlob* cb, address begin, address limit) {
+void RelocIterator::initialize(nmethod* nm, address begin, address limit) {
 initialize_misc();
-if (cb == NULL && begin != NULL) {
+if (nm == NULL && begin != NULL) {
-// allow CodeBlob to be deduced from beginning address
+// allow nmethod to be deduced from beginning address
-cb = CodeCache::find_blob(begin);
+CodeBlob* cb = CodeCache::find_blob(begin);
-}
+nm = cb->as_nmethod_or_null();
-assert(cb != NULL, "must be able to deduce nmethod from other arguments");
+}
+assert(nm != NULL, "must be able to deduce nmethod from other arguments");
-_code    = cb;
-_current = cb->relocation_begin()-1;
+_code    = nm;
-_end     = cb->relocation_end();
+_current = nm->relocation_begin() - 1;
-_addr    = (address) cb->instructions_begin();
+_end     = nm->relocation_end();
+_addr    = (address) nm->instructions_begin();
 assert(!has_current(), "just checking");
-address code_end = cb->instructions_end();
+address code_end = nm->instructions_end();
-assert(begin == NULL || begin >= cb->instructions_begin(), "in bounds");
+assert(begin == NULL || begin >= nm->instructions_begin(), "in bounds");
 // FIX THIS  assert(limit == NULL || limit <= code_end,     "in bounds");
 set_limits(begin, limit);
 }
 int n = _oop_index;
 if (n == 0) {
 // oop is stored in the code stream
 return (oop*) pd_address_in_code();
 } else {
-// oop is stored in table at CodeBlob::oops_begin
+// oop is stored in table at nmethod::oops_begin
 return code()->oop_addr_at(n);
 }
 }
 set_value(value());
 }
 }
-RelocIterator virtual_call_Relocation::parse_ic(CodeBlob* &code, address &ic_call, address &first_oop,
+RelocIterator virtual_call_Relocation::parse_ic(nmethod* &nm, address &ic_call, address &first_oop,
 oop* &oop_addr, bool *is_optimized) {
 assert(ic_call != NULL, "ic_call address must be set");
 assert(ic_call != NULL || first_oop != NULL, "must supply a non-null input");
-if (code == NULL) {
+if (nm == NULL) {
+CodeBlob* code;
 if (ic_call != NULL) {
 code = CodeCache::find_blob(ic_call);
 } else if (first_oop != NULL) {
 code = CodeCache::find_blob(first_oop);
 }
-assert(code != NULL, "address to parse must be in CodeBlob");
+nm = code->as_nmethod_or_null();
-}
+assert(nm != NULL, "address to parse must be in nmethod");
-assert(ic_call   == NULL || code->contains(ic_call),   "must be in CodeBlob");
+}
-assert(first_oop == NULL || code->contains(first_oop), "must be in CodeBlob");
+assert(ic_call   == NULL || nm->contains(ic_call),   "must be in nmethod");
+assert(first_oop == NULL || nm->contains(first_oop), "must be in nmethod");
 address oop_limit = NULL;
 if (ic_call != NULL) {
 // search for the ic_call at the given address
-RelocIterator iter(code, ic_call, ic_call+1);
+RelocIterator iter(nm, ic_call, ic_call+1);
 bool ret = iter.next();
 assert(ret == true, "relocInfo must exist at this address");
 assert(iter.addr() == ic_call, "must find ic_call");
 if (iter.type() == relocInfo::virtual_call_type) {
 virtual_call_Relocation* r = iter.virtual_call_reloc();
 return iter;
 }
 }
 // search for the first_oop, to get its oop_addr
-RelocIterator all_oops(code, first_oop);
+RelocIterator all_oops(nm, first_oop);
 RelocIterator iter = all_oops;
 iter.set_limit(first_oop+1);
 bool found_oop = false;
 while (iter.next()) {
 if (iter.type() == relocInfo::oop_type) {
 break;
 }
 }
 }
 guarantee(!did_reset, "cannot find ic_call");
-iter = RelocIterator(code); // search the whole CodeBlob
+iter = RelocIterator(nm); // search the whole nmethod
 did_reset = true;
 }
 assert(oop_limit != NULL && first_oop != NULL && ic_call != NULL, "");
 all_oops.set_limit(oop_limit);
 (*this) = save_this;
 }
 // For the debugger:
 extern "C"
-void print_blob_locs(CodeBlob* cb) {
+void print_blob_locs(nmethod* nm) {
-cb->print();
+nm->print();
-RelocIterator iter(cb);
+RelocIterator iter(nm);
 iter.print();
 }
 extern "C"
 void print_buf_locs(CodeBuffer* cb) {
 FlagSetting fs(PrintRelocations, true);

changeset 5686	5435e77aa3df
parent 1	489c9b5090e2
child 5702	201c5cde25bb