comparison src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 2181:d25d4ca69222

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Wed, 16 Feb 2011 13:47:20 +0100
parents 9508a52cbd32 3582bf76420e
children 2ab52cda08e5
comparison
equal deleted inserted replaced
2108:50b45e2d9725 2181:d25d4ca69222
1978 for ( ; !ss.at_return_type(); ss.next()) { 1978 for ( ; !ss.at_return_type(); ss.next()) {
1979 BasicType bt = ss.type(); 1979 BasicType bt = ss.type();
1980 in_sig_bt[i++] = bt; // Collect remaining bits of signature 1980 in_sig_bt[i++] = bt; // Collect remaining bits of signature
1981 out_sig_bt[total_c_args++] = bt; 1981 out_sig_bt[total_c_args++] = bt;
1982 if( bt == T_OBJECT) { 1982 if( bt == T_OBJECT) {
1983 symbolOop s = ss.as_symbol_or_null(); 1983 Symbol* s = ss.as_symbol_or_null(); // symbol is created
1984 if (s == vmSymbols::java_lang_String()) { 1984 if (s == vmSymbols::java_lang_String()) {
1985 total_strings++; 1985 total_strings++;
1986 out_sig_bt[total_c_args-1] = T_ADDRESS; 1986 out_sig_bt[total_c_args-1] = T_ADDRESS;
1987 } else if (s == vmSymbols::java_lang_Boolean() || 1987 } else if (s == vmSymbols::java_lang_Boolean() ||
1988 s == vmSymbols::java_lang_Character() || 1988 s == vmSymbols::java_lang_Character() ||