*** old/src/share/vm/utilities/debug.hpp	Mon Apr 29 18:22:43 2013
--- new/src/share/vm/utilities/debug.hpp	Mon Apr 29 18:22:41 2013

*** 172,184 ****
--- 172,184 ----
    report_fatal(__FILE__, __LINE__, msg);                                     \
    BREAKPOINT;                                                                \
  } while (0)
  
  // out of memory
! #define vm_exit_out_of_memory(size, msg)                                     \
! #define vm_exit_out_of_memory(size, vm_err_type, msg)                        \
  do {                                                                         \
!   report_vm_out_of_memory(__FILE__, __LINE__, size, msg);                    \
!   report_vm_out_of_memory(__FILE__, __LINE__, size, vm_err_type, msg);       \
    BREAKPOINT;                                                                \
  } while (0)
  
  #define ShouldNotCallThis()                                                  \
  do {                                                                         \

*** 202,217 ****
--- 202,225 ----
  do {                                                                         \
    report_untested(__FILE__, __LINE__, msg);                                  \
    BREAKPOINT;                                                                \
  } while (0);
  
+ 
+ // types of VM error - originally in vmError.hpp
+ enum VMErrorType {
+   INTERNAL_ERROR   = 0xe0000000,
+   OOM_MALLOC_ERROR = 0xe0000001,
+   OOM_MMAP_ERROR   = 0xe0000002
+ };
+ 
  // error reporting helper functions
  void report_vm_error(const char* file, int line, const char* error_msg,
                       const char* detail_msg = NULL);
  void report_fatal(const char* file, int line, const char* message);
  void report_vm_out_of_memory(const char* file, int line, size_t size,
!                              VMErrorType vm_err_type, const char* message);
  void report_should_not_call(const char* file, int line);
  void report_should_not_reach_here(const char* file, int line);
  void report_unimplemented(const char* file, int line);
  void report_untested(const char* file, int line, const char* message);