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

     1.1 --- a/src/share/vm/compiler/disassembler.cpp	Sat Mar 16 21:44:52 2013 -0700
     1.2 +++ b/src/share/vm/compiler/disassembler.cpp	Mon Mar 18 13:19:06 2013 +0100
     1.3 @@ -158,7 +158,7 @@
     1.4   private:
     1.5    nmethod*      _nm;
     1.6    CodeBlob*     _code;
     1.7 -  CodeComments  _comments;
     1.8 +  CodeStrings   _strings;
     1.9    outputStream* _output;
    1.10    address       _start, _end;
    1.11  
    1.12 @@ -198,7 +198,7 @@
    1.13    void print_address(address value);
    1.14  
    1.15   public:
    1.16 -  decode_env(CodeBlob* code, outputStream* output, CodeComments c = CodeComments());
    1.17 +  decode_env(CodeBlob* code, outputStream* output, CodeStrings c = CodeStrings());
    1.18  
    1.19    address decode_instructions(address start, address end);
    1.20  
    1.21 @@ -242,13 +242,13 @@
    1.22    const char* options() { return _option_buf; }
    1.23  };
    1.24  
    1.25 -decode_env::decode_env(CodeBlob* code, outputStream* output, CodeComments c) {
    1.26 +decode_env::decode_env(CodeBlob* code, outputStream* output, CodeStrings c) {
    1.27    memset(this, 0, sizeof(*this));
    1.28    _output = output ? output : tty;
    1.29    _code = code;
    1.30    if (code != NULL && code->is_nmethod())
    1.31      _nm = (nmethod*) code;
    1.32 -  _comments.assign(c);
    1.33 +  _strings.assign(c);
    1.34  
    1.35    // by default, output pc but not bytes:
    1.36    _print_pc       = true;
    1.37 @@ -370,7 +370,7 @@
    1.38    if (cb != NULL) {
    1.39      cb->print_block_comment(st, p);
    1.40    }
    1.41 -  _comments.print_block_comment(st, (intptr_t)(p - _start));
    1.42 +  _strings.print_block_comment(st, (intptr_t)(p - _start));
    1.43    if (_print_pc) {
    1.44      st->print("  " PTR_FORMAT ": ", p);
    1.45    }
    1.46 @@ -498,7 +498,7 @@
    1.47    env.decode_instructions(cb->code_begin(), cb->code_end());
    1.48  }
    1.49  
    1.50 -void Disassembler::decode(address start, address end, outputStream* st, CodeComments c) {
    1.51 +void Disassembler::decode(address start, address end, outputStream* st, CodeStrings c) {
    1.52    if (!load_library())  return;
    1.53    decode_env env(CodeCache::find_blob_unsafe(start), st, c);
    1.54    env.decode_instructions(start, end);