1.1 --- a/src/share/vm/c1/c1_LIRGenerator.hpp Wed Jul 28 17:57:43 2010 -0400
1.2 +++ b/src/share/vm/c1/c1_LIRGenerator.hpp Tue Aug 03 08:13:38 2010 -0400
1.3 @@ -314,7 +314,7 @@
1.4 void logic_op (Bytecodes::Code code, LIR_Opr dst_reg, LIR_Opr left, LIR_Opr right);
1.5
1.6 void monitor_enter (LIR_Opr object, LIR_Opr lock, LIR_Opr hdr, LIR_Opr scratch, int monitor_no, CodeEmitInfo* info_for_exception, CodeEmitInfo* info);
1.7 - void monitor_exit (LIR_Opr object, LIR_Opr lock, LIR_Opr hdr, int monitor_no);
1.8 + void monitor_exit (LIR_Opr object, LIR_Opr lock, LIR_Opr hdr, LIR_Opr scratch, int monitor_no);
1.9
1.10 void new_instance (LIR_Opr dst, ciInstanceKlass* klass, LIR_Opr scratch1, LIR_Opr scratch2, LIR_Opr scratch3, LIR_Opr scratch4, LIR_Opr klass_reg, CodeEmitInfo* info);
1.11
1.12 @@ -338,6 +338,9 @@
1.13 }
1.14 LIR_Address* emit_array_address(LIR_Opr array_opr, LIR_Opr index_opr, BasicType type, bool needs_card_mark);
1.15
1.16 + // the helper for generate_address
1.17 + void add_large_constant(LIR_Opr src, int c, LIR_Opr dest);
1.18 +
1.19 // machine preferences and characteristics
1.20 bool can_inline_as_constant(Value i) const;
1.21 bool can_inline_as_constant(LIR_Const* c) const;
1.22 @@ -393,6 +396,10 @@
1.23 return l;
1.24 }
1.25
1.26 +#ifdef __SOFTFP__
1.27 + void do_soft_float_compare(If *x);
1.28 +#endif // __SOFTFP__
1.29 +
1.30 void init();
1.31
1.32 SwitchRangeArray* create_lookup_ranges(TableSwitch* x);
1.33 @@ -444,6 +451,7 @@
1.34 static LIR_Opr remOutOpr();
1.35 static LIR_Opr shiftCountOpr();
1.36 LIR_Opr syncTempOpr();
1.37 + LIR_Opr atomicLockOpr();
1.38
1.39 // returns a register suitable for saving the thread in a
1.40 // call_runtime_leaf if one is needed.
