jdk8-mips64-public/hotspot: comparison src/os/windows/vm/os

-:0edda524b58c
+:1ee8caae33af
 /*
-* Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1997-2008 Sun Microsystems, Inc.  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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 path_buf[0]='\0';
 return path_buf;
 }
 }
+void os::dll_build_name(char *holder, size_t holderlen,
+const char* pname, const char* fname)
+{
+// copied from libhpi
+const size_t pnamelen = pname ? strlen(pname) : 0;
+const char c = (pnamelen > 0) ? pname[pnamelen-1] : 0;
+/* Quietly truncates on buffer overflow. Should be an error. */
+if (pnamelen + strlen(fname) + 10 > holderlen) {
+*holder = '\0';
+return;
+}
+if (pnamelen == 0) {
+sprintf(holder, "%s.dll", fname);
+} else if (c == ':' || c == '\\') {
+sprintf(holder, "%s%s.dll", pname, fname);
+} else {
+sprintf(holder, "%s\\%s.dll", pname, fname);
+}
+}
 // Needs to be in os specific directory because windows requires another
 // header file <direct.h>
 const char* os::get_current_directory(char *buf, int buflen) {
 return _getcwd(buf, buflen);
 }
 // for every module. That's too much work to do after a fatal error.
 // For an example on how to implement this function, see 1.4.2.
 if (offset)  *offset  = -1;
 if (buf) buf[0] = '\0';
 return false;
+}
+void* os::dll_lookup(void* handle, const char* name) {
+return GetProcAddress((HMODULE)handle, name);
 }
 // 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,
 unsigned size, void * param) {
 int pid = os::current_process_id();
 st->print_cr("Dynamic libraries:");
 enumerate_modules(pid, _print_module, (void *)st);
 }
+// function pointer to Windows API "GetNativeSystemInfo".
+typedef void (WINAPI *GetNativeSystemInfo_func_type)(LPSYSTEM_INFO);
+static GetNativeSystemInfo_func_type _GetNativeSystemInfo;
 void os::print_os_info(outputStream* st) {
 st->print("OS:");
 OSVERSIONINFOEX osvi;
 ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
 osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
 if (!GetVersionEx((OSVERSIONINFO *)&osvi)) {
 st->print_cr("N/A");
 return;
 }
 int os_vers = osvi.dwMajorVersion * 1000 + osvi.dwMinorVersion;
+if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
-if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+switch (os_vers) {
-switch (os_vers) {
+case 3051: st->print(" Windows NT 3.51"); break;
-case 3051: st->print(" Windows NT 3.51"); break;
+case 4000: st->print(" Windows NT 4.0"); break;
-case 4000: st->print(" Windows NT 4.0"); break;
+case 5000: st->print(" Windows 2000"); break;
-case 5000: st->print(" Windows 2000"); break;
+case 5001: st->print(" Windows XP"); break;
-case 5001: st->print(" Windows XP"); break;
+case 5002:
-case 5002: st->print(" Windows Server 2003 family"); break;
+case 6000: {
-case 6000: st->print(" Windows Vista"); break;
+// Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
-default: // future windows, print out its major and minor versions
+// find out whether we are running on 64 bit processor or not.
-st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+SYSTEM_INFO si;
-}
+ZeroMemory(&si, sizeof(SYSTEM_INFO));
-} else {
+// Check to see if _GetNativeSystemInfo has been initialized.
-switch (os_vers) {
+if (_GetNativeSystemInfo == NULL) {
-case 4000: st->print(" Windows 95"); break;
+HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32.dll"));
-case 4010: st->print(" Windows 98"); break;
+_GetNativeSystemInfo =
-case 4090: st->print(" Windows Me"); break;
+CAST_TO_FN_PTR(GetNativeSystemInfo_func_type,
-default: // future windows, print out its major and minor versions
+GetProcAddress(hKernel32,
-st->print(" Windows %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+"GetNativeSystemInfo"));
-}
+if (_GetNativeSystemInfo == NULL)
-}
+GetSystemInfo(&si);
+} else {
-st->print(" Build %d", osvi.dwBuildNumber);
+_GetNativeSystemInfo(&si);
-st->print(" %s", osvi.szCSDVersion);           // service pack
+}
-st->cr();
+if (os_vers == 5002) {
+if (osvi.wProductType == VER_NT_WORKSTATION &&
+si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+st->print(" Windows XP x64 Edition");
+else
+st->print(" Windows Server 2003 family");
+} else { // os_vers == 6000
+if (osvi.wProductType == VER_NT_WORKSTATION)
+st->print(" Windows Vista");
+else
+st->print(" Windows Server 2008");
+if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+st->print(" , 64 bit");
+}
+break;
+}
+default: // future windows, print out its major and minor versions
+st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+}
+} else {
+switch (os_vers) {
+case 4000: st->print(" Windows 95"); break;
+case 4010: st->print(" Windows 98"); break;
+case 4090: st->print(" Windows Me"); break;
+default: // future windows, print out its major and minor versions
+st->print(" Windows %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+}
+}
+st->print(" Build %d", osvi.dwBuildNumber);
+st->print(" %s", osvi.szCSDVersion);           // service pack
+st->cr();
 }
 void os::print_memory_info(outputStream* st) {
 st->print("Memory:");
 st->print(" %dk page", os::vm_page_size()>>10);
 #else /* !IA64 */
 // Windows 98 reports faulting addresses incorrectly
 if (!MacroAssembler::needs_explicit_null_check((intptr_t)addr) ||
 !os::win32::is_nt()) {
 return Handle_Exception(exceptionInfo,
 SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL));
 }
 report_error(t, exception_code, pc, exceptionInfo->ExceptionRecord,
 exceptionInfo->ContextRecord);
 bool os::release_memory(char* addr, size_t bytes) {
 return VirtualFree(addr, 0, MEM_RELEASE) != 0;
 }
-bool os::protect_memory(char* addr, size_t bytes) {
+// Set protections specified
+bool os::protect_memory(char* addr, size_t bytes, ProtType prot,
+bool is_committed) {
+unsigned int p = 0;
+switch (prot) {
+case MEM_PROT_NONE: p = PAGE_NOACCESS; break;
+case MEM_PROT_READ: p = PAGE_READONLY; break;
+case MEM_PROT_RW:   p = PAGE_READWRITE; break;
+case MEM_PROT_RWX:  p = PAGE_EXECUTE_READWRITE; break;
+default:
+ShouldNotReachHere();
+}
 DWORD old_status;
-return VirtualProtect(addr, bytes, PAGE_READONLY, &old_status) != 0;
+// Strange enough, but on Win32 one can change protection only for committed
+// memory, not a big deal anyway, as bytes less or equal than 64K
+if (!is_committed && !commit_memory(addr, bytes)) {
+fatal("cannot commit protection page");
+}
+// One cannot use os::guard_memory() here, as on Win32 guard page
+// have different (one-shot) semantics, from MSDN on PAGE_GUARD:
+//
+// Pages in the region become guard pages. Any attempt to access a guard page
+// causes the system to raise a STATUS_GUARD_PAGE exception and turn off
+// the guard page status. Guard pages thus act as a one-time access alarm.
+return VirtualProtect(addr, bytes, p, &old_status) != 0;
 }
 bool os::guard_memory(char* addr, size_t bytes) {
 DWORD old_status;
 return VirtualProtect(addr, bytes, PAGE_EXECUTE_READWRITE | PAGE_GUARD, &old_status) != 0;

comparison: src/os/windows/vm/os_windows.cpp

src/os/windows/vm/os_windows.cpp

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/os/windows/vm/os_windows.cpp

src/os/windows/vm/os_windows.cpp