archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Staffan Larsen 2012-06-11 10:28:02 +02:00
commit a928a2df96
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hotspot/src/os/windows/vm/os_windows.cpp
View file

@ -1591,7 +1591,8 @@ void os::win32::print_windows_version(outputStream* st) {
case 5001: st->print(" Windows XP"); break; case 5001: st->print(" Windows XP"); break;
case 5002: case 5002:
case 6000: case 6000:
case 6001: { case 6001:
case 6002: {
// Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
// find out whether we are running on 64 bit processor or not. // find out whether we are running on 64 bit processor or not.
SYSTEM_INFO si; SYSTEM_INFO si;
@ -1623,6 +1624,14 @@ void os::win32::print_windows_version(outputStream* st) {
} }
if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
st->print(" , 64 bit"); st->print(" , 64 bit");
} else if (os_vers == 6002) {
if (osvi.wProductType == VER_NT_WORKSTATION) {
st->print(" Windows 8");
} else {
st->print(" Windows Server 2012");
}
if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
st->print(" , 64 bit");
} else { // future os } else { // future os
// Unrecognized windows, print out its major and minor versions // Unrecognized windows, print out its major and minor versions
st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion); st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);

6
hotspot/src/share/vm/prims/jni.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -378,6 +378,7 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR
jclass cls = NULL; jclass cls = NULL;
DT_RETURN_MARK(DefineClass, jclass, (const jclass&)cls); DT_RETURN_MARK(DefineClass, jclass, (const jclass&)cls);
TempNewSymbol class_name = NULL;
// Since exceptions can be thrown, class initialization can take place // Since exceptions can be thrown, class initialization can take place
// if name is NULL no check for class name in .class stream has to be made. // if name is NULL no check for class name in .class stream has to be made.
if (name != NULL) { if (name != NULL) {
@ -387,9 +388,8 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR
// into the constant pool. // into the constant pool.
THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name); THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name);
} }
class_name = SymbolTable::new_symbol(name, CHECK_NULL);
} }
TempNewSymbol class_name = SymbolTable::new_symbol(name, THREAD);
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
ClassFileStream st((u1*) buf, bufLen, NULL); ClassFileStream st((u1*) buf, bufLen, NULL);
Handle class_loader (THREAD, JNIHandles::resolve(loaderRef)); Handle class_loader (THREAD, JNIHandles::resolve(loaderRef));

6
hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
View file

@ -220,9 +220,15 @@ inline int vsnprintf(char* buf, size_t count, const char* fmt, va_list argptr) {
#define PRIu64 "I64u" #define PRIu64 "I64u"
#define PRIx64 "I64x" #define PRIx64 "I64x"
#ifdef _LP64
#define PRIdPTR "I64d"
#define PRIuPTR "I64u"
#define PRIxPTR "I64x"
#else
#define PRIdPTR "d" #define PRIdPTR "d"
#define PRIuPTR "u" #define PRIuPTR "u"
#define PRIxPTR "x" #define PRIxPTR "x"
#endif
#define offset_of(klass,field) offsetof(klass,field) #define offset_of(klass,field) offsetof(klass,field)