Changeset 113

Timestamp:

Aug 24, 2010, 1:57:10 AM (15 years ago)

Author:

dmik

Message:

hotspot: Implemented os::dll_address_to_library_name(), os::address_is_in_vm() and os::print_dll_info() using native OS/2 APIs.

Location:

trunk/openjdk/hotspot

Files:

• make/os2/makefiles/compile.make (modified) (1 diff)
• make/os2/makefiles/debug.make (modified) (1 diff)
• make/os2/makefiles/product.make (modified) (1 diff)
• src/os/os2/vm/os_os2.cpp (added)
• src/os/windows/vm/os_windows.cpp (modified) (7 diffs)

trunk/openjdk/hotspot/make/os2/makefiles/compile.make

@@ -67 +67 @@
                            -lkernel32.lib -luser32.lib -lgdi32.lib -lwinspool.lib \
                -lcomdlg32.lib -ladvapi32.lib -lshell32.lib -lole32.lib \
-               -loleaut32.lib -lWsock32.lib -lwinmm.lib
+               -loleaut32.lib -lWsock32.lib -lwinmm.lib \
+               -lemxlibwrap0.lib -lemxlibwrap1.lib

trunk/openjdk/hotspot/make/os2/makefiles/debug.make

@@ -48 +48 @@
 # Not included in includeDB because they don't match the logic of that file
 # (it expects only one platform at a time which is windows for now)
-Obj_Files += os_os2.obj
+Obj_Files += os_os2_init.obj os_os2.obj
 
 HS_BUILD_ID = $(HS_BUILD_VER)-debug

trunk/openjdk/hotspot/make/os2/makefiles/product.make

@@ -49 +49 @@
 # Not included in includeDB because they don't match the logic of that file
 # (it expects only one platform at a time which is windows for now)
-Obj_Files += os_os2.obj
+Obj_Files += os_os2_init.obj os_os2.obj
 
 HS_BUILD_ID = $(HS_BUILD_VER)

trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp

@@ -1114 +1114 @@
 }
 
+#ifndef __WIN32OS2__
+
 //-----------------------------------------------------------
 // Helper functions for fatal error handler
@@ -1360 +1362 @@
 }
 
+#endif /* __WIN32OS2__ */
+
 bool os::dll_address_to_function_name(address addr, char *buf,
                                       int buflen, int *offset) {
@@ -1375 +1379 @@
 }
 
+#ifndef __WIN32OS2__
+
 // save the start and end address of jvm.dll into param[0] and param[1]
 static int _locate_jvm_dll(int pid, char* mod_fname, address base_addr,
@@ -1415 +1421 @@
    return 0;
 }
+
+#endif /* __WIN32OS2__ */
 
 // Loads .dll/.so and
@@ -1543 +1551 @@
 }
 
+#ifndef __WIN32OS2__
 
 void os::print_dll_info(outputStream *st) {
@@ -1549 +1558 @@
    enumerate_modules(pid, _print_module, (void *)st);
 }
+
+#endif /* __WIN32OS2__ */
 
 // function pointer to Windows API "GetNativeSystemInfo".
@@ -3508 +3519 @@
   }
 
+#ifndef __WIN32OS2__
   // initialize PSAPI or ToolHelp for fatal error handler
   if (win32::is_nt()) _init_psapi();
   else _init_toolhelp();
+#endif
 
 #ifndef _WIN64