comparison src/share/vm/runtime/sharedRuntime.cpp @ 2211:0cd39a385a72

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
date Mon, 21 Feb 2011 19:17:33 +0100
parents d25d4ca69222 b92c45f2bc75
children 0654ee04b214
comparison
equal deleted inserted replaced
2184:5d801e6b9a80 2211:0cd39a385a72
65 # include "vmreg_sparc.inline.hpp" 65 # include "vmreg_sparc.inline.hpp"
66 #endif 66 #endif
67 #ifdef TARGET_ARCH_zero 67 #ifdef TARGET_ARCH_zero
68 # include "nativeInst_zero.hpp" 68 # include "nativeInst_zero.hpp"
69 # include "vmreg_zero.inline.hpp" 69 # include "vmreg_zero.inline.hpp"
70 #endif
71 #ifdef TARGET_ARCH_arm
72 # include "nativeInst_arm.hpp"
73 # include "vmreg_arm.inline.hpp"
74 #endif
75 #ifdef TARGET_ARCH_ppc
76 # include "nativeInst_ppc.hpp"
77 # include "vmreg_ppc.inline.hpp"
70 #endif 78 #endif
71 #ifdef COMPILER1 79 #ifdef COMPILER1
72 #include "c1/c1_Runtime1.hpp" 80 #include "c1/c1_Runtime1.hpp"
73 #endif 81 #endif
74 82
2628 typeArrayOop jlsValue = java_lang_String::value(src); 2636 typeArrayOop jlsValue = java_lang_String::value(src);
2629 int jlsOffset = java_lang_String::offset(src); 2637 int jlsOffset = java_lang_String::offset(src);
2630 int jlsLen = java_lang_String::length(src); 2638 int jlsLen = java_lang_String::length(src);
2631 jchar* jlsPos = (jlsLen == 0) ? NULL : 2639 jchar* jlsPos = (jlsLen == 0) ? NULL :
2632 jlsValue->char_at_addr(jlsOffset); 2640 jlsValue->char_at_addr(jlsOffset);
2641 assert(typeArrayKlass::cast(jlsValue->klass())->element_type() == T_CHAR, "compressed string");
2633 (void) UNICODE::as_utf8(jlsPos, jlsLen, (char *)dst, max_dtrace_string_size); 2642 (void) UNICODE::as_utf8(jlsPos, jlsLen, (char *)dst, max_dtrace_string_size);
2634 } 2643 }
2635 #endif // ndef HAVE_DTRACE_H 2644 #endif // ndef HAVE_DTRACE_H
2636 2645
2637 // ------------------------------------------------------------------------- 2646 // -------------------------------------------------------------------------