--- a/hotspot/src/os/windows/vm/os_windows.cpp Thu Dec 10 19:59:10 2015 +0000
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Thu Dec 10 21:31:56 2015 +0000
@@ -5529,8 +5529,6 @@
return yes;
}
-#ifndef JDK6_OR_EARLIER
-
void os::Kernel32Dll::initialize() {
initializeCommon();
}
@@ -5705,261 +5703,6 @@
return agent_entry_name;
}
-#else
-// Kernel32 API
-typedef BOOL (WINAPI* SwitchToThread_Fn)(void);
-typedef HANDLE (WINAPI* CreateToolhelp32Snapshot_Fn)(DWORD, DWORD);
-typedef BOOL (WINAPI* Module32First_Fn)(HANDLE, LPMODULEENTRY32);
-typedef BOOL (WINAPI* Module32Next_Fn)(HANDLE, LPMODULEENTRY32);
-typedef void (WINAPI* GetNativeSystemInfo_Fn)(LPSYSTEM_INFO);
-
-SwitchToThread_Fn os::Kernel32Dll::_SwitchToThread = NULL;
-CreateToolhelp32Snapshot_Fn os::Kernel32Dll::_CreateToolhelp32Snapshot = NULL;
-Module32First_Fn os::Kernel32Dll::_Module32First = NULL;
-Module32Next_Fn os::Kernel32Dll::_Module32Next = NULL;
-GetNativeSystemInfo_Fn os::Kernel32Dll::_GetNativeSystemInfo = NULL;
-
-void os::Kernel32Dll::initialize() {
- if (!initialized) {
- HMODULE handle = ::GetModuleHandle("Kernel32.dll");
- assert(handle != NULL, "Just check");
-
- _SwitchToThread = (SwitchToThread_Fn)::GetProcAddress(handle, "SwitchToThread");
- _CreateToolhelp32Snapshot = (CreateToolhelp32Snapshot_Fn)
- ::GetProcAddress(handle, "CreateToolhelp32Snapshot");
- _Module32First = (Module32First_Fn)::GetProcAddress(handle, "Module32First");
- _Module32Next = (Module32Next_Fn)::GetProcAddress(handle, "Module32Next");
- _GetNativeSystemInfo = (GetNativeSystemInfo_Fn)::GetProcAddress(handle, "GetNativeSystemInfo");
- initializeCommon(); // resolve the functions that always need resolving
-
- initialized = TRUE;
- }
-}
-
-BOOL os::Kernel32Dll::SwitchToThread() {
- assert(initialized && _SwitchToThread != NULL,
- "SwitchToThreadAvailable() not yet called");
- return _SwitchToThread();
-}
-
-
-BOOL os::Kernel32Dll::SwitchToThreadAvailable() {
- if (!initialized) {
- initialize();
- }
- return _SwitchToThread != NULL;
-}
-
-// Help tools
-BOOL os::Kernel32Dll::HelpToolsAvailable() {
- if (!initialized) {
- initialize();
- }
- return _CreateToolhelp32Snapshot != NULL &&
- _Module32First != NULL &&
- _Module32Next != NULL;
-}
-
-HANDLE os::Kernel32Dll::CreateToolhelp32Snapshot(DWORD dwFlags,
- DWORD th32ProcessId) {
- assert(initialized && _CreateToolhelp32Snapshot != NULL,
- "HelpToolsAvailable() not yet called");
-
- return _CreateToolhelp32Snapshot(dwFlags, th32ProcessId);
-}
-
-BOOL os::Kernel32Dll::Module32First(HANDLE hSnapshot,LPMODULEENTRY32 lpme) {
- assert(initialized && _Module32First != NULL,
- "HelpToolsAvailable() not yet called");
-
- return _Module32First(hSnapshot, lpme);
-}
-
-inline BOOL os::Kernel32Dll::Module32Next(HANDLE hSnapshot,
- LPMODULEENTRY32 lpme) {
- assert(initialized && _Module32Next != NULL,
- "HelpToolsAvailable() not yet called");
-
- return _Module32Next(hSnapshot, lpme);
-}
-
-
-BOOL os::Kernel32Dll::GetNativeSystemInfoAvailable() {
- if (!initialized) {
- initialize();
- }
- return _GetNativeSystemInfo != NULL;
-}
-
-void os::Kernel32Dll::GetNativeSystemInfo(LPSYSTEM_INFO lpSystemInfo) {
- assert(initialized && _GetNativeSystemInfo != NULL,
- "GetNativeSystemInfoAvailable() not yet called");
-
- _GetNativeSystemInfo(lpSystemInfo);
-}
-
-// PSAPI API
-
-
-typedef BOOL (WINAPI *EnumProcessModules_Fn)(HANDLE, HMODULE *, DWORD, LPDWORD);
-typedef BOOL (WINAPI *GetModuleFileNameEx_Fn)(HANDLE, HMODULE, LPTSTR, DWORD);
-typedef BOOL (WINAPI *GetModuleInformation_Fn)(HANDLE, HMODULE, LPMODULEINFO, DWORD);
-
-EnumProcessModules_Fn os::PSApiDll::_EnumProcessModules = NULL;
-GetModuleFileNameEx_Fn os::PSApiDll::_GetModuleFileNameEx = NULL;
-GetModuleInformation_Fn os::PSApiDll::_GetModuleInformation = NULL;
-BOOL os::PSApiDll::initialized = FALSE;
-
-void os::PSApiDll::initialize() {
- if (!initialized) {
- HMODULE handle = os::win32::load_Windows_dll("PSAPI.DLL", NULL, 0);
- if (handle != NULL) {
- _EnumProcessModules = (EnumProcessModules_Fn)::GetProcAddress(handle,
- "EnumProcessModules");
- _GetModuleFileNameEx = (GetModuleFileNameEx_Fn)::GetProcAddress(handle,
- "GetModuleFileNameExA");
- _GetModuleInformation = (GetModuleInformation_Fn)::GetProcAddress(handle,
- "GetModuleInformation");
- }
- initialized = TRUE;
- }
-}
-
-
-
-BOOL os::PSApiDll::EnumProcessModules(HANDLE hProcess, HMODULE *lpModule,
- DWORD cb, LPDWORD lpcbNeeded) {
- assert(initialized && _EnumProcessModules != NULL,
- "PSApiAvailable() not yet called");
- return _EnumProcessModules(hProcess, lpModule, cb, lpcbNeeded);
-}
-
-DWORD os::PSApiDll::GetModuleFileNameEx(HANDLE hProcess, HMODULE hModule,
- LPTSTR lpFilename, DWORD nSize) {
- assert(initialized && _GetModuleFileNameEx != NULL,
- "PSApiAvailable() not yet called");
- return _GetModuleFileNameEx(hProcess, hModule, lpFilename, nSize);
-}
-
-BOOL os::PSApiDll::GetModuleInformation(HANDLE hProcess, HMODULE hModule,
- LPMODULEINFO lpmodinfo, DWORD cb) {
- assert(initialized && _GetModuleInformation != NULL,
- "PSApiAvailable() not yet called");
- return _GetModuleInformation(hProcess, hModule, lpmodinfo, cb);
-}
-
-BOOL os::PSApiDll::PSApiAvailable() {
- if (!initialized) {
- initialize();
- }
- return _EnumProcessModules != NULL &&
- _GetModuleFileNameEx != NULL &&
- _GetModuleInformation != NULL;
-}
-
-
-// WinSock2 API
-typedef int (PASCAL FAR* WSAStartup_Fn)(WORD, LPWSADATA);
-typedef struct hostent *(PASCAL FAR *gethostbyname_Fn)(...);
-
-WSAStartup_Fn os::WinSock2Dll::_WSAStartup = NULL;
-gethostbyname_Fn os::WinSock2Dll::_gethostbyname = NULL;
-BOOL os::WinSock2Dll::initialized = FALSE;
-
-void os::WinSock2Dll::initialize() {
- if (!initialized) {
- HMODULE handle = os::win32::load_Windows_dll("ws2_32.dll", NULL, 0);
- if (handle != NULL) {
- _WSAStartup = (WSAStartup_Fn)::GetProcAddress(handle, "WSAStartup");
- _gethostbyname = (gethostbyname_Fn)::GetProcAddress(handle, "gethostbyname");
- }
- initialized = TRUE;
- }
-}
-
-
-BOOL os::WinSock2Dll::WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) {
- assert(initialized && _WSAStartup != NULL,
- "WinSock2Available() not yet called");
- return _WSAStartup(wVersionRequested, lpWSAData);
-}
-
-struct hostent* os::WinSock2Dll::gethostbyname(const char *name) {
- assert(initialized && _gethostbyname != NULL,
- "WinSock2Available() not yet called");
- return _gethostbyname(name);
-}
-
-BOOL os::WinSock2Dll::WinSock2Available() {
- if (!initialized) {
- initialize();
- }
- return _WSAStartup != NULL &&
- _gethostbyname != NULL;
-}
-
-typedef BOOL (WINAPI *AdjustTokenPrivileges_Fn)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD);
-typedef BOOL (WINAPI *OpenProcessToken_Fn)(HANDLE, DWORD, PHANDLE);
-typedef BOOL (WINAPI *LookupPrivilegeValue_Fn)(LPCTSTR, LPCTSTR, PLUID);
-
-AdjustTokenPrivileges_Fn os::Advapi32Dll::_AdjustTokenPrivileges = NULL;
-OpenProcessToken_Fn os::Advapi32Dll::_OpenProcessToken = NULL;
-LookupPrivilegeValue_Fn os::Advapi32Dll::_LookupPrivilegeValue = NULL;
-BOOL os::Advapi32Dll::initialized = FALSE;
-
-void os::Advapi32Dll::initialize() {
- if (!initialized) {
- HMODULE handle = os::win32::load_Windows_dll("advapi32.dll", NULL, 0);
- if (handle != NULL) {
- _AdjustTokenPrivileges = (AdjustTokenPrivileges_Fn)::GetProcAddress(handle,
- "AdjustTokenPrivileges");
- _OpenProcessToken = (OpenProcessToken_Fn)::GetProcAddress(handle,
- "OpenProcessToken");
- _LookupPrivilegeValue = (LookupPrivilegeValue_Fn)::GetProcAddress(handle,
- "LookupPrivilegeValueA");
- }
- initialized = TRUE;
- }
-}
-
-BOOL os::Advapi32Dll::AdjustTokenPrivileges(HANDLE TokenHandle,
- BOOL DisableAllPrivileges,
- PTOKEN_PRIVILEGES NewState,
- DWORD BufferLength,
- PTOKEN_PRIVILEGES PreviousState,
- PDWORD ReturnLength) {
- assert(initialized && _AdjustTokenPrivileges != NULL,
- "AdvapiAvailable() not yet called");
- return _AdjustTokenPrivileges(TokenHandle, DisableAllPrivileges, NewState,
- BufferLength, PreviousState, ReturnLength);
-}
-
-BOOL os::Advapi32Dll::OpenProcessToken(HANDLE ProcessHandle,
- DWORD DesiredAccess,
- PHANDLE TokenHandle) {
- assert(initialized && _OpenProcessToken != NULL,
- "AdvapiAvailable() not yet called");
- return _OpenProcessToken(ProcessHandle, DesiredAccess, TokenHandle);
-}
-
-BOOL os::Advapi32Dll::LookupPrivilegeValue(LPCTSTR lpSystemName,
- LPCTSTR lpName, PLUID lpLuid) {
- assert(initialized && _LookupPrivilegeValue != NULL,
- "AdvapiAvailable() not yet called");
- return _LookupPrivilegeValue(lpSystemName, lpName, lpLuid);
-}
-
-BOOL os::Advapi32Dll::AdvapiAvailable() {
- if (!initialized) {
- initialize();
- }
- return _AdjustTokenPrivileges != NULL &&
- _OpenProcessToken != NULL &&
- _LookupPrivilegeValue != NULL;
-}
-
-#endif
-
#ifndef PRODUCT
// test the code path in reserve_memory_special() that tries to allocate memory in a single
--- a/hotspot/src/os/windows/vm/os_windows.hpp Thu Dec 10 19:59:10 2015 +0000
+++ b/hotspot/src/os/windows/vm/os_windows.hpp Thu Dec 10 21:31:56 2015 +0000
@@ -183,26 +183,11 @@
} ;
-// JDK7 requires VS2010
-#if _MSC_VER < 1600
-#define JDK6_OR_EARLIER 1
-#endif
-
-
-
class WinSock2Dll: AllStatic {
public:
static BOOL WSAStartup(WORD, LPWSADATA);
static struct hostent* gethostbyname(const char *name);
static BOOL WinSock2Available();
-#ifdef JDK6_OR_EARLIER
-private:
- static int (PASCAL FAR* _WSAStartup)(WORD, LPWSADATA);
- static struct hostent *(PASCAL FAR *_gethostbyname)(...);
- static BOOL initialized;
-
- static void initialize();
-#endif
};
class Kernel32Dll: AllStatic {
@@ -244,16 +229,6 @@
static void initialize();
static void initializeCommon();
-
-#ifdef JDK6_OR_EARLIER
-private:
- static BOOL (WINAPI *_SwitchToThread)(void);
- static HANDLE (WINAPI* _CreateToolhelp32Snapshot)(DWORD,DWORD);
- static BOOL (WINAPI* _Module32First)(HANDLE,LPMODULEENTRY32);
- static BOOL (WINAPI* _Module32Next)(HANDLE,LPMODULEENTRY32);
- static void (WINAPI *_GetNativeSystemInfo)(LPSYSTEM_INFO);
-#endif
-
};
class Advapi32Dll: AllStatic {
@@ -263,16 +238,6 @@
static BOOL LookupPrivilegeValue(LPCTSTR, LPCTSTR, PLUID);
static BOOL AdvapiAvailable();
-
-#ifdef JDK6_OR_EARLIER
-private:
- static BOOL (WINAPI *_AdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD);
- static BOOL (WINAPI *_OpenProcessToken)(HANDLE, DWORD, PHANDLE);
- static BOOL (WINAPI *_LookupPrivilegeValue)(LPCTSTR, LPCTSTR, PLUID);
- static BOOL initialized;
-
- static void initialize();
-#endif
};
class PSApiDll: AllStatic {
@@ -282,16 +247,6 @@
static BOOL GetModuleInformation(HANDLE, HMODULE, LPMODULEINFO, DWORD);
static BOOL PSApiAvailable();
-
-#ifdef JDK6_OR_EARLIER
-private:
- static BOOL (WINAPI *_EnumProcessModules)(HANDLE, HMODULE *, DWORD, LPDWORD);
- static BOOL (WINAPI *_GetModuleFileNameEx)(HANDLE, HMODULE, LPTSTR, DWORD);;
- static BOOL (WINAPI *_GetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD);
- static BOOL initialized;
-
- static void initialize();
-#endif
};
#endif // OS_WINDOWS_VM_OS_WINDOWS_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os/windows/vm/sharedRuntimeRem.cpp Thu Dec 10 21:31:56 2015 +0000
@@ -0,0 +1,162 @@
+/*
+* Copyright (c) 2015, 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
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*
+*/
+
+#include "precompiled.hpp"
+
+#ifdef _WIN64
+// These are copied defines from fdlibm.h, this allows us to keep the code
+// the same as in the JDK, for easier maintenance.
+
+#define __HI(x) *(1+(int*)&x)
+#define __LO(x) *(int*)&x
+
+// This code is a copy of __ieee754_fmod() from the JDK's libfdlibm and is
+// used as a workaround for issues with the Windows x64 CRT implementation
+// of fmod. Microsoft has acknowledged that this is an issue in Visual Studio
+// 2012 and forward, but has not provided a time frame for a fix other than that
+// it'll not be fixed in Visual Studio 2013 or 2015.
+
+static const double one = 1.0, Zero[] = { 0.0, -0.0, };
+
+double SharedRuntime::fmod_winx64(double x, double y)
+{
+ int n, hx, hy, hz, ix, iy, sx, i;
+ unsigned lx, ly, lz;
+
+ hx = __HI(x); /* high word of x */
+ lx = __LO(x); /* low word of x */
+ hy = __HI(y); /* high word of y */
+ ly = __LO(y); /* low word of y */
+ sx = hx & 0x80000000; /* sign of x */
+ hx ^= sx; /* |x| */
+ hy &= 0x7fffffff; /* |y| */
+
+#pragma warning( disable : 4146 )
+ /* purge off exception values */
+ if ((hy | ly) == 0 || (hx >= 0x7ff00000) || /* y=0,or x not finite */
+ ((hy | ((ly | -ly) >> 31))>0x7ff00000)) /* or y is NaN */
+#pragma warning( default : 4146 )
+ return (x*y) / (x*y);
+ if (hx <= hy) {
+ if ((hx<hy) || (lx<ly)) return x; /* |x|<|y| return x */
+ if (lx == ly)
+ return Zero[(unsigned)sx >> 31]; /* |x|=|y| return x*0*/
+ }
+
+ /* determine ix = ilogb(x) */
+ if (hx<0x00100000) { /* subnormal x */
+ if (hx == 0) {
+ for (ix = -1043, i = lx; i>0; i <<= 1) ix -= 1;
+ }
+ else {
+ for (ix = -1022, i = (hx << 11); i>0; i <<= 1) ix -= 1;
+ }
+ }
+ else ix = (hx >> 20) - 1023;
+
+ /* determine iy = ilogb(y) */
+ if (hy<0x00100000) { /* subnormal y */
+ if (hy == 0) {
+ for (iy = -1043, i = ly; i>0; i <<= 1) iy -= 1;
+ }
+ else {
+ for (iy = -1022, i = (hy << 11); i>0; i <<= 1) iy -= 1;
+ }
+ }
+ else iy = (hy >> 20) - 1023;
+
+ /* set up {hx,lx}, {hy,ly} and align y to x */
+ if (ix >= -1022)
+ hx = 0x00100000 | (0x000fffff & hx);
+ else { /* subnormal x, shift x to normal */
+ n = -1022 - ix;
+ if (n <= 31) {
+ hx = (hx << n) | (lx >> (32 - n));
+ lx <<= n;
+ }
+ else {
+ hx = lx << (n - 32);
+ lx = 0;
+ }
+ }
+ if (iy >= -1022)
+ hy = 0x00100000 | (0x000fffff & hy);
+ else { /* subnormal y, shift y to normal */
+ n = -1022 - iy;
+ if (n <= 31) {
+ hy = (hy << n) | (ly >> (32 - n));
+ ly <<= n;
+ }
+ else {
+ hy = ly << (n - 32);
+ ly = 0;
+ }
+ }
+
+ /* fix point fmod */
+ n = ix - iy;
+ while (n--) {
+ hz = hx - hy; lz = lx - ly; if (lx<ly) hz -= 1;
+ if (hz<0){ hx = hx + hx + (lx >> 31); lx = lx + lx; }
+ else {
+ if ((hz | lz) == 0) /* return sign(x)*0 */
+ return Zero[(unsigned)sx >> 31];
+ hx = hz + hz + (lz >> 31); lx = lz + lz;
+ }
+ }
+ hz = hx - hy; lz = lx - ly; if (lx<ly) hz -= 1;
+ if (hz >= 0) { hx = hz; lx = lz; }
+
+ /* convert back to floating value and restore the sign */
+ if ((hx | lx) == 0) /* return sign(x)*0 */
+ return Zero[(unsigned)sx >> 31];
+ while (hx<0x00100000) { /* normalize x */
+ hx = hx + hx + (lx >> 31); lx = lx + lx;
+ iy -= 1;
+ }
+ if (iy >= -1022) { /* normalize output */
+ hx = ((hx - 0x00100000) | ((iy + 1023) << 20));
+ __HI(x) = hx | sx;
+ __LO(x) = lx;
+ }
+ else { /* subnormal output */
+ n = -1022 - iy;
+ if (n <= 20) {
+ lx = (lx >> n) | ((unsigned)hx << (32 - n));
+ hx >>= n;
+ }
+ else if (n <= 31) {
+ lx = (hx << (32 - n)) | (lx >> n); hx = sx;
+ }
+ else {
+ lx = hx >> (n - 32); hx = sx;
+ }
+ __HI(x) = hx | sx;
+ __LO(x) = lx;
+ x *= one; /* create necessary signal */
+ }
+ return x; /* exact output */
+}
+
+#endif
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Thu Dec 10 19:59:10 2015 +0000
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Thu Dec 10 21:31:56 2015 +0000
@@ -254,8 +254,10 @@
((ybits.i & float_sign_mask) == float_infinity) ) {
return x;
}
+ return ((jfloat)fmod_winx64((double)x, (double)y));
+#else
+ return ((jfloat)fmod((double)x,(double)y));
#endif
- return ((jfloat)fmod((double)x,(double)y));
JRT_END
@@ -269,8 +271,10 @@
((ybits.l & double_sign_mask) == double_infinity) ) {
return x;
}
+ return ((jdouble)fmod_winx64((double)x, (double)y));
+#else
+ return ((jdouble)fmod((double)x,(double)y));
#endif
- return ((jdouble)fmod((double)x,(double)y));
JRT_END
#ifdef __SOFTFP__
--- a/hotspot/src/share/vm/runtime/sharedRuntime.hpp Thu Dec 10 19:59:10 2015 +0000
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.hpp Thu Dec 10 21:31:56 2015 +0000
@@ -100,6 +100,12 @@
static jfloat frem(jfloat x, jfloat y);
static jdouble drem(jdouble x, jdouble y);
+
+#ifdef _WIN64
+ // Workaround for fmod issue in the Windows x64 CRT
+ static double fmod_winx64(double x, double y);
+#endif
+
#ifdef __SOFTFP__
static jfloat fadd(jfloat x, jfloat y);
static jfloat fsub(jfloat x, jfloat y);
--- a/hotspot/test/compiler/floatingpoint/ModNaN.java Thu Dec 10 19:59:10 2015 +0000
+++ b/hotspot/test/compiler/floatingpoint/ModNaN.java Thu Dec 10 21:31:56 2015 +0000
@@ -25,7 +25,6 @@
* @test
* @bug 8015396
* @summary double a%b returns NaN for some (a,b) (|a| < inf, |b|>0) (on Core i7 980X)
- * @ignore 8015396
* @run main ModNaN
*/
public class ModNaN {