Mercurial > hg > truffle

comparison src/share/vm/jvmci/jvmciRuntime.cpp @ 21587:59c3f921e454

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for windows build (size_t conversion, missing precompiled.hpp, missing strtof, strtoll in Windows SDK)
author Christian Wirth <christian.wirth@oracle.com>
date Fri, 29 May 2015 12:59:12 +0200
parents 2270a708ef23
children 7a7cf422160b
comparison
equal deleted inserted replaced
21584:9bb04af58490 21587:59c3f921e454
37 #include "runtime/arguments.hpp" 37 #include "runtime/arguments.hpp"
38 #include "runtime/reflection.hpp" 38 #include "runtime/reflection.hpp"
39 #include "utilities/debug.hpp" 39 #include "utilities/debug.hpp"
40 #include "utilities/defaultStream.hpp" 40 #include "utilities/defaultStream.hpp"
41 41
42 jobject JVMCIRuntime::_HotSpotJVMCIRuntime_instance = NULL; 42 #if defined(_MSC_VER)
43 #define strtoll _strtoi64
44 #endif
45
46 jobject JVMCIRuntime::_HotSpotJVMCIRuntime_instance = NULL;
43 bool JVMCIRuntime::_HotSpotJVMCIRuntime_initialized = false; 47 bool JVMCIRuntime::_HotSpotJVMCIRuntime_initialized = false;
44 bool JVMCIRuntime::_shutdown_called = false; 48 bool JVMCIRuntime::_shutdown_called = false;
45 49
46 void JVMCIRuntime::initialize_natives(JNIEnv *env, jclass c2vmClass) { 50 void JVMCIRuntime::initialize_natives(JNIEnv *env, jclass c2vmClass) {
47 uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end(); 51 uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end();
852 } 856 }
853 optionValue.long_value = long_value; 857 optionValue.long_value = long_value;
854 break; 858 break;
855 } 859 }
856 case _float: { 860 case _float: {
857 optionValue.float_value = ::strtof(value, &check); 861 optionValue.float_value = (float)::strtod(value, &check); //strtof not available in Windows SDK yet
858 if (*check != '\0' || errno == ERANGE) { 862 if (*check != '\0' || errno == ERANGE) {
859 jio_fprintf(defaultStream::error_stream(), "Expected float value for VM option '%s'\n", name); 863 jio_fprintf(defaultStream::error_stream(), "Expected float value for VM option '%s'\n", name);
860 return false; 864 return false;
861 } 865 }
862 break; 866 break;