*** old/src/cpu/x86/vm/x86_32.ad	Tue Jul 26 19:26:39 2011
--- new/src/cpu/x86/vm/x86_32.ad	Tue Jul 26 19:26:38 2011

*** 4494,4504 ****
--- 4494,4503 ----
  op_attrib op_cost(0);        // Required cost attribute
  
  //----------Instruction Attributes---------------------------------------------
  ins_attrib ins_cost(100);       // Required cost attribute
  ins_attrib ins_size(8);         // Required size attribute (in bits)
  ins_attrib ins_pc_relative(0);  // Required PC Relative flag
  ins_attrib ins_short_branch(0); // Required flag: is this instruction a
                                  // non-matching short branch variant of some
                                                              // long branch?
  ins_attrib ins_alignment(1);    // Required alignment attribute (must be a power of 2)
                                  // specifies the alignment that some part of the instruction (not

*** 13045,13055 ****
--- 13044,13053 ----
    ins_encode %{
      // Jump to Address(table_base + switch_reg)
      Address index(noreg, $switch_val$$Register, Address::times_1);
      __ jump(ArrayAddress($constantaddress, index));
    %}
    ins_pc_relative(1);
    ins_pipe(pipe_jmp);
  %}
  
  // Jump Direct - Label defines a relative address from JMP+1
  instruct jmpDir(label labl) %{

*** 13060,13070 ****
--- 13058,13067 ----
    format %{ "JMP    $labl" %}
    size(5);
    opcode(0xE9);
    ins_encode( OpcP, Lbl( labl ) );
    ins_pipe( pipe_jmp );
    ins_pc_relative(1);
  %}
  
  // Jump Direct Conditional - Label defines a relative address from Jcc+1
  instruct jmpCon(cmpOp cop, eFlagsReg cr, label labl) %{
    match(If cop cr);

*** 13074,13084 ****
--- 13071,13080 ----
    format %{ "J$cop    $labl" %}
    size(6);
    opcode(0x0F, 0x80);
    ins_encode( Jcc( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
  %}
  
  // Jump Direct Conditional - Label defines a relative address from Jcc+1
  instruct jmpLoopEnd(cmpOp cop, eFlagsReg cr, label labl) %{
    match(CountedLoopEnd cop cr);

*** 13088,13098 ****
--- 13084,13093 ----
    format %{ "J$cop    $labl\t# Loop end" %}
    size(6);
    opcode(0x0F, 0x80);
    ins_encode( Jcc( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
  %}
  
  // Jump Direct Conditional - Label defines a relative address from Jcc+1
  instruct jmpLoopEndU(cmpOpU cop, eFlagsRegU cmp, label labl) %{
    match(CountedLoopEnd cop cmp);

*** 13102,13112 ****
--- 13097,13106 ----
    format %{ "J$cop,u  $labl\t# Loop end" %}
    size(6);
    opcode(0x0F, 0x80);
    ins_encode( Jcc( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
  %}
  
  instruct jmpLoopEndUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
    match(CountedLoopEnd cop cmp);
    effect(USE labl);

*** 13115,13125 ****
--- 13109,13118 ----
    format %{ "J$cop,u  $labl\t# Loop end" %}
    size(6);
    opcode(0x0F, 0x80);
    ins_encode( Jcc( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
  %}
  
  // Jump Direct Conditional - using unsigned comparison
  instruct jmpConU(cmpOpU cop, eFlagsRegU cmp, label labl) %{
    match(If cop cmp);

*** 13129,13139 ****
--- 13122,13131 ----
    format %{ "J$cop,u  $labl" %}
    size(6);
    opcode(0x0F, 0x80);
    ins_encode(Jcc(cop, labl));
    ins_pipe(pipe_jcc);
    ins_pc_relative(1);
  %}
  
  instruct jmpConUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
    match(If cop cmp);
    effect(USE labl);

*** 13142,13152 ****
--- 13134,13143 ----
    format %{ "J$cop,u  $labl" %}
    size(6);
    opcode(0x0F, 0x80);
    ins_encode(Jcc(cop, labl));
    ins_pipe(pipe_jcc);
    ins_pc_relative(1);
  %}
  
  instruct jmpConUCF2(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
    match(If cop cmp);
    effect(USE labl);

*** 13184,13194 ****
--- 13175,13184 ----
      emit_cc(cbuf, $secondary, $cop$$cmpcode);
      int disp = l->loc_pos() - (cbuf.insts_size() + 4);
      emit_d32(cbuf, disp);
    %}
    ins_pipe(pipe_jcc);
    ins_pc_relative(1);
  %}
  
  // ============================================================================
  // The 2nd slow-half of a subtype check.  Scan the subklass's 2ndary superklass
  // array for an instance of the superklass.  Set a hidden internal cache on a

*** 13252,13262 ****
--- 13242,13251 ----
    format %{ "JMP,s  $labl" %}
    size(2);
    opcode(0xEB);
    ins_encode( OpcP, LblShort( labl ) );
    ins_pipe( pipe_jmp );
    ins_pc_relative(1);
    ins_short_branch(1);
  %}
  
  // Jump Direct Conditional - Label defines a relative address from Jcc+1
  instruct jmpCon_short(cmpOp cop, eFlagsReg cr, label labl) %{

*** 13267,13277 ****
--- 13256,13265 ----
    format %{ "J$cop,s  $labl" %}
    size(2);
    opcode(0x70);
    ins_encode( JccShort( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
    ins_short_branch(1);
  %}
  
  // Jump Direct Conditional - Label defines a relative address from Jcc+1
  instruct jmpLoopEnd_short(cmpOp cop, eFlagsReg cr, label labl) %{

*** 13282,13292 ****
--- 13270,13279 ----
    format %{ "J$cop,s  $labl\t# Loop end" %}
    size(2);
    opcode(0x70);
    ins_encode( JccShort( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
    ins_short_branch(1);
  %}
  
  // Jump Direct Conditional - Label defines a relative address from Jcc+1
  instruct jmpLoopEndU_short(cmpOpU cop, eFlagsRegU cmp, label labl) %{

*** 13297,13307 ****
--- 13284,13293 ----
    format %{ "J$cop,us $labl\t# Loop end" %}
    size(2);
    opcode(0x70);
    ins_encode( JccShort( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
    ins_short_branch(1);
  %}
  
  instruct jmpLoopEndUCF_short(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
    match(CountedLoopEnd cop cmp);

*** 13311,13321 ****
--- 13297,13306 ----
    format %{ "J$cop,us $labl\t# Loop end" %}
    size(2);
    opcode(0x70);
    ins_encode( JccShort( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
    ins_short_branch(1);
  %}
  
  // Jump Direct Conditional - using unsigned comparison
  instruct jmpConU_short(cmpOpU cop, eFlagsRegU cmp, label labl) %{

*** 13326,13336 ****
--- 13311,13320 ----
    format %{ "J$cop,us $labl" %}
    size(2);
    opcode(0x70);
    ins_encode( JccShort( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
    ins_short_branch(1);
  %}
  
  instruct jmpConUCF_short(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
    match(If cop cmp);

*** 13340,13350 ****
--- 13324,13333 ----
    format %{ "J$cop,us $labl" %}
    size(2);
    opcode(0x70);
    ins_encode( JccShort( cop, labl) );
    ins_pipe( pipe_jcc );
    ins_pc_relative(1);
    ins_short_branch(1);
  %}
  
  instruct jmpConUCF2_short(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
    match(If cop cmp);

*** 13380,13390 ****
--- 13363,13372 ----
      emit_d8(cbuf, disp);
      assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
      assert(-128 <= parity_disp && parity_disp <= 127, "Displacement too large for short jmp");
    %}
    ins_pipe(pipe_jcc);
    ins_pc_relative(1);
    ins_short_branch(1);
  %}
  
  // ============================================================================
  // Long Compare

*** 13853,13863 ****
--- 13835,13844 ----
    ins_encode( pre_call_FPU,
                Java_Static_Call( meth ),
                call_epilog,
                post_call_FPU );
    ins_pipe( pipe_slow );
    ins_pc_relative(1);
    ins_alignment(4);
  %}
  
  // Call Java Static Instruction (method handle version)
  // Note: If this code changes, the corresponding ret_addr_offset() and

*** 13877,13887 ****
--- 13858,13867 ----
                Java_Static_Call( meth ),
                restore_SP,
                call_epilog,
                post_call_FPU );
    ins_pipe( pipe_slow );
    ins_pc_relative(1);
    ins_alignment(4);
  %}
  
  // Call Java Dynamic Instruction
  // Note: If this code changes, the corresponding ret_addr_offset() and

*** 13897,13907 ****
--- 13877,13886 ----
    ins_encode( pre_call_FPU,
                Java_Dynamic_Call( meth ),
                call_epilog,
                post_call_FPU );
    ins_pipe( pipe_slow );
    ins_pc_relative(1);
    ins_alignment(4);
  %}
  
  // Call Runtime Instruction
  instruct CallRuntimeDirect(method meth) %{

*** 13915,13925 ****
--- 13894,13903 ----
    ins_encode( pre_call_FPU,
                FFree_Float_Stack_All,
                Java_To_Runtime( meth ),
                post_call_FPU );
    ins_pipe( pipe_slow );
    ins_pc_relative(1);
  %}
  
  // Call runtime without safepoint
  instruct CallLeafDirect(method meth) %{
    match(CallLeaf);

*** 13931,13941 ****
--- 13909,13918 ----
    ins_encode( pre_call_FPU,
                FFree_Float_Stack_All,
                Java_To_Runtime( meth ),
                Verify_FPU_For_Leaf, post_call_FPU );
    ins_pipe( pipe_slow );
    ins_pc_relative(1);
  %}
  
  instruct CallLeafNoFPDirect(method meth) %{
    match(CallLeafNoFP);
    effect(USE meth);

*** 13943,13953 ****
--- 13920,13929 ----
    ins_cost(300);
    format %{ "CALL_LEAF_NOFP,runtime " %}
    opcode(0xE8); /* E8 cd */
    ins_encode(Java_To_Runtime(meth));
    ins_pipe( pipe_slow );
    ins_pc_relative(1);
  %}
  
  
  // Return Instruction
  // Remove the return address & jump to it.

*** 14022,14042 ****
--- 13998,14016 ----
    effect( TEMP tmp, TEMP scr );
    ins_cost(300);
    format %{ "FASTLOCK $object, $box KILLS $tmp,$scr" %}
    ins_encode( Fast_Lock(object,box,tmp,scr) );
    ins_pipe( pipe_slow );
    ins_pc_relative(1);
  %}
  
  instruct cmpFastUnlock( eFlagsReg cr, eRegP object, eAXRegP box, eRegP tmp ) %{
    match( Set cr (FastUnlock object box) );
    effect( TEMP tmp );
    ins_cost(300);
    format %{ "FASTUNLOCK $object, $box, $tmp" %}
    ins_encode( Fast_Unlock(object,box,tmp) );
    ins_pipe( pipe_slow );
    ins_pc_relative(1);
  %}
  
  
  
  // ============================================================================