src/cpu/sparc/vm/sparc.ad

*** 2968,2978 ****
      __ delayed()->sll(limit_reg, exact_log2(sizeof(jchar)), limit_reg); // set byte count
  
      // Compare char[] arrays aligned to 4 bytes.
      __ char_arrays_equals(str1_reg, str2_reg, limit_reg, result_reg,
                            chr1_reg, chr2_reg, Ldone);
!     __ ba(Ldone, false);
      __ delayed()->add(G0, 1, result_reg);
  
      // char by char compare
      __ bind(Lchar);
      __ add(str1_reg, limit_reg, str1_reg);
--- 2968,2978 ----
      __ delayed()->sll(limit_reg, exact_log2(sizeof(jchar)), limit_reg); // set byte count
  
      // Compare char[] arrays aligned to 4 bytes.
      __ char_arrays_equals(str1_reg, str2_reg, limit_reg, result_reg,
                            chr1_reg, chr2_reg, Ldone);
!     __ ba(Ldone);
      __ delayed()->add(G0, 1, result_reg);
  
      // char by char compare
      __ bind(Lchar);
      __ add(str1_reg, limit_reg, str1_reg);
*** 9196,9207 ****
    size(8);
    ins_cost(BRANCH_COST);
    format %{ "BA     $labl" %}
    ins_encode %{
      Label* L = $labl$$label;
!     assert(L != NULL, "need Label");
!     __ ba(*L, false);
      __ delayed()->nop();
    %}
    ins_pc_relative(1);
    ins_pipe(br);
  %}
--- 9196,9206 ----
    size(8);
    ins_cost(BRANCH_COST);
    format %{ "BA     $labl" %}
    ins_encode %{
      Label* L = $labl$$label;
!     __ ba(*L);
      __ delayed()->nop();
    %}
    ins_pc_relative(1);
    ins_pipe(br);
  %}
*** 9281,9291 ****
    size(8);
    ins_cost(BRANCH_COST);
    format %{ "BP$cmp  $pcc,$labl" %}
    ins_encode %{
      Label* L = $labl$$label;
-     assert(L != NULL, "need Label");
      Assembler::Predict predict_taken =
        cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
  
      __ bp( (Assembler::Condition)($cmp$$cmpcode), false, Assembler::ptr_cc, predict_taken, *L);
      __ delayed()->nop();
--- 9280,9289 ----
*** 9301,9311 ****
    size(8);
    ins_cost(BRANCH_COST);
    format %{ "FBP$cmp $fcc,$labl" %}
    ins_encode %{
      Label* L = $labl$$label;
-     assert(L != NULL, "need Label");
      Assembler::Predict predict_taken =
        cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
  
      __ fbp( (Assembler::Condition)($cmp$$cmpcode), false, (Assembler::CC)($fcc$$reg), predict_taken, *L);
      __ delayed()->nop();
--- 9299,9308 ----
*** 9368,9378 ****
    size(8);
    ins_cost(BRANCH_COST);
    format %{ "BP$cmp   $xcc,$labl" %}
    ins_encode %{
      Label* L = $labl$$label;
-     assert(L != NULL, "need Label");
      Assembler::Predict predict_taken =
        cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
  
      __ bp( (Assembler::Condition)($cmp$$cmpcode), false, Assembler::xcc, predict_taken, *L);
      __ delayed()->nop();
--- 9365,9374 ----