Mercurial > hg > truffle

diff src/share/vm/c1/c1_LIRAssembler.hpp @ 1330:4a9cc99938e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author acorn
date Fri, 26 Mar 2010 11:10:26 -0400
parents fc2c71045ada
children 9f5b60a14736
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRAssembler.hpp	Thu Mar 25 16:54:59 2010 -0700
+++ b/src/share/vm/c1/c1_LIRAssembler.hpp	Fri Mar 26 11:10:26 2010 -0400
@@ -82,7 +82,7 @@
   Address as_Address_hi(LIR_Address* addr);
 
   // debug information
-  void add_call_info(int pc_offset, CodeEmitInfo* cinfo);
+  void add_call_info(int pc_offset, CodeEmitInfo* cinfo, bool is_method_handle_invoke = false);
   void add_debug_info_for_branch(CodeEmitInfo* info);
   void add_debug_info_for_div0(int pc_offset, CodeEmitInfo* cinfo);
   void add_debug_info_for_div0_here(CodeEmitInfo* info);
@@ -205,9 +205,13 @@
   void comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr result, LIR_Op2* op);
   void cmove(LIR_Condition code, LIR_Opr left, LIR_Opr right, LIR_Opr result);
 
-  void ic_call(address destination, CodeEmitInfo* info);
-  void vtable_call(int vtable_offset, CodeEmitInfo* info);
-  void call(address entry, relocInfo::relocType rtype, CodeEmitInfo* info);
+  void call(        LIR_OpJavaCall* op, relocInfo::relocType rtype);
+  void ic_call(     LIR_OpJavaCall* op);
+  void vtable_call( LIR_OpJavaCall* op);
+
+  // JSR 292
+  void preserve_SP(LIR_OpJavaCall* op);
+  void restore_SP( LIR_OpJavaCall* op);
 
   void osr_entry();