1.1 --- a/src/share/vm/code/relocInfo.cpp Mon Aug 23 09:09:36 2010 -0700
1.2 +++ b/src/share/vm/code/relocInfo.cpp Wed Aug 25 05:27:54 2010 -0700
1.3 @@ -128,13 +128,11 @@
1.4 _code = nm;
1.5 _current = nm->relocation_begin() - 1;
1.6 _end = nm->relocation_end();
1.7 - _addr = (address) nm->instructions_begin();
1.8 + _addr = (address) nm->code_begin();
1.9
1.10 assert(!has_current(), "just checking");
1.11 - address code_end = nm->instructions_end();
1.12 -
1.13 - assert(begin == NULL || begin >= nm->instructions_begin(), "in bounds");
1.14 - // FIX THIS assert(limit == NULL || limit <= code_end, "in bounds");
1.15 + assert(begin == NULL || begin >= nm->code_begin(), "in bounds");
1.16 + assert(limit == NULL || limit <= nm->code_end(), "in bounds");
1.17 set_limits(begin, limit);
1.18 }
1.19
1.20 @@ -267,7 +265,7 @@
1.21 // skip ahead
1.22 RelocIndexEntry* index = (RelocIndexEntry*)_end;
1.23 RelocIndexEntry* index_limit = (RelocIndexEntry*)((address)index + index_size);
1.24 - assert(_addr == _code->instructions_begin(), "_addr must be unadjusted");
1.25 + assert(_addr == _code->code_begin(), "_addr must be unadjusted");
1.26 int card = (begin - _addr) / indexCardSize;
1.27 if (card > 0) {
1.28 if (index+card-1 < index_limit) index += card-1;
1.29 @@ -369,7 +367,7 @@
1.30 CodeBlob* cb = code();
1.31 guarantee(cb != NULL, "must have a code blob");
1.32 if (n == CodeBuffer::SECT_INSTS)
1.33 - return CACHE = cb->instructions_begin();
1.34 + return CACHE = cb->code_begin();
1.35 assert(cb->is_nmethod(), "only nmethods have these sections");
1.36 nmethod* nm = (nmethod*) cb;
1.37 address res = NULL;
1.38 @@ -383,7 +381,7 @@
1.39 default:
1.40 ShouldNotReachHere();
1.41 }
1.42 - assert(nm->contains(res) || res == nm->instructions_end(), "tame pointer");
1.43 + assert(nm->contains(res) || res == nm->code_end(), "tame pointer");
1.44 CACHE = res;
1.45 return res;
1.46 #undef CACHE
