src/cpu/x86/vm/macroAssembler_x86.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 6192,6202 ****
                                        int int_cnt2,  Register result,
                                        XMMRegister vec, Register tmp) {
    ShortBranchVerifier sbv(this);
    assert(UseSSE42Intrinsics, "SSE4.2 is required");
  
!   // This method uses pcmpestri inxtruction with bound registers
    //   inputs:
    //     xmm - substring
    //     rax - substring length (elements count)
    //     mem - scanned string
    //     rdx - string length (elements count)
--- 6192,6202 ----
                                        int int_cnt2,  Register result,
                                        XMMRegister vec, Register tmp) {
    ShortBranchVerifier sbv(this);
    assert(UseSSE42Intrinsics, "SSE4.2 is required");
  
!   // This method uses pcmpestri instruction with bound registers
    //   inputs:
    //     xmm - substring
    //     rax - substring length (elements count)
    //     mem - scanned string
    //     rdx - string length (elements count)
*** 6353,6363 ****
    // if (substr.count > string.count) return -1;
    // if (substr.count == 0) return 0;
    //
    assert(int_cnt2 == -1 || (0 < int_cnt2 && int_cnt2 < 8), "should be != 0");
  
!   // This method uses pcmpestri inxtruction with bound registers
    //   inputs:
    //     xmm - substring
    //     rax - substring length (elements count)
    //     mem - scanned string
    //     rdx - string length (elements count)
--- 6353,6363 ----
    // if (substr.count > string.count) return -1;
    // if (substr.count == 0) return 0;
    //
    assert(int_cnt2 == -1 || (0 < int_cnt2 && int_cnt2 < 8), "should be != 0");
  
!   // This method uses pcmpestri instruction with bound registers
    //   inputs:
    //     xmm - substring
    //     rax - substring length (elements count)
    //     mem - scanned string
    //     rdx - string length (elements count)
*** 6642,6652 ****
  
      // Setup to compare 16-chars (32-bytes) vectors,
      // start from first character again because it has aligned address.
      int stride2 = 16;
      int adr_stride  = stride  << scale;
-     int adr_stride2 = stride2 << scale;
  
      assert(result == rax && cnt2 == rdx && cnt1 == rcx, "pcmpestri");
      // rax and rdx are used by pcmpestri as elements counters
      movl(result, cnt2);
      andl(cnt2, ~(stride2-1));   // cnt2 holds the vector count
--- 6642,6651 ----
*** 6741,6751 ****
  
      // pcmpestri
      //   inputs:
      //     vec1- substring
      //     rax - negative string length (elements count)
!     //     mem - scaned string
      //     rdx - string length (elements count)
      //     pcmpmask - cmp mode: 11000 (string compare with negated result)
      //               + 00 (unsigned bytes) or  + 01 (unsigned shorts)
      //   outputs:
      //     rcx - first mismatched element index
--- 6740,6750 ----
  
      // pcmpestri
      //   inputs:
      //     vec1- substring
      //     rax - negative string length (elements count)
!     //     mem - scanned string
      //     rdx - string length (elements count)
      //     pcmpmask - cmp mode: 11000 (string compare with negated result)
      //               + 00 (unsigned bytes) or  + 01 (unsigned shorts)
      //   outputs:
      //     rcx - first mismatched element index