--- old/src/share/vm/utilities/decoder.hpp	Fri Oct 21 11:12:24 2011
+++ new/src/share/vm/utilities/decoder.hpp	Fri Oct 21 11:12:23 2011
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,83 +23,68 @@
  */
 
 
-#ifndef __DECODER_HPP
-#define __DECODER_HPP
+#ifndef SHARE_VM_UTILITIES_DECODER_HPP
+#define SHARE_VM_UTILITIES_DECODER_HPP
 
 #include "memory/allocation.hpp"
+#include "runtime/mutex.hpp"
 
-#ifdef _WINDOWS
-#include <windows.h>
-#include <imagehlp.h>
+class Decoder: public CHeapObj {
 
-// functions needed for decoding symbols
-typedef DWORD (WINAPI *pfn_SymSetOptions)(DWORD);
-typedef BOOL  (WINAPI *pfn_SymInitialize)(HANDLE, PCTSTR, BOOL);
-typedef BOOL  (WINAPI *pfn_SymGetSymFromAddr64)(HANDLE, DWORD64, PDWORD64, PIMAGEHLP_SYMBOL64);
-typedef DWORD (WINAPI *pfn_UndecorateSymbolName)(const char*, char*, DWORD, DWORD);
-
-#elif defined(__APPLE__)
-
-#else
-
-class ElfFile;
-
-#endif // _WINDOWS
-
-
-class Decoder: public StackObj {
-
- public:
+public:
   // status code for decoding native C frame
   enum decoder_status {
-         no_error,             // successfully decoded frames
+         not_available = -10,  // real decoder is not available
+         no_error = 0,         // successfully decoded frames
          out_of_memory,        // out of memory
          file_invalid,         // invalid elf file
          file_not_found,       // could not found symbol file (on windows), such as jvm.pdb or jvm.map
          helper_not_found,     // could not load dbghelp.dll (Windows only)
          helper_func_error,    // decoding functions not found (Windows only)
-         helper_init_error,    // SymInitialize failed (Windows only)
-         symbol_not_found      // could not find the symbol
+         helper_init_error     // SymInitialize failed (Windows only)
   };
 
- public:
-  Decoder() { initialize(); };
-  ~Decoder() { uninitialize(); };
+   static bool decode(address pc, char* buf, int buflen, int* offset, const char* modulepath = NULL);
+   static bool demangle(const char* symbol, char* buf, int buflen);
+   static bool can_decode_C_frame_in_vm();
 
-  static bool can_decode_C_frame_in_vm();
+   static bool is_error(decoder_status status) { return (status > 0); }
+   static decoder_status status();
 
-  static void initialize();
-  static void uninitialize();
+   static void shutdown();
+protected:
+  Decoder() {
+    _decoder_status = not_available;
+  };
 
-#ifdef _WINDOWS
-  static decoder_status    decode(address addr, char *buf, int buflen, int *offset);
-#else
-  static decoder_status    decode(address addr, const char* filepath, char *buf, int buflen, int *offset);
-#endif
+  ~Decoder() {};
 
-  static bool              demangle(const char* symbol, char *buf, int buflen);
+  static Decoder* get_decoder();
 
-  static decoder_status    get_status() { return _decoder_status; };
+  virtual bool _decode(address pc, char* buf, int buflen, int* offset, 
+    const char* modulepath = NULL) {
+    return false;
+  }
 
-#if !defined(_WINDOWS) && !defined(__APPLE__)
- private:
-  static ElfFile*         get_elf_file(const char* filepath);
-#endif // _WINDOWS
+  virtual bool _demangle(const char* symbol, char* buf, int buflen) {
+    return false;
+  }
 
+  virtual bool _can_decode_C_frame_in_vm() const { 
+    return false; 
+  }
 
- private:
-  static decoder_status     _decoder_status;
-  static bool               _initialized;
+  virtual decoder_status _status() const { return _decoder_status; }
+  virtual bool has_error() const { return is_error(_decoder_status); }
+ 
+private:
+  static Decoder*     _decoder;
+  static Decoder      _do_nothing_decoder;
 
-#ifdef _WINDOWS
-  static HMODULE                   _dbghelp_handle;
-  static bool                      _can_decode_in_vm;
-  static pfn_SymGetSymFromAddr64   _pfnSymGetSymFromAddr64;
-  static pfn_UndecorateSymbolName  _pfnUndecorateSymbolName;
-#elif __APPLE__
-#else
-  static ElfFile*                  _opened_elf_files;
-#endif // _WINDOWS
+protected:
+  static Mutex*       _decoder_lock;
+
+  decoder_status      _decoder_status;
 };
 
-#endif // __DECODER_HPP
+#endif // SHARE_VM_UTILITIES_DECODER_HPP