From 508d38dc908e6d9f951d539874bf87bd85f8c902 Mon Sep 17 00:00:00 2001
From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Mon, 21 Jan 2008 14:46:52 +0000
Subject: [PATCH] 1.0.13.50: rename JECXZ to JRCXZ in the x86-64 backend for
 clarity

 * Thanks to Lutz Euler. (No 32 bit variant of the instruction in
   64-bit mode.)
---
 src/assembly/x86-64/assem-rtns.lisp | 2 +-
 src/compiler/x86-64/call.lisp       | 4 ++--
 src/compiler/x86-64/insts.lisp      | 2 +-
 src/compiler/x86-64/nlx.lisp        | 4 ++--
 src/compiler/x86-64/values.lisp     | 2 +-
 version.lisp-expr                   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assembly/x86-64/assem-rtns.lisp b/src/assembly/x86-64/assem-rtns.lisp
index 0b2f65e30..c3f8d3c9a 100644
--- a/src/assembly/x86-64/assem-rtns.lisp
+++ b/src/assembly/x86-64/assem-rtns.lisp
@@ -31,7 +31,7 @@
      (:temp edi unsigned-reg rdi-offset))
 
   ;; Pick off the cases where everything fits in register args.
-  (inst jecxz ZERO-VALUES)
+  (inst jrcxz ZERO-VALUES)
   (inst cmp ecx (fixnumize 1))
   (inst jmp :e ONE-VALUE)
   (inst cmp ecx (fixnumize 2))
diff --git a/src/compiler/x86-64/call.lisp b/src/compiler/x86-64/call.lisp
index bd6100577..4242c9968 100644
--- a/src/compiler/x86-64/call.lisp
+++ b/src/compiler/x86-64/call.lisp
@@ -1155,7 +1155,7 @@
   (:generator 20
     ;; Avoid the copy if there are no more args.
     (cond ((zerop fixed)
-           (inst jecxz JUST-ALLOC-FRAME))
+           (inst jrcxz JUST-ALLOC-FRAME))
           (t
            (inst cmp rcx-tn (fixnumize fixed))
            (inst jmp :be JUST-ALLOC-FRAME)))
@@ -1294,7 +1294,7 @@
       (move rcx count)
       ;; Check to see whether there are no args, and just return NIL if so.
       (inst mov result nil-value)
-      (inst jecxz done)
+      (inst jrcxz done)
       (inst lea dst (make-ea :qword :base rcx :index rcx))
       (maybe-pseudo-atomic stack-allocate-p
        (allocation dst dst node stack-allocate-p)
diff --git a/src/compiler/x86-64/insts.lisp b/src/compiler/x86-64/insts.lisp
index 4179980b6..5b61b5e1d 100644
--- a/src/compiler/x86-64/insts.lisp
+++ b/src/compiler/x86-64/insts.lisp
@@ -2586,7 +2586,7 @@
          (t
           (emit-byte segment #b11000011)))))
 
-(define-instruction jecxz (segment target)
+(define-instruction jrcxz (segment target)
   (:printer short-jump ((op #b0011)))
   (:emitter
    (emit-byte segment #b11100011)
diff --git a/src/compiler/x86-64/nlx.lisp b/src/compiler/x86-64/nlx.lisp
index feeb93a05..96cf3f870 100644
--- a/src/compiler/x86-64/nlx.lisp
+++ b/src/compiler/x86-64/nlx.lisp
@@ -148,7 +148,7 @@
           ((= nvals 1)
            (let ((no-values (gen-label)))
              (inst mov (tn-ref-tn values) nil-value)
-             (inst jecxz no-values)
+             (inst jrcxz no-values)
              (loadw (tn-ref-tn values) start -1)
              (emit-label no-values)))
           (t
@@ -207,7 +207,7 @@
     (move num rcx)
     (inst shr rcx word-shift)           ; word count for <rep movs>
     ;; If we got zero, we be done.
-    (inst jecxz DONE)
+    (inst jrcxz DONE)
     ;; Copy them down.
     (inst std)
     (inst rep)
diff --git a/src/compiler/x86-64/values.lisp b/src/compiler/x86-64/values.lisp
index 0c3f4e71a..92f702705 100644
--- a/src/compiler/x86-64/values.lisp
+++ b/src/compiler/x86-64/values.lisp
@@ -137,7 +137,7 @@
 
     (move loop-index count)
     (inst mov start rsp-tn)
-    (inst jecxz DONE)  ; check for 0 count?
+    (inst jrcxz DONE)  ; check for 0 count?
 
     (inst sub rsp-tn count)
     (inst sub src count)
diff --git a/version.lisp-expr b/version.lisp-expr
index 0fb861518..6c05f6a04 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.13.49"
+"1.0.13.50"
-- 
2.11.4.GIT