Changeset 58 for trunk/openjdk/hotspot/src/os

Timestamp:

Jul 15, 2010, 2:46:42 PM (15 years ago)

Author:

dmik

Message:

hotspot/src: Another big bunch of patches to make the windows code build with Odin32/GCC on OS/2.

Location:

trunk/openjdk/hotspot/src/os/windows/vm

Files:

• os_windows.cpp (modified) (27 diffs)
• perfMemory_windows.cpp (modified) (10 diffs)

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

@@ -56 +56 @@
 #include <vdmdbg.h>
 
+#ifdef __WIN32OS2__
+#include <mmsystem.h>
+#include <wincon.h>
+#include <basetsd.h>
+#define _M_IX86
+#define _lseeki64 lseek
+#endif
+
 // for timer info max values which include all bits
 #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
@@ -531 +539 @@
 
   HANDLE thread_handle =
+#ifdef __WIN32OS2__
+    // @todo probably need to cause some per-thread LIBC initialization routine
+    CreateThread(NULL,
+                 stack_size,
+                 (LPTHREAD_START_ROUTINE) java_start,
+                 thread,
+                 CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION,
+                 (LPDWORD)&thread_id);
+#else
     (HANDLE)_beginthreadex(NULL,
                            (unsigned)stack_size,
@@ -536 +553 @@
                            thread,
                            CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION,
-                           &thread_id);
+                           (PDWORD)&thread_id);
+#endif  
   if (thread_handle == NULL) {
     // perhaps STACK_SIZE_PARAM_IS_A_RESERVATION is not supported, try again
     // without the flag.
     thread_handle =
+#ifdef __WIN32OS2__
+    // @todo probably need to cause some per-thread LIBC initialization routine
+    CreateThread(NULL,
+                 stack_size,
+                 (LPTHREAD_START_ROUTINE) java_start,
+                 thread,
+                 CREATE_SUSPENDED,
+                 (LPDWORD)&thread_id);
+#else
     (HANDLE)_beginthreadex(NULL,
                            (unsigned)stack_size,
@@ -547 +574 @@
                            CREATE_SUSPENDED,
                            &thread_id);
+#endif  
   }
   if (thread_handle == NULL) {
@@ -621 +649 @@
 
 julong os::win32::available_memory() {
+#ifdef __WIN32OS2__
+  MEMORYSTATUS ms;
+  ms.dwLength = sizeof(ms);
+  GlobalMemoryStatus(&ms);
+
+  return ms.dwAvailPhys;
+#else    
   // Use GlobalMemoryStatusEx() because GlobalMemoryStatus() may return incorrect
   // value if total memory is larger than 4GB
@@ -628 +663 @@
 
   return (julong)ms.ullAvailPhys;
+#endif
 }
 
@@ -644 +680 @@
 
 // VC6 lacks DWORD_PTR
+#ifndef __WIN32OS2__
 #if _MSC_VER < 1300
 typedef UINT_PTR DWORD_PTR;
+#endif
 #endif
 
@@ -703 +741 @@
 
 // Constant offset - calculated using offset()
-static jlong  _offset   = 116444736000000000;
+static jlong  _offset   = 116444736000000000LL;
 // Fake time counter for reproducible results when debugging
 static jlong  fake_time = 0;
@@ -1331 +1369 @@
 
 void* os::dll_lookup(void* handle, const char* name) {
-  return GetProcAddress((HMODULE)handle, name);
+  return CAST_FROM_FN_PTR(void *, GetProcAddress((HMODULE)handle, name));
 }
 
@@ -1446 +1484 @@
   static const arch_t arch_array[]={
     {IMAGE_FILE_MACHINE_I386,      (char*)"IA 32"},
+#ifndef __WIN32OS2__
     {IMAGE_FILE_MACHINE_AMD64,     (char*)"AMD 64"},
-    {IMAGE_FILE_MACHINE_IA64,      (char*)"IA 64"}
+    {IMAGE_FILE_MACHINE_IA64,      (char*)"IA 64"},
+#endif
   };
   #if   (defined _M_IA64)
@@ -1530 +1570 @@
     case 5000: st->print(" Windows 2000"); break;
     case 5001: st->print(" Windows XP"); break;
+#ifndef __WIN32OS2__      
     case 5002:
     case 6000:
@@ -1573 +1614 @@
       break;
     }
+#endif
     default: // future windows, print out its major and minor versions
       st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
@@ -1594 +1636 @@
   st->print(" %dk page", os::vm_page_size()>>10);
 
+#ifdef __WIN32OS2__
+  MEMORYSTATUS ms;
+  ms.dwLength = sizeof(ms);
+  GlobalMemoryStatus(&ms);
+#else    
   // Use GlobalMemoryStatusEx() because GlobalMemoryStatus() may return incorrect
   // value if total memory is larger than 4GB
@@ -1599 +1646 @@
   ms.dwLength = sizeof(ms);
   GlobalMemoryStatusEx(&ms);
+#endif
 
   st->print(", physical %uk", os::physical_memory() >> 10);
   st->print("(%uk free)", os::available_memory() >> 10);
 
+#ifdef __WIN32OS2__
+  st->print(", swap %uk", ms.dwTotalPageFile >> 10);
+  st->print("(%uk free)", ms.dwAvailPageFile >> 10);
+#else    
   st->print(", swap %uk", ms.ullTotalPageFile >> 10);
   st->print("(%uk free)", ms.ullAvailPageFile >> 10);
+#endif
   st->cr();
 }
@@ -2450 +2503 @@
 }
 
+#ifndef __WIN32OS2__
+
 // Windows large page support is available on Windows 2003. In order to use
 // large page memory, the administrator must first assign additional privilege
@@ -2555 +2610 @@
 }
 
+#endif // ifndef __WIN32OS2__
+
 bool os::large_page_init() {
   if (!UseLargePages) return false;
@@ -2564 +2621 @@
 
 # define WARN(msg) if (warn_on_failure) { warning(msg); }
+
+#ifdef __WIN32OS2__
+    WARN("Large page is not supported by the operating system.");
+#else
   if (resolve_functions_for_large_page_init()) {
     if (request_lock_memory_privilege()) {
@@ -2601 +2662 @@
 
   cleanup_after_large_page_init();
+#endif // ifdef __WIN32OS2__
+
   return success;
 }
@@ -2639 +2702 @@
 
 size_t os::large_page_size() {
+#ifdef __WIN32OS2__
+  return 0;
+#else
   return _large_page_size;
+#endif
 }
 
@@ -2657 +2724 @@
   const DWORD prot = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
 
+#ifndef __WIN32OS2__
   if (UseLargePagesIndividualAllocation) {
     if (TracePageSizes && Verbose) {
@@ -2751 +2819 @@
     return res;
   }
+#else // ifndef __WIN32OS2__
+  // normal policy just allocate it all at once
+  DWORD flag = MEM_RESERVE | MEM_COMMIT;
+  char * res = (char *)VirtualAlloc(NULL, bytes, flag, prot);
+  return res;
+#endif // ifndef __WIN32OS2__
 }
 
@@ -3158 +3232 @@
   _processor_count = si.dwNumberOfProcessors;
 
+#ifdef __WIN32OS2__
+  MEMORYSTATUS ms;
+  ms.dwLength = sizeof(ms);
+
+  GlobalMemoryStatus(&ms);
+  _physical_memory = ms.dwTotalPhys;
+#else    
   MEMORYSTATUSEX ms;
   ms.dwLength = sizeof(ms);
@@ -3165 +3246 @@
   GlobalMemoryStatusEx(&ms);
   _physical_memory = ms.ullTotalPhys;
+#endif
 
   OSVERSIONINFO oi;
@@ -3253 +3335 @@
   void *code_ptr = (void *)code;
   __try {
+#ifdef __EMX__
+    __asm__("call *%0" : : "m"(code_ptr));
+#else
     __asm call code_ptr
+#endif
   } __except(nx_exception_filter((_EXCEPTION_POINTERS*)_exception_info())) {
     tty->print_raw_cr("NX protection detected.");
@@ -3283 +3369 @@
   // Initialize main_process and main_thread
   main_process = GetCurrentProcess();  // Remember main_process is a pseudo handle
- if (!DuplicateHandle(main_process, GetCurrentThread(), main_process,
+  if (!DuplicateHandle(main_process, GetCurrentThread(), main_process,
                        &main_thread, THREAD_ALL_ACCESS, false, 0)) {
     fatal("DuplicateHandle failed\n");
@@ -3349 +3435 @@
 #ifndef  _WIN64
     static long fp_control_word = 0;
+#ifdef __EMX__
+    __asm__("fstcw %0" : "=m"(fp_control_word));
+#else
     __asm { fstcw fp_control_word }
+#endif    
     // see Intel PPro Manual, Vol. 2, p 7-16
     const long precision = 0x20;
@@ -3358 +3448 @@
     const long invalid   = 0x01;
     fp_control_word |= invalid;
+#ifdef __EMX__
+    __asm__("fldcw %0" : : "m"(fp_control_word));
+#else
     __asm { fldcw fp_control_word }
+#endif
 #endif
   }

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

@@ -218 +218 @@
   }
 
+#ifndef __WIN32OS2__
   if (fa & FILE_ATTRIBUTE_REPARSE_POINT) {
     // we don't accept any redirection for the user specific directory
@@ -229 +230 @@
     return false;
   }
+#endif
 
   if (fa & FILE_ATTRIBUTE_DIRECTORY) {
@@ -566 +568 @@
   }
 
+#ifndef __WIN32OS2__
   if ((flags & FS_PERSISTENT_ACLS) == 0) {
     // file system doesn't support ACLs, declare file system unsafe
@@ -583 +586 @@
     return false;
   }
+#endif
 
   return true;
@@ -744 +748 @@
   if (lpSA != NULL) {
     // free the contained security descriptor and the ACL
-    free_security_desc(lpSA->lpSecurityDescriptor);
+    free_security_desc((PSECURITY_DESCRIPTOR)lpSA->lpSecurityDescriptor);
     lpSA->lpSecurityDescriptor = NULL;
 
@@ -801 +805 @@
 
   DWORD nbytes = GetLengthSid(token_buf->User.Sid);
-  PSID pSID = NEW_C_HEAP_ARRAY(char, nbytes);
+  PSID pSID = (PSID)NEW_C_HEAP_ARRAY(char, nbytes);
 
   if (!CopySid(nbytes, pSID, token_buf->User.Sid)) {
@@ -926 +930 @@
       int matches = 0;
       for (int i = 0; i < ace_count; i++) {
-        if (EqualSid(aces[i].pSid, &(((ACCESS_ALLOWED_ACE *)ace)->SidStart))) {
+        if (EqualSid(aces[i].pSid, (PSID)&(((ACCESS_ALLOWED_ACE *)ace)->SidStart))) {
           matches++;
           break;
@@ -995 +999 @@
   }
 
+#ifndef __WIN32OS2__
   // if running on windows 2000 or later, set the automatic inheritance
   // control flags.
@@ -1015 +1020 @@
     }
   }
+#endif  
    // Note, the security descriptor maintains a reference to the newACL, not
    // a copy of it. Therefore, the newACL is not freed here. It is freed when
@@ -1226 +1232 @@
       // DACLs might fix the corrupted the DACLs.
       SECURITY_INFORMATION secInfo = DACL_SECURITY_INFORMATION;
-      if (!SetFileSecurity(dirname, secInfo, pDirSA->lpSecurityDescriptor)) {
+      if (!SetFileSecurity(dirname, secInfo,
+                          (PSECURITY_DESCRIPTOR)pDirSA->lpSecurityDescriptor)) {
         if (PrintMiscellaneous && Verbose) {
           lasterror = GetLastError();