Mercurial > hg > openjdk > hsx16

changeset 925:4ca13e754354

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dcubed
date Fri, 28 Aug 2009 15:41:19 -0700
parents d2d605b757aa (current diff) 74453a25211d (diff)
children 0cb45c617c84
files
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/x86_32.ad	Fri Aug 28 14:30:15 2009 -0600
+++ b/src/cpu/x86/vm/x86_32.ad	Fri Aug 28 15:41:19 2009 -0700
@@ -3991,7 +3991,7 @@
     masm.bind(LOAD_SUBSTR);
     masm.movptr(rdi, Address(rsp, 4));
     masm.movl(rax, Address(rsp, 0));
-    // We came here after the beginninig of the substring was
+    // We came here after the beginning of the substring was
     // matched but the rest of it was not so we need to search
     // again. Start from the next element after the previous match.
     masm.subptr(rsi, rbx); // Restore counter
@@ -12743,7 +12743,7 @@
   effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, KILL tmp3, KILL tmp4, KILL cr);
 
   format %{ "String Equals $str1,$str2 -> $result    // KILL EBX, ECX" %}
-  ins_encode( enc_String_Equals(tmp1, tmp2, str1, str2, tmp3, tmp4, result) );
+  ins_encode( enc_String_Equals(str1, str2, tmp1, tmp2, tmp3, tmp4, result) );
   ins_pipe( pipe_slow );
 %}
 
--- a/src/cpu/x86/vm/x86_64.ad	Fri Aug 28 14:30:15 2009 -0600
+++ b/src/cpu/x86/vm/x86_64.ad	Fri Aug 28 15:41:19 2009 -0700
@@ -3882,12 +3882,12 @@
     masm.bind(LOAD_SUBSTR);
     masm.movptr(rdi, Address(rsp, 8));
     masm.movl(rax, Address(rsp, 0));
-    // We came here after the beginninig of the substring was
+    // We came here after the beginning of the substring was
     // matched but the rest of it was not so we need to search
     // again. Start from the next element after the previous match.
     masm.subptr(rsi, rbx); // Restore counter
-    masm.shrl(rsi, 1);
-    masm.addl(rdx, rsi);
+    masm.shrq(rsi, 1);
+    masm.addq(rdx, rsi);
     masm.lea(rsi, Address(rbx, 2));
 
     // Load substr
--- a/test/compiler/6875866/Test.java	Fri Aug 28 14:30:15 2009 -0600
+++ b/test/compiler/6875866/Test.java	Fri Aug 28 15:41:19 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 6875866
  * @summary Intrinsic for String.indexOf() is broken on x86 with SSE4.2
  *
- * @run main -Xcomp Test
+ * @run main/othervm -Xcomp Test
  */
 
 public class Test {