Mercurial > hg > truffle

comparison src/share/vm/c1/c1_Runtime1.cpp @ 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 921005bb0b45
children 2a0c9f20baa1
comparison
equal deleted inserted replaced
6512:edea9ba7ac7b 6515:e722fa145b37
753 } 753 }
754 #endif 754 #endif
755 JRT_END 755 JRT_END
756 756
757 JRT_ENTRY(void, Runtime1::graal_log_object(JavaThread* thread, oop obj, jint flags)) 757 JRT_ENTRY(void, Runtime1::graal_log_object(JavaThread* thread, oop obj, jint flags))
758 bool string = flags & LOG_OBJECT_STRING; 758 bool string = mask_bits_are_true(flags, LOG_OBJECT_STRING);
759 bool address = flags & LOG_OBJECT_ADDRESS; 759 bool address = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS);
760 bool newline = flags & LOG_OBJECT_NEWLINE; 760 bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE);
761 if (!string) { 761 if (!string) {
762 if (!address && obj->is_oop_or_null(true)) { 762 if (!address && obj->is_oop_or_null(true)) {
763 char buf[O_BUFLEN]; 763 char buf[O_BUFLEN];
764 tty->print("%s@%p", obj->klass()->klass_part()->name()->as_C_string(buf, O_BUFLEN), obj); 764 tty->print("%s@%p", obj->klass()->klass_part()->name()->as_C_string(buf, O_BUFLEN), obj);
765 } else { 765 } else {
781 assert(where == NULL || java_lang_String::is_instance(where), "must be"); 781 assert(where == NULL || java_lang_String::is_instance(where), "must be");
782 const char *error_msg = where == NULL ? "<internal Graal error>" : java_lang_String::as_utf8_string(where); 782 const char *error_msg = where == NULL ? "<internal Graal error>" : java_lang_String::as_utf8_string(where);
783 char *detail_msg = NULL; 783 char *detail_msg = NULL;
784 if (format != NULL) { 784 if (format != NULL) {
785 const char* buf = java_lang_String::as_utf8_string(format); 785 const char* buf = java_lang_String::as_utf8_string(format);
786 int detail_msg_length = strlen(buf) * 2; 786 size_t detail_msg_length = strlen(buf) * 2;
787 detail_msg = (char *) NEW_RESOURCE_ARRAY(u_char, detail_msg_length); 787 detail_msg = (char *) NEW_RESOURCE_ARRAY(u_char, detail_msg_length);
788 jio_snprintf(detail_msg, detail_msg_length, buf, value); 788 jio_snprintf(detail_msg, detail_msg_length, buf, value);
789 } 789 }
790 report_vm_error(__FILE__, __LINE__, error_msg, detail_msg); 790 report_vm_error(__FILE__, __LINE__, error_msg, detail_msg);
791 JRT_END 791 JRT_END