*** old/src/cpu/x86/vm/assembler_x86.hpp	Wed Feb 15 11:46:28 2012
--- new/src/cpu/x86/vm/assembler_x86.hpp	Wed Feb 15 11:46:28 2012

*** 665,674 ****
--- 665,675 ----
  
    // Helper functions for groups of instructions
    void emit_arith_b(int op1, int op2, Register dst, int imm8);
  
    void emit_arith(int op1, int op2, Register dst, int32_t imm32);
+   void emit_arith_imm32(int op1, int op2, Register dst, int32_t imm32);
    // only 32bit??
    void emit_arith(int op1, int op2, Register dst, jobject obj);
    void emit_arith(int op1, int op2, Register dst, Register src);
  
    void emit_operand(Register reg,

*** 1524,1533 ****
--- 1525,1536 ----
    void subq(Address dst, Register src);
    void subq(Register dst, int32_t imm32);
    void subq(Register dst, Address src);
    void subq(Register dst, Register src);
  
+   void subl_imm32(Register dst, int32_t imm32);
+   void subq_imm32(Register dst, int32_t imm32);
  
    // Subtract Scalar Double-Precision Floating-Point Values
    void subsd(XMMRegister dst, Address src);
    void subsd(XMMRegister dst, XMMRegister src);
  

*** 1761,1772 ****
--- 1764,1775 ----
    void incrementl(ArrayAddress dst);
  
    // Alignment
    void align(int modulus);
  
    // Misc
-   void fat_nop(); // 5 byte nop
+   // A 5 byte nop that is safe for patching (see patch_verified_entry)
  
    // Stack frame creation/removal
    void enter();
    void leave();
  

*** 2273,2282 ****
--- 2276,2286 ----
  
    void subptr(Address dst, int32_t src) { LP64_ONLY(subq(dst, src)) NOT_LP64(subl(dst, src)); }
  
    void subptr(Register dst, Address src) { LP64_ONLY(subq(dst, src)) NOT_LP64(subl(dst, src)); }
    void subptr(Register dst, int32_t src);
+   void subptr_imm32(Register dst, int32_t src);
    void subptr(Register dst, Register src);
    void subptr(Register dst, RegisterOrConstant src) {
      if (src.is_constant()) subptr(dst, (int) src.as_constant());
      else                   subptr(dst,       src.as_register());
    }

*** 2564,2573 ****
--- 2568,2580 ----
  
    // sign extend as need a l to ptr sized element
    void movl2ptr(Register dst, Address src) { LP64_ONLY(movslq(dst, src)) NOT_LP64(movl(dst, src)); }
    void movl2ptr(Register dst, Register src) { LP64_ONLY(movslq(dst, src)) NOT_LP64(if (dst != src) movl(dst, src)); }
  
+   // C2 compiled method's prolog code.
+   void verified_entry(int framesize, bool stack_bang, bool fp_mode_24b);
+ 
    // IndexOf strings.
    // Small strings are loaded through stack if they cross page boundary.
    void string_indexof(Register str1, Register str2,
                        Register cnt1, Register cnt2,
                        int int_cnt2,  Register result,