--- salsa20.s	2007-05-06 13:23:49.000000000 -0400
+++ salsa20.s	2019-03-20 18:38:43.000000000 -0400
@@ -594,11 +594,6 @@
 # asm 2: movl <in9=%r9d,>orig9=240(%rsp)
 movl %r9d,240(%rsp)
 
-# qhasm:   in8 += 1
-# asm 1: add  $1,<in8=int64#4
-# asm 2: add  $1,<in8=%rcx
-add  $1,%rcx
-
 # qhasm:   in9 <<= 32
 # asm 1: shl  $32,<in9=int64#6
 # asm 2: shl  $32,<in9=%r9
@@ -609,6 +604,11 @@
 # asm 2: add  <in9=%r9,<in8=%rcx
 add  %r9,%rcx
 
+# qhasm:   in8 += 1
+# asm 1: add  $1,<in8=int64#4
+# asm 2: add  $1,<in8=%rcx
+add  $1,%rcx
+
 # qhasm:   in9 = in8
 # asm 1: mov  <in8=int64#4,>in9=int64#6
 # asm 2: mov  <in8=%rcx,>in9=%r9
@@ -634,16 +634,6 @@
 # asm 2: add  $1,<in8=%rcx
 add  $1,%rcx
 
-# qhasm:   in9 <<= 32
-# asm 1: shl  $32,<in9=int64#6
-# asm 2: shl  $32,<in9=%r9
-shl  $32,%r9
-
-# qhasm:   in8 += in9
-# asm 1: add  <in9=int64#6,<in8=int64#4
-# asm 2: add  <in9=%r9,<in8=%rcx
-add  %r9,%rcx
-
 # qhasm:   in9 = in8
 # asm 1: mov  <in8=int64#4,>in9=int64#6
 # asm 2: mov  <in8=%rcx,>in9=%r9
@@ -669,16 +659,6 @@
 # asm 2: add  $1,<in8=%rcx
 add  $1,%rcx
 
-# qhasm:   in9 <<= 32
-# asm 1: shl  $32,<in9=int64#6
-# asm 2: shl  $32,<in9=%r9
-shl  $32,%r9
-
-# qhasm:   in8 += in9
-# asm 1: add  <in9=int64#6,<in8=int64#4
-# asm 2: add  <in9=%r9,<in8=%rcx
-add  %r9,%rcx
-
 # qhasm:   in9 = in8
 # asm 1: mov  <in8=int64#4,>in9=int64#6
 # asm 2: mov  <in8=%rcx,>in9=%r9
@@ -704,16 +684,6 @@
 # asm 2: add  $1,<in8=%rcx
 add  $1,%rcx
 
-# qhasm:   in9 <<= 32
-# asm 1: shl  $32,<in9=int64#6
-# asm 2: shl  $32,<in9=%r9
-shl  $32,%r9
-
-# qhasm:   in8 += in9
-# asm 1: add  <in9=int64#6,<in8=int64#4
-# asm 2: add  <in9=%r9,<in8=%rcx
-add  %r9,%rcx
-
 # qhasm:   in9 = in8
 # asm 1: mov  <in8=int64#4,>in9=int64#6
 # asm 2: mov  <in8=%rcx,>in9=%r9