Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/sharedRuntime.cpp @ 14392:b5c8a61d7fa0
Merge
author | kvn |
---|---|
date | Fri, 21 Jun 2013 15:56:24 -0700 |
parents | 0f03ff49c720 28e5aed7f3a6 |
children | f4f6ae481e1a |
comparison
equal
deleted
inserted
replaced
14391:d2907f74462e | 14392:b5c8a61d7fa0 |
---|---|
2724 // Return argument 0 register. In the LP64 build pointers | 2724 // Return argument 0 register. In the LP64 build pointers |
2725 // take 2 registers, but the VM wants only the 'main' name. | 2725 // take 2 registers, but the VM wants only the 'main' name. |
2726 return regs.first(); | 2726 return regs.first(); |
2727 } | 2727 } |
2728 | 2728 |
2729 VMRegPair *SharedRuntime::find_callee_arguments(Symbol* sig, bool has_receiver, int* arg_size) { | 2729 VMRegPair *SharedRuntime::find_callee_arguments(Symbol* sig, bool has_receiver, bool has_appendix, int* arg_size) { |
2730 // This method is returning a data structure allocating as a | 2730 // This method is returning a data structure allocating as a |
2731 // ResourceObject, so do not put any ResourceMarks in here. | 2731 // ResourceObject, so do not put any ResourceMarks in here. |
2732 char *s = sig->as_C_string(); | 2732 char *s = sig->as_C_string(); |
2733 int len = (int)strlen(s); | 2733 int len = (int)strlen(s); |
2734 *s++; len--; // Skip opening paren | 2734 *s++; len--; // Skip opening paren |
2768 break; | 2768 break; |
2769 } | 2769 } |
2770 default : ShouldNotReachHere(); | 2770 default : ShouldNotReachHere(); |
2771 } | 2771 } |
2772 } | 2772 } |
2773 | |
2774 if (has_appendix) { | |
2775 sig_bt[cnt++] = T_OBJECT; | |
2776 } | |
2777 | |
2773 assert( cnt < 256, "grow table size" ); | 2778 assert( cnt < 256, "grow table size" ); |
2774 | 2779 |
2775 int comp_args_on_stack; | 2780 int comp_args_on_stack; |
2776 comp_args_on_stack = java_calling_convention(sig_bt, regs, cnt, true); | 2781 comp_args_on_stack = java_calling_convention(sig_bt, regs, cnt, true); |
2777 | 2782 |