Mercurial > hg > graal-jvmci-8

comparison src/os/windows/vm/os_windows.cpp @ 962:aafa4232dfd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6821003: Update hotspot windows os_win32 for windows 7 Reviewed-by: xlu
author asaha
date Fri, 28 Aug 2009 08:54:28 -0700
parents 8c79517a9300
children 167c2986d91b
comparison
equal deleted inserted replaced
920:a774e1abbe85 962:aafa4232dfd7
1524 case 3051: st->print(" Windows NT 3.51"); break; 1524 case 3051: st->print(" Windows NT 3.51"); break;
1525 case 4000: st->print(" Windows NT 4.0"); break; 1525 case 4000: st->print(" Windows NT 4.0"); break;
1526 case 5000: st->print(" Windows 2000"); break; 1526 case 5000: st->print(" Windows 2000"); break;
1527 case 5001: st->print(" Windows XP"); break; 1527 case 5001: st->print(" Windows XP"); break;
1528 case 5002: 1528 case 5002:
1529 case 6000: { 1529 case 6000:
1530 case 6001: {
1530 // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could 1531 // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
1531 // find out whether we are running on 64 bit processor or not. 1532 // find out whether we are running on 64 bit processor or not.
1532 SYSTEM_INFO si; 1533 SYSTEM_INFO si;
1533 ZeroMemory(&si, sizeof(SYSTEM_INFO)); 1534 ZeroMemory(&si, sizeof(SYSTEM_INFO));
1534 // Check to see if _GetNativeSystemInfo has been initialized. 1535 // Check to see if _GetNativeSystemInfo has been initialized.
1547 if (osvi.wProductType == VER_NT_WORKSTATION && 1548 if (osvi.wProductType == VER_NT_WORKSTATION &&
1548 si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) 1549 si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
1549 st->print(" Windows XP x64 Edition"); 1550 st->print(" Windows XP x64 Edition");
1550 else 1551 else
1551 st->print(" Windows Server 2003 family"); 1552 st->print(" Windows Server 2003 family");
1552 } else { // os_vers == 6000 1553 } else if (os_vers == 6000) {
1553 if (osvi.wProductType == VER_NT_WORKSTATION) 1554 if (osvi.wProductType == VER_NT_WORKSTATION)
1554 st->print(" Windows Vista"); 1555 st->print(" Windows Vista");
1555 else 1556 else
1556 st->print(" Windows Server 2008"); 1557 st->print(" Windows Server 2008");
1558 if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
1559 st->print(" , 64 bit");
1560 } else if (os_vers == 6001) {
1561 if (osvi.wProductType == VER_NT_WORKSTATION) {
1562 st->print(" Windows 7");
1563 } else {
1564 // Unrecognized windows, print out its major and minor versions
1565 st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
1566 }
1567 if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
1568 st->print(" , 64 bit");
1569 } else { // future os
1570 // Unrecognized windows, print out its major and minor versions
1571 st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
1557 if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) 1572 if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
1558 st->print(" , 64 bit"); 1573 st->print(" , 64 bit");
1559 } 1574 }
1560 break; 1575 break;
1561 } 1576 }