*** old/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java	Tue Mar 10 15:40:39 2015
--- new/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java	Tue Mar 10 15:40:39 2015

*** 61,73 ****
--- 61,70 ----
    private static       int INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET;
  
    // Entry frames
    private static       int ENTRY_FRAME_CALL_WRAPPER_OFFSET;
  
    // Native frames
    private static final int NATIVE_FRAME_INITIAL_PARAM_OFFSET =  2;
  
    private static VMReg rbp;
  
    static {
      VM.registerVMInitializedObserver(new Observer() {
          public void update(Observable o, Object data) {

*** 421,444 ****
--- 418,433 ----
  
    public Address getLink() {
      return addressOfStackSlot(LINK_OFFSET).getAddressAt(0);
    }
  
    // FIXME: not implementable yet
    //inline void      frame::set_link(intptr_t* addr)  { *(intptr_t **)addr_at(link_offset) = addr; }
  
    public Address getUnextendedSP() { return raw_unextendedSP; }
  
    // Return address:
    public Address getSenderPCAddr() { return addressOfStackSlot(RETURN_ADDR_OFFSET); }
    public Address getSenderPC()     { return getSenderPCAddr().getAddressAt(0);      }
  
    // return address of param, zero origin index.
    public Address getNativeParamAddr(int idx) {
      return addressOfStackSlot(NATIVE_FRAME_INITIAL_PARAM_OFFSET + idx);
    }
  
    public Address getSenderSP()     { return addressOfStackSlot(SENDER_SP_OFFSET); }
  
    public Address addressOfInterpreterFrameLocals() {
      return addressOfStackSlot(INTERPRETER_FRAME_LOCALS_OFFSET);
    }