From e19c989bd57448a431f46153a8e6cb3639b8f91d Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin (Intel)" Date: Wed, 15 Oct 2025 22:44:23 -0700 Subject: [PATCH] insns.dat: correct the handling of RET instructions with prefixes NASM would throw a warning on some valid prefixed RET instructions, e.g. "o32 ret" instead of "retd" in 16-bit mode. Correct that. Signed-off-by: H. Peter Anvin (Intel) --- x86/insns.dat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x86/insns.dat b/x86/insns.dat index e127297f..8e4bfa09 100644 --- a/x86/insns.dat +++ b/x86/insns.dat @@ -333,12 +333,12 @@ $wd CALL imm16:imm#|far [ji: o# 9a i# iw] 8086,OSIZE,AR1,NOLONG,ND ; This is an intentional "programmer friendliness" quirk. $wdq CALL mem#|far [m: o# ff /3] 8086,OSIZE,NWSIZE,(w:NOLONG) -$zwdq RET% void [ nw o# c3] 8086,BND,(d:NOLONG) -$zwdq RET% imm16 [i: nw o# c2 iw] 8086,BND,(d:NOLONG) +$zwdq RET% void [ nw od# c3] 8086,BND,(d:NOLONG) +$zwdq RET% imm16 [i: nw od# c2 iw] 8086,BND,(d:NOLONG) $zwdq RETF% void [ od# cb] 8086 $zwdq RETF% imm16 [i: od# ca iw] 8086 -$zwdq RETN% void [ nw o# c3] 8086,BND,ND,(d:NOLONG) -$zwdq RETN% imm16 [i: nw o# c2 iw] 8086,BND,ND,(d:NOLONG) +$zwdq RETN% void [ nw od# c3] 8086,BND,ND,(d:NOLONG) +$zwdq RETN% imm16 [i: nw od# c2 iw] 8086,BND,ND,(d:NOLONG) ;# Interrupts, system calls, and returns INT imm8 [i: cd ib,u] 8086