jdk8-mips64-public/hotspot: comparison src/cpu/x86/vm/x86

-:6987871cfb9b
+:95134e034042
 // Is this branch offset short enough that a short branch can be used?
 //
 // NOTE: If the platform does not provide any short branch variants, then
 //       this method should return false for offset 0.
-bool Matcher::is_short_branch_offset(int rule, int offset) {
+bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
+// The passed offset is relative to address of the branch.
+// On 86 a branch displacement is calculated relative to address
+// of a next instruction.
+offset -= br_size;
 // the short version of jmpConUCF2 contains multiple branches,
 // making the reach slightly less
 if (rule == jmpConUCF2_rule)
 return (-126 <= offset && offset <= 125);
 return (-128 <= offset && offset <= 127);
 emit_rm(cbuf, 0x3, $tertiary, HIGH_FROM_LOW($dst$$reg));
 if ((con >= -128) && (con <= 127)) emit_d8 (cbuf,con);
 else                               emit_d32(cbuf,con);
 %}
-enc_class Lbl (label labl) %{ // GOTO
-Label *l = $labl$$label;
-emit_d32(cbuf, (l->loc_pos() - (cbuf.insts_size()+4)));
-%}
-enc_class LblShort (label labl) %{ // GOTO
-Label *l = $labl$$label;
-int disp = l->loc_pos() - (cbuf.insts_size()+1);
-assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
-emit_d8(cbuf, disp);
-%}
 enc_class OpcSReg (eRegI dst) %{    // BSWAP
 emit_cc(cbuf, $secondary, $dst$$reg );
 %}
 enc_class bswap_long_bytes(eRegL dst) %{ // BSWAP
 emit_rm(cbuf, 0x3, destlo, desthi);
 %}
 enc_class RegOpc (eRegI div) %{    // IDIV, IMOD, JMP indirect, ...
 emit_rm(cbuf, 0x3, $secondary, $div$$reg );
-%}
-enc_class Jcc (cmpOp cop, label labl) %{    // JCC
-Label *l = $labl$$label;
-$$$emit8$primary;
-emit_cc(cbuf, $secondary, $cop$$cmpcode);
-emit_d32(cbuf, (l->loc_pos() - (cbuf.insts_size()+4)));
-%}
-enc_class JccShort (cmpOp cop, label labl) %{    // JCC
-Label *l = $labl$$label;
-emit_cc(cbuf, $primary, $cop$$cmpcode);
-int disp = l->loc_pos() - (cbuf.insts_size()+1);
-assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
-emit_d8(cbuf, disp);
 %}
 enc_class enc_cmov(cmpOp cop ) %{ // CMOV
 $$$emit8$primary;
 emit_cc(cbuf, $secondary, $cop$$cmpcode);
 effect(USE labl);
 ins_cost(300);
 format %{ "JMP    $labl" %}
 size(5);
-opcode(0xE9);
+ins_encode %{
-ins_encode( OpcP, Lbl( labl ) );
+Label* L = $labl$$label;
+__ jmp(*L, false); // Always long jump
+%}
 ins_pipe( pipe_jmp );
 %}
 // Jump Direct Conditional - Label defines a relative address from Jcc+1
 instruct jmpCon(cmpOp cop, eFlagsReg cr, label labl) %{
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop    $labl" %}
 size(6);
-opcode(0x0F, 0x80);
+ins_encode %{
-ins_encode( Jcc( cop, labl) );
+Label* L = $labl$$label;
+__ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+%}
 ins_pipe( pipe_jcc );
 %}
 // Jump Direct Conditional - Label defines a relative address from Jcc+1
 instruct jmpLoopEnd(cmpOp cop, eFlagsReg cr, label labl) %{
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop    $labl\t# Loop end" %}
 size(6);
-opcode(0x0F, 0x80);
+ins_encode %{
-ins_encode( Jcc( cop, labl) );
+Label* L = $labl$$label;
+__ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+%}
 ins_pipe( pipe_jcc );
 %}
 // Jump Direct Conditional - Label defines a relative address from Jcc+1
 instruct jmpLoopEndU(cmpOpU cop, eFlagsRegU cmp, label labl) %{
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop,u  $labl\t# Loop end" %}
 size(6);
-opcode(0x0F, 0x80);
+ins_encode %{
-ins_encode( Jcc( cop, labl) );
+Label* L = $labl$$label;
+__ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+%}
 ins_pipe( pipe_jcc );
 %}
 instruct jmpLoopEndUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
 match(CountedLoopEnd cop cmp);
 effect(USE labl);
 ins_cost(200);
 format %{ "J$cop,u  $labl\t# Loop end" %}
 size(6);
-opcode(0x0F, 0x80);
+ins_encode %{
-ins_encode( Jcc( cop, labl) );
+Label* L = $labl$$label;
+__ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+%}
 ins_pipe( pipe_jcc );
 %}
 // Jump Direct Conditional - using unsigned comparison
 instruct jmpConU(cmpOpU cop, eFlagsRegU cmp, label labl) %{
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop,u  $labl" %}
 size(6);
-opcode(0x0F, 0x80);
+ins_encode %{
-ins_encode(Jcc(cop, labl));
+Label* L = $labl$$label;
+__ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+%}
 ins_pipe(pipe_jcc);
 %}
 instruct jmpConUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
 match(If cop cmp);
 effect(USE labl);
 ins_cost(200);
 format %{ "J$cop,u  $labl" %}
 size(6);
-opcode(0x0F, 0x80);
+ins_encode %{
-ins_encode(Jcc(cop, labl));
+Label* L = $labl$$label;
+__ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+%}
 ins_pipe(pipe_jcc);
 %}
 instruct jmpConUCF2(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
 match(If cop cmp);
 $$emit$$"JP,u   done\n\t"
 $$emit$$"J$cop,u   $labl\n\t"
 $$emit$$"done:"
 }
 %}
-size(12);
-opcode(0x0F, 0x80);
 ins_encode %{
 Label* l = $labl$$label;
-$$$emit8$primary;
-emit_cc(cbuf, $secondary, Assembler::parity);
-int parity_disp = -1;
-bool ok = false;
 if ($cop$$cmpcode == Assembler::notEqual) {
-// the two jumps 6 bytes apart so the jump distances are too
+__ jcc(Assembler::parity, *l, false);
-parity_disp = l->loc_pos() - (cbuf.insts_size() + 4);
+__ jcc(Assembler::notEqual, *l, false);
 } else if ($cop$$cmpcode == Assembler::equal) {
-parity_disp = 6;
+Label done;
-ok = true;
+__ jccb(Assembler::parity, done);
+__ jcc(Assembler::equal, *l, false);
+__ bind(done);
 } else {
 ShouldNotReachHere();
 }
-emit_d32(cbuf, parity_disp);
-$$$emit8$primary;
-emit_cc(cbuf, $secondary, $cop$$cmpcode);
-int disp = l->loc_pos() - (cbuf.insts_size() + 4);
-emit_d32(cbuf, disp);
 %}
 ins_pipe(pipe_jcc);
 %}
 // ============================================================================
 effect(USE labl);
 ins_cost(300);
 format %{ "JMP,s  $labl" %}
 size(2);
-opcode(0xEB);
+ins_encode %{
-ins_encode( OpcP, LblShort( labl ) );
+Label* L = $labl$$label;
+__ jmpb(*L);
+%}
 ins_pipe( pipe_jmp );
 ins_short_branch(1);
 %}
 // Jump Direct Conditional - Label defines a relative address from Jcc+1
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop,s  $labl" %}
 size(2);
-opcode(0x70);
+ins_encode %{
-ins_encode( JccShort( cop, labl) );
+Label* L = $labl$$label;
+__ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+%}
 ins_pipe( pipe_jcc );
 ins_short_branch(1);
 %}
 // Jump Direct Conditional - Label defines a relative address from Jcc+1
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop,s  $labl\t# Loop end" %}
 size(2);
-opcode(0x70);
+ins_encode %{
-ins_encode( JccShort( cop, labl) );
+Label* L = $labl$$label;
+__ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+%}
 ins_pipe( pipe_jcc );
 ins_short_branch(1);
 %}
 // Jump Direct Conditional - Label defines a relative address from Jcc+1
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop,us $labl\t# Loop end" %}
 size(2);
-opcode(0x70);
+ins_encode %{
-ins_encode( JccShort( cop, labl) );
+Label* L = $labl$$label;
+__ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+%}
 ins_pipe( pipe_jcc );
 ins_short_branch(1);
 %}
 instruct jmpLoopEndUCF_short(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop,us $labl\t# Loop end" %}
 size(2);
-opcode(0x70);
+ins_encode %{
-ins_encode( JccShort( cop, labl) );
+Label* L = $labl$$label;
+__ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+%}
 ins_pipe( pipe_jcc );
 ins_short_branch(1);
 %}
 // Jump Direct Conditional - using unsigned comparison
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop,us $labl" %}
 size(2);
-opcode(0x70);
+ins_encode %{
-ins_encode( JccShort( cop, labl) );
+Label* L = $labl$$label;
+__ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+%}
 ins_pipe( pipe_jcc );
 ins_short_branch(1);
 %}
 instruct jmpConUCF_short(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
 effect(USE labl);
 ins_cost(300);
 format %{ "J$cop,us $labl" %}
 size(2);
-opcode(0x70);
+ins_encode %{
-ins_encode( JccShort( cop, labl) );
+Label* L = $labl$$label;
+__ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+%}
 ins_pipe( pipe_jcc );
 ins_short_branch(1);
 %}
 instruct jmpConUCF2_short(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
 $$emit$$"J$cop,u,s  $labl\n\t"
 $$emit$$"done:"
 }
 %}
 size(4);
-opcode(0x70);
 ins_encode %{
 Label* l = $labl$$label;
-emit_cc(cbuf, $primary, Assembler::parity);
-int parity_disp = -1;
 if ($cop$$cmpcode == Assembler::notEqual) {
-parity_disp = l->loc_pos() - (cbuf.insts_size() + 1);
+__ jccb(Assembler::parity, *l);
+__ jccb(Assembler::notEqual, *l);
 } else if ($cop$$cmpcode == Assembler::equal) {
-parity_disp = 2;
+Label done;
+__ jccb(Assembler::parity, done);
+__ jccb(Assembler::equal, *l);
+__ bind(done);
 } else {
 ShouldNotReachHere();
 }
-emit_d8(cbuf, parity_disp);
-emit_cc(cbuf, $primary, $cop$$cmpcode);
-int disp = l->loc_pos() - (cbuf.insts_size() + 1);
-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_short_branch(1);
 %}

comparison: src/cpu/x86/vm/x86_32.ad

src/cpu/x86/vm/x86_32.ad

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/cpu/x86/vm/x86_32.ad

src/cpu/x86/vm/x86_32.ad