*** old/src/share/vm/utilities/vmError.cpp	Mon Apr 29 18:22:47 2013
--- new/src/share/vm/utilities/vmError.cpp	Mon Apr 29 18:22:46 2013

*** 98,108 ****
--- 98,108 ----
  // Constructor for internal errors
  VMError::VMError(Thread* thread, const char* filename, int lineno,
                   const char* message, const char * detail_msg)
  {
    _thread = thread;
!   _id = internal_error;     // Value that's not an OS exception/signal
!   _id = INTERNAL_ERROR;     // Value that's not an OS exception/signal
    _filename = filename;
    _lineno = lineno;
    _message = message;
    _detail_msg = detail_msg;
  

*** 117,129 ****
--- 117,129 ----
    _size = 0;
  }
  
  // Constructor for OOM errors
  VMError::VMError(Thread* thread, const char* filename, int lineno, size_t size,
!                  VMErrorType vm_err_type, const char* message) {
      _thread = thread;
!     _id = oom_error;     // Value that's not an OS exception/signal
!     _id = vm_err_type; // Value that's not an OS exception/signal
      _filename = filename;
      _lineno = lineno;
      _message = message;
      _detail_msg = NULL;
  

*** 140,150 ****
--- 140,150 ----
  
  
  // Constructor for non-fatal errors
  VMError::VMError(const char* message) {
      _thread = NULL;
!     _id = internal_error;     // Value that's not an OS exception/signal
!     _id = INTERNAL_ERROR;     // Value that's not an OS exception/signal
      _filename = NULL;
      _lineno = 0;
      _message = message;
      _detail_msg = NULL;
  

*** 349,361 ****
--- 349,364 ----
      }
  
    STEP(15, "(printing type of error)")
  
       switch(_id) {
!        case oom_error:
!        case OOM_MALLOC_ERROR:
+        case OOM_MMAP_ERROR:
           if (_size) {
-            st->print("# Native memory allocation (malloc) failed to allocate ");
+            st->print((_id == (int)OOM_MALLOC_ERROR) ? "(malloc) failed to allocate " :
+                                                  "(mmap) failed to map ");
             jio_snprintf(buf, sizeof(buf), SIZE_FORMAT, _size);
             st->print(buf);
             st->print(" bytes");
             if (_message != NULL) {
               st->print(" for ");

*** 384,394 ****
--- 387,397 ----
             st->print_cr("# This output file may be truncated or incomplete.");
           } else {
             return;  // that's enough for the screen
           }
           break;
!        case internal_error:
!        case INTERNAL_ERROR:
         default:
           break;
       }
  
    STEP(20, "(printing exception/signal name)")