*** old/src/share/vm/compiler/disassembler.cpp	Thu Sep 17 16:09:22 2009
--- new/src/share/vm/compiler/disassembler.cpp	Thu Sep 17 16:09:21 2009

*** 30,40 ****
--- 30,40 ----
  
  // This routine is in the shared library:
  Disassembler::decode_func Disassembler::_decode_instructions = NULL;
  
  static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH;
! static const char decode_instructions_name[] = "decode_instructions_virtual";
  
  #define COMMENT_COLUMN  40 LP64_ONLY(+8) /*could be an option*/
  #define BYTES_COMMENT   ";..."  /* funky byte display comment */
  
  bool Disassembler::load_library() {

*** 163,172 ****
--- 163,174 ----
            st->bol();
            st->print_cr("%3.1f%% [%d]", bucket_count*100.0/total_ticks(), bucket_count);
          }
        }
      }
+     // follow each complete insn by a nice newline
+     st->cr();
    }
  
    address handle_event(const char* event, address arg);
  
    outputStream* output() { return _output; }

*** 386,403 ****
--- 388,407 ----
      // Print whatever the library wants to print, w/o fancy callbacks.
      // This is mainly for debugging the library itself.
      FILE* out = stdout;
      FILE* xmlout = (_print_raw > 1 ? out : NULL);
      return (address)
!       (*Disassembler::_decode_instructions)((uintptr_t)start, (uintptr_t)end,
+                                             start, end - start,
                                              NULL, (void*) xmlout,
                                              NULL, (void*) out,
                                              options());
    }
  
    return (address)
!     (*Disassembler::_decode_instructions)((uintptr_t)start, (uintptr_t)end,
+                                           start, end - start,
                                            &event_to_env,  (void*) this,
                                            &printf_to_env, (void*) this,
                                            options());
  }