*** old/src/share/vm/c1/c1_FrameMap.hpp	Thu Nov 25 07:06:03 2010
--- new/src/share/vm/c1/c1_FrameMap.hpp	Thu Nov 25 07:06:03 2010

*** 74,84 ****
--- 74,84 ----
      nof_fpu_regs = pd_nof_fpu_regs_frame_map,
  
      nof_cpu_regs_reg_alloc = pd_nof_cpu_regs_reg_alloc,
      nof_fpu_regs_reg_alloc = pd_nof_fpu_regs_reg_alloc,
  
!     max_nof_caller_save_cpu_regs = pd_nof_caller_save_cpu_regs_frame_map,
      nof_caller_save_fpu_regs     = pd_nof_caller_save_fpu_regs_frame_map,
  
      spill_slot_size_in_bytes = 4
    };
  

*** 95,105 ****
--- 95,105 ----
   private:
    static bool         _init_done;
    static Register     _cpu_rnr2reg [nof_cpu_regs];
    static int          _cpu_reg2rnr [nof_cpu_regs];
  
!   static LIR_Opr      _caller_save_cpu_regs [max_nof_caller_save_cpu_regs];
    static LIR_Opr      _caller_save_fpu_regs [nof_caller_save_fpu_regs];
  
    int                 _framesize;
    int                 _argcount;
    int                 _num_monitors;

*** 241,251 ****
--- 241,251 ----
      return sp_offset2vmreg(sp_offset_for_monitor_object(monitor_index));
    }
    VMReg regname(LIR_Opr opr) const;
  
    static LIR_Opr caller_save_cpu_reg_at(int i) {
!     assert(i >= 0 && i < max_nof_caller_save_cpu_regs, "out of bounds");
      return _caller_save_cpu_regs[i];
    }
  
    static LIR_Opr caller_save_fpu_reg_at(int i) {
      assert(i >= 0 && i < nof_caller_save_fpu_regs, "out of bounds");