From 346ab587cb235b4ef0b5777b4cd29009808d0cc0 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Fri, 24 Jul 2026 16:14:33 +0200
Subject: DynASM/x86: Fix movd/movq and vmovd/vmovq operand sizes.

Thanks to Dmitry Stogov. #1489
---
 src/vm_x64.dasc | 30 +++++++++++++++---------------
 src/vm_x86.dasc |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/vm_x64.dasc b/src/vm_x64.dasc
index 5769d1cf5..2c18acd67 100644
--- a/src/vm_x64.dasc
+++ b/src/vm_x64.dasc
@@ -354,11 +354,11 @@
 |
 |// Synthesize SSE FP constants.
 |.macro sseconst_abs, reg, tmp		// Synthesize abs mask.
-|  mov64 tmp, U64x(7fffffff,ffffffff); movd reg, tmp
+|  mov64 tmp, U64x(7fffffff,ffffffff); movq reg, tmp
 |.endmacro
 |
 |.macro sseconst_hi, reg, tmp, val	// Synthesize hi-32 bit const.
-|  mov64 tmp, U64x(val,00000000); movd reg, tmp
+|  mov64 tmp, U64x(val,00000000); movq reg, tmp
 |.endmacro
 |
 |.macro sseconst_sign, reg, tmp		// Synthesize sign mask.
@@ -2087,7 +2087,7 @@ static void build_subroutines(BuildCtx *ctx)
   |.endif
   |1:
   |  ja ->fff_fallback
-  |  movd xmm0, RB
+  |  movq xmm0, RB
   |.else
   |  checknumtp [BASE], ->fff_fallback
   |  movsd xmm0, qword [BASE]
@@ -2122,7 +2122,7 @@ static void build_subroutines(BuildCtx *ctx)
   |  jmp <1
   |2:
   |  ja ->fff_fallback_bit_op
-  |  movd xmm0, RA
+  |  movq xmm0, RA
   |.else
   |  checknumtp [RD], ->fff_fallback_bit_op
   |  movsd xmm0, qword [RD]
@@ -2693,7 +2693,7 @@ static void build_subroutines(BuildCtx *ctx)
   |  ret
   |1:
   |  mov64 rdx, U64x(c3f00000,00000000)	// -0x1p64 (double).
-  |  movd xmm1, rdx
+  |  movq xmm1, rdx
   |  addsd xmm0,  xmm1
   |  cvttsd2si rax, xmm0		// Convert [2^63..2^64+2^63) range.
   |  // Note that -0x1p63 converts to -0x8000000000000000LL either way.
@@ -3005,16 +3005,16 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |  ja ->vmeta_comp
     |  // RA is an integer, RD is a number.
     |  cvtsi2sd xmm1, RAd
-    |  movd xmm0, RD
+    |  movq xmm0, RD
     |  jmp >3
     |.else
     |  cmp ITYPEd, LJ_TISNUM; jae ->vmeta_comp
     |  cmp RBd, LJ_TISNUM; jae ->vmeta_comp
     |.endif
     |1:
-    |  movd xmm0, RD
+    |  movq xmm0, RD
     |2:
-    |  movd xmm1, RA
+    |  movq xmm1, RA
     |3:
     |  add PC, 4
     |  ucomisd xmm0, xmm1
@@ -3059,7 +3059,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |7:  // RD is not an integer.
     |  ja >5
     |  // RD is a number.
-    |  movd xmm1, RD
+    |  movq xmm1, RD
     |  cmp ITYPEd, LJ_TISNUM; jb >1; jne >5
     |  // RD is a number, RA is an integer.
     |  cvtsi2sd xmm0, RAd
@@ -3074,10 +3074,10 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |.else
     |  cmp RBd, LJ_TISNUM; jae >5
     |  cmp ITYPEd, LJ_TISNUM; jae >5
-    |  movd xmm1, RD
+    |  movq xmm1, RD
     |.endif
     |1:
-    |  movd xmm0, RA
+    |  movq xmm0, RA
     |2:
     |  ucomisd xmm0, xmm1
     |4:
@@ -3199,11 +3199,11 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |
     |8:  // RA is an integer, RD is a number.
     |  cvtsi2sd xmm0, RBd
-    |  movd xmm1, RD
+    |  movq xmm1, RD
     |  ucomisd xmm0, xmm1
     |  jmp >4
     |1:
-    |  movd xmm0, RD
+    |  movq xmm0, RD
     |.else
     |  checknum RB, >3
     |1:
@@ -3881,7 +3881,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |.else
     |  // Convert number to int and back and compare.
     |  checknum RC, >5
-    |  movd xmm0, RC
+    |  movq xmm0, RC
     |  cvttsd2si RCd, xmm0
     |  cvtsi2sd xmm1, RCd
     |  ucomisd xmm0, xmm1
@@ -4007,7 +4007,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |.else
     |  // Convert number to int and back and compare.
     |  checknum RC, >5
-    |  movd xmm0, RC
+    |  movq xmm0, RC
     |  cvttsd2si RCd, xmm0
     |  cvtsi2sd xmm1, RCd
     |  ucomisd xmm0, xmm1
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index c930168ae..c201c3343 100644
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -444,7 +444,7 @@
 |// Synthesize SSE FP constants.
 |.macro sseconst_abs, reg, tmp		// Synthesize abs mask.
 |.if X64
-|  mov64 tmp, U64x(7fffffff,ffffffff); movd reg, tmp
+|  mov64 tmp, U64x(7fffffff,ffffffff); movq reg, tmp
 |.else
 |  pxor reg, reg; pcmpeqd reg, reg; psrlq reg, 1
 |.endif
@@ -452,7 +452,7 @@
 |
 |.macro sseconst_hi, reg, tmp, val	// Synthesize hi-32 bit const.
 |.if X64
-|  mov64 tmp, U64x(val,00000000); movd reg, tmp
+|  mov64 tmp, U64x(val,00000000); movq reg, tmp
 |.else
 |  mov tmp, 0x .. val; movd reg, tmp; pshufd reg, reg, 0x51
 |.endif
@@ -3156,7 +3156,7 @@ static void build_subroutines(BuildCtx *ctx)
   |  ret
   |1:
   |  mov64 rdx, U64x(c3f00000,00000000)	// -0x1p64 (double).
-  |  movd xmm1, rdx
+  |  movq xmm1, rdx
   |  addsd xmm0,  xmm1
   |  cvttsd2si rax, xmm0		// Convert [2^63..2^64+2^63) range.
   |  // Note that -0x1p63 converts to -0x8000000000000000LL either way.
-- 
cgit v1.2.3-55-g6feb