1.1 --- a/src/cpu/mips/vm/c1_FrameMap_mips.hpp Fri Sep 01 10:28:22 2017 +0800 1.2 +++ b/src/cpu/mips/vm/c1_FrameMap_mips.hpp Thu Sep 07 09:12:16 2017 +0800 1.3 @@ -32,15 +32,14 @@ 1.4 // | size_arguments | 2 words | size_locals-size_arguments | _size_monitors | spilling . 1.5 // +----------------+---------+----------------------------+----------------+----------- 1.6 // 1.7 -//12/21, 06, jerome 1.8 -private: 1.9 - 1.10 + private: 1.11 + 1.12 //static FloatRegister _fpu_regs [nof_fpu_regs]; 1.13 static FloatRegister _fpu_regs [32]; 1.14 - 1.15 + 1.16 WordSize fp_offset_for_slot (int slot) const; 1.17 int local_to_slot (int local_name, bool is_two_word) const; 1.18 - // NOTE : name consist of argument, local, spill, they are not continuous 1.19 + // NOTE : name consist of argument, local, spill, they are not continuous 1.20 WordSize fp_offset_for_name (int name, bool is_two_word, bool for_hi_word) const; 1.21 WordSize fp_offset_for_monitor_lock (int monitor_index) const; 1.22 WordSize fp_offset_for_monitor_object(int monitor_index) const; 1.23 @@ -53,10 +52,10 @@ 1.24 public: 1.25 static const int pd_c_runtime_reserved_arg_size; 1.26 enum { 1.27 - nof_reg_args = 5, // registers t0,a0-a3 are available for parameter passing 1.28 - first_available_sp_in_frame = 0, 1.29 - //frame_pad_in_bytes = 8 1.30 - frame_pad_in_bytes = 2 * sizeof(intptr_t) 1.31 + nof_reg_args = 5, // registers t0,a0-a3 are available for parameter passing 1.32 + first_available_sp_in_frame = 0, 1.33 + //frame_pad_in_bytes = 8 1.34 + frame_pad_in_bytes = 2 * sizeof(intptr_t) 1.35 }; 1.36 1.37 static LIR_Opr _zero_opr; 1.38 @@ -98,7 +97,7 @@ 1.39 static LIR_Opr _ra_opr; 1.40 static LIR_Opr _k0_opr; 1.41 static LIR_Opr _k1_opr; 1.42 - 1.43 + 1.44 static LIR_Opr _f0_opr; 1.45 static LIR_Opr _f12_opr; 1.46 static LIR_Opr _f14_opr; 1.47 @@ -109,8 +108,8 @@ 1.48 static LIR_Opr _a0_a1_opr; 1.49 static LIR_Opr _a2_a3_opr; 1.50 static LIR_Opr _v0_v1_opr; 1.51 - 1.52 - 1.53 + 1.54 + 1.55 static LIR_Opr receiver_opr; 1.56 static LIR_Opr _zero_oop_opr; 1.57 static LIR_Opr _at_oop_opr; 1.58 @@ -151,7 +150,7 @@ 1.59 static LIR_Opr _ra_oop_opr; 1.60 static LIR_Opr _k0_oop_opr; 1.61 static LIR_Opr _k1_oop_opr; 1.62 - 1.63 + 1.64 static LIR_Opr _f0_oop_opr; 1.65 static LIR_Opr _f12_oop_opr; 1.66 static LIR_Opr _f14_oop_opr; 1.67 @@ -163,7 +162,7 @@ 1.68 static LIR_Opr _a2_a3_oop_opr; 1.69 static LIR_Opr _v0_v1_oop_opr; 1.70 1.71 -//FIXME, needed under 64-bit? by aoqi 1.72 +//FIXME, needed under 64-bit? by aoqi 1.73 static LIR_Opr _a0_a1_long_opr; 1.74 static LIR_Opr _a2_a3_long_opr; 1.75 static LIR_Opr _v0_v1_long_opr; 1.76 @@ -176,11 +175,11 @@ 1.77 1.78 1.79 static LIR_Opr as_long_opr(Register r, Register r2){ 1.80 - return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r2)); 1.81 -} 1.82 + return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r2)); 1.83 +} 1.84 1.85 static LIR_Opr as_float_opr(FloatRegister r) { 1.86 - return LIR_OprFact::single_fpu(r->encoding()); 1.87 + return LIR_OprFact::single_fpu(r->encoding()); 1.88 } 1.89 1.90 1.91 @@ -199,7 +198,7 @@ 1.92 if (UseCompressedOops || UseCompressedClassPointers) return range - 1; 1.93 return range; 1.94 } 1.95 - 1.96 + 1.97 static int nof_caller_save_cpu_regs() { return adjust_reg_range(pd_nof_caller_save_cpu_regs_frame_map); } 1.98 static int last_cpu_reg() { return adjust_reg_range(pd_last_cpu_reg); } 1.99 //static int last_byte_reg() { return adjust_reg_range(pd_last_byte_reg); }