Mercurial > hg > truffle

changeset 6515:e722fa145b37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed VS2010 warnings in HotSpot.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 05 Oct 2012 10:13:19 +0200
parents edea9ba7ac7b
children 174805dea3fc
files src/share/vm/c1/c1_Runtime1.cpp src/share/vm/graal/graalCodeInstaller.cpp
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Runtime1.cpp	Fri Oct 05 09:48:01 2012 +0200
+++ b/src/share/vm/c1/c1_Runtime1.cpp	Fri Oct 05 10:13:19 2012 +0200
@@ -755,9 +755,9 @@
 JRT_END
 
 JRT_ENTRY(void, Runtime1::graal_log_object(JavaThread* thread, oop obj, jint flags))
-  bool string = flags & LOG_OBJECT_STRING;
-  bool address = flags & LOG_OBJECT_ADDRESS;
-  bool newline = flags & LOG_OBJECT_NEWLINE;
+  bool string =  mask_bits_are_true(flags, LOG_OBJECT_STRING);
+  bool address = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS);
+  bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE);
   if (!string) {
     if (!address && obj->is_oop_or_null(true)) {
       char buf[O_BUFLEN];
@@ -783,7 +783,7 @@
   char *detail_msg = NULL;
   if (format != NULL) {
     const char* buf = java_lang_String::as_utf8_string(format);
-    int detail_msg_length = strlen(buf) * 2;
+    size_t detail_msg_length = strlen(buf) * 2;
     detail_msg = (char *) NEW_RESOURCE_ARRAY(u_char, detail_msg_length);
     jio_snprintf(detail_msg, detail_msg_length, buf, value);
   }
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Fri Oct 05 09:48:01 2012 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Fri Oct 05 10:13:19 2012 +0200
@@ -454,7 +454,7 @@
     Bytecodes::Code code = Bytecodes::java_code_at(method, method->bcp_from(bci));
     reexecute = Interpreter::bytecode_should_reexecute(code);
     if (frame != NULL) {
-      reexecute = (BytecodeFrame::duringCall(frame) == 0);
+      reexecute = (BytecodeFrame::duringCall(frame) == JNI_FALSE);
     }
   }
 
@@ -510,7 +510,7 @@
   DebugToken* expressions_token = _debug_recorder->create_scope_values(expressions);
   DebugToken* monitors_token = _debug_recorder->create_monitor_values(monitors);
 
-  bool throw_exception = BytecodeFrame::rethrowException(frame);
+  bool throw_exception = BytecodeFrame::rethrowException(frame) == JNI_TRUE;
 
   _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, false, locals_token, expressions_token, monitors_token);
 }