diff --git a/assembly/amd64/array.lisp b/assembly/amd64/array.lisp
index d45a33c72e118487ffd75f9b9ede2577283ae4be..034961fe4b7e171563d693d94a2386c43919770a 100644
--- a/assembly/amd64/array.lisp
+++ b/assembly/amd64/array.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/amd64/array.lisp,v 1.2 2004/07/14 20:51:49 cwang Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/amd64/array.lisp,v 1.3 2004/07/27 23:28:41 cwang Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -85,11 +85,11 @@
   (inst xor result result)
   ;; Get the count.  If it's zero, blow out.
   (inst mov rcx length)
-  (inst jecxz done) ; I'd probably change all jecxz to jrcxz
+  (inst jrcxz done)
   ;; Convert it into count of the number of full words.  If zero, then skip
   ;; to the part that handles the tail.
   (inst shr rcx 5) ; 2 tag bits + 3
-  (inst jecxz do-extra)
+  (inst jrcxz do-extra)
   ;; Clear the direction flag, so we advance through memory.
   (inst cld)
 
@@ -107,7 +107,7 @@
   ;; here.  Otherwise, multiply by 8.
   (inst mov rcx length)
   (inst and rcx (fixnumize 7))
-  (inst jecxz done)
+  (inst jrcxz done)
   ;; some bytes are left
   (inst shl rcx 1)
 
diff --git a/assembly/amd64/assem-rtns.lisp b/assembly/amd64/assem-rtns.lisp
index 7842a4579a0be94b30a9f45c7d19cc634e21ae48..3c7383c6525e4217e927789f1892ad13667be58a 100644
--- a/assembly/amd64/assem-rtns.lisp
+++ b/assembly/amd64/assem-rtns.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/amd64/assem-rtns.lisp,v 1.2 2004/07/27 21:05:33 cwang Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/amd64/assem-rtns.lisp,v 1.3 2004/07/27 23:28:41 cwang Exp $")
 ;;;
 ;;; **********************************************************************
 ;;; 
@@ -42,7 +42,7 @@
      (:temp rdi unsigned-reg rdi-offset))
      
   ;; Pick off the cases where everything fits in register args.
-  (inst jecxz zero-values)
+  (inst jrcxz zero-values)
   (inst cmp rcx (fixnumize 1))
   (inst jmp :e one-value)
   (inst cmp rcx (fixnumize 2))
diff --git a/compiler/amd64/insts.lisp b/compiler/amd64/insts.lisp
index 8816f226ff6eb3f3bebcac3eeeb6d8f0bb7bef1e..44f0bc2d7e0f1237ef32b3ec5903d0fb2ae4c3d6 100644
--- a/compiler/amd64/insts.lisp
+++ b/compiler/amd64/insts.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/amd64/insts.lisp,v 1.4 2004/07/14 21:05:13 cwang Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/amd64/insts.lisp,v 1.5 2004/07/27 23:28:41 cwang Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -2094,7 +2094,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)
@@ -2103,7 +2103,7 @@
 (define-instruction loop (segment target)
   (:printer short-jump ((op #b0010)))
   (:emitter
-   (emit-byte segment #b11100010)	; pfw this was 11100011, or jecxz!!!!
+   (emit-byte segment #b11100010)
    (emit-byte-displacement-backpatch segment target)))
 
 (define-instruction loopz (segment target)
diff --git a/compiler/amd64/nlx.lisp b/compiler/amd64/nlx.lisp
index f8cd311e2d5dea8212cc3d7edd8ae256c1264ffd..c378777c6c6a46529c3899a690f0fa0f5edbe9ee 100644
--- a/compiler/amd64/nlx.lisp
+++ b/compiler/amd64/nlx.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/amd64/nlx.lisp,v 1.2 2004/07/06 20:21:09 cwang Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/amd64/nlx.lisp,v 1.3 2004/07/27 23:28:41 cwang Rel $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -181,7 +181,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
@@ -240,7 +240,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/compiler/amd64/values.lisp b/compiler/amd64/values.lisp
index 3808bdd50a68d0d3bd195db90912ef5ec9b20df5..dc272da6075540ab54a5ba2709e7838398b64011 100644
--- a/compiler/amd64/values.lisp
+++ b/compiler/amd64/values.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/amd64/values.lisp,v 1.1 2004/05/24 22:35:00 cwang Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/amd64/values.lisp,v 1.2 2004/07/27 23:28:41 cwang Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -121,7 +121,7 @@
     
     (move temp1 count)
     (inst mov start rsp-tn)
-    (inst jecxz done)  ; check for 0 count?
+    (inst jrcxz done)  ; check for 0 count?
     
     (inst shr temp1 word-shift) ; convert the fixnum to a count.