1.1 --- a/src/share/vm/code/codeCache.cpp Mon Aug 23 09:09:36 2010 -0700
1.2 +++ b/src/share/vm/code/codeCache.cpp Wed Aug 25 05:27:54 2010 -0700
1.3 @@ -76,14 +76,14 @@
1.4 relocation_size += cb->relocation_size();
1.5 if (cb->is_nmethod()) {
1.6 nmethod* nm = cb->as_nmethod_or_null();
1.7 - code_size += nm->code_size();
1.8 + code_size += nm->insts_size();
1.9 stub_size += nm->stub_size();
1.10
1.11 scopes_oop_size += nm->oops_size();
1.12 scopes_data_size += nm->scopes_data_size();
1.13 scopes_pcs_size += nm->scopes_pcs_size();
1.14 } else {
1.15 - code_size += cb->instructions_size();
1.16 + code_size += cb->code_size();
1.17 }
1.18 }
1.19 };
1.20 @@ -210,7 +210,7 @@
1.21 }
1.22
1.23 // flush the hardware I-cache
1.24 - ICache::invalidate_range(cb->instructions_begin(), cb->instructions_size());
1.25 + ICache::invalidate_range(cb->content_begin(), cb->content_size());
1.26 }
1.27
1.28
1.29 @@ -804,8 +804,8 @@
1.30
1.31 if(nm->method() != NULL && nm->is_java_method()) {
1.32 nmethodJava++;
1.33 - if(nm->code_size() > maxCodeSize) {
1.34 - maxCodeSize = nm->code_size();
1.35 + if (nm->insts_size() > maxCodeSize) {
1.36 + maxCodeSize = nm->insts_size();
1.37 }
1.38 }
1.39 } else if (cb->is_runtime_stub()) {
1.40 @@ -830,7 +830,7 @@
1.41 if (cb->is_nmethod()) {
1.42 nmethod* nm = (nmethod*)cb;
1.43 if(nm->is_java_method()) {
1.44 - buckets[nm->code_size() / bucketSize]++;
1.45 + buckets[nm->insts_size() / bucketSize]++;
1.46 }
1.47 }
1.48 }
1.49 @@ -896,11 +896,11 @@
1.50 FOR_ALL_BLOBS(p) {
1.51 if (p->is_alive()) {
1.52 number_of_blobs++;
1.53 - code_size += p->instructions_size();
1.54 + code_size += p->code_size();
1.55 OopMapSet* set = p->oop_maps();
1.56 if (set != NULL) {
1.57 number_of_oop_maps += set->size();
1.58 - map_size += set->heap_size();
1.59 + map_size += set->heap_size();
1.60 }
1.61 }
1.62 }
