Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/compiler/disassembler.cpp	Fri May 06 12:12:29 2011 -0700
     1.2 +++ b/src/share/vm/compiler/disassembler.cpp	Fri May 06 16:33:13 2011 -0700
     1.3 @@ -283,10 +283,10 @@
     1.4          st->print("Stub::%s", desc->name());
     1.5          if (desc->begin() != adr)
     1.6            st->print("%+d 0x%p",adr - desc->begin(), adr);
     1.7 -        else if (WizardMode) st->print(" " INTPTR_FORMAT, adr);
     1.8 +        else if (WizardMode) st->print(" " PTR_FORMAT, adr);
     1.9          return;
    1.10        }
    1.11 -      st->print("Stub::<unknown> " INTPTR_FORMAT, adr);
    1.12 +      st->print("Stub::<unknown> " PTR_FORMAT, adr);
    1.13        return;
    1.14      }
    1.15  
    1.16 @@ -314,8 +314,8 @@
    1.17      }
    1.18    }
    1.19  
    1.20 -  // Fall through to a simple numeral.
    1.21 -  st->print(INTPTR_FORMAT, (intptr_t)adr);
    1.22 +  // Fall through to a simple (hexadecimal) numeral.
    1.23 +  st->print(PTR_FORMAT, adr);
    1.24  }
    1.25  
    1.26  void decode_env::print_insn_labels() {
    1.27 @@ -326,7 +326,7 @@
    1.28      cb->print_block_comment(st, p);
    1.29    }
    1.30    if (_print_pc) {
    1.31 -    st->print("  " INTPTR_FORMAT ": ", (intptr_t) p);
    1.32 +    st->print("  " PTR_FORMAT ": ", p);
    1.33    }
    1.34  }
    1.35  
    1.36 @@ -432,7 +432,7 @@
    1.37  void Disassembler::decode(CodeBlob* cb, outputStream* st) {
    1.38    if (!load_library())  return;
    1.39    decode_env env(cb, st);
    1.40 -  env.output()->print_cr("Decoding CodeBlob " INTPTR_FORMAT, cb);
    1.41 +  env.output()->print_cr("Decoding CodeBlob " PTR_FORMAT, cb);
    1.42    env.decode_instructions(cb->code_begin(), cb->code_end());
    1.43  }
    1.44  
    1.45 @@ -446,7 +446,7 @@
    1.46  void Disassembler::decode(nmethod* nm, outputStream* st) {
    1.47    if (!load_library())  return;
    1.48    decode_env env(nm, st);
    1.49 -  env.output()->print_cr("Decoding compiled method " INTPTR_FORMAT ":", nm);
    1.50 +  env.output()->print_cr("Decoding compiled method " PTR_FORMAT ":", nm);
    1.51    env.output()->print_cr("Code:");
    1.52  
    1.53  #ifdef SHARK
    1.54 @@ -478,9 +478,9 @@
    1.55      int offset = 0;
    1.56      for (address p = nm->consts_begin(); p < nm->consts_end(); p += 4, offset += 4) {
    1.57        if ((offset % 8) == 0) {
    1.58 -        env.output()->print_cr("  " INTPTR_FORMAT " (offset: %4d): " PTR32_FORMAT "   " PTR64_FORMAT, (intptr_t) p, offset, *((int32_t*) p), *((int64_t*) p));
    1.59 +        env.output()->print_cr("  " PTR_FORMAT " (offset: %4d): " PTR32_FORMAT "   " PTR64_FORMAT, p, offset, *((int32_t*) p), *((int64_t*) p));
    1.60        } else {
    1.61 -        env.output()->print_cr("  " INTPTR_FORMAT " (offset: %4d): " PTR32_FORMAT,                    (intptr_t) p, offset, *((int32_t*) p));
    1.62 +        env.output()->print_cr("  " PTR_FORMAT " (offset: %4d): " PTR32_FORMAT,                    p, offset, *((int32_t*) p));
    1.63        }
    1.64      }
    1.65    }