Skip to content

Commit e19c989

Browse files
author
H. Peter Anvin (Intel)
committed
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) <[email protected]>
1 parent 4709cfe commit e19c989

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

x86/insns.dat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,12 +333,12 @@ $wd CALL imm16:imm#|far [ji: o# 9a i# iw] 8086,OSIZE,AR1,NOLONG,ND
333333
; This is an intentional "programmer friendliness" quirk.
334334
$wdq CALL mem#|far [m: o# ff /3] 8086,OSIZE,NWSIZE,(w:NOLONG)
335335

336-
$zwdq RET% void [ nw o# c3] 8086,BND,(d:NOLONG)
337-
$zwdq RET% imm16 [i: nw o# c2 iw] 8086,BND,(d:NOLONG)
336+
$zwdq RET% void [ nw od# c3] 8086,BND,(d:NOLONG)
337+
$zwdq RET% imm16 [i: nw od# c2 iw] 8086,BND,(d:NOLONG)
338338
$zwdq RETF% void [ od# cb] 8086
339339
$zwdq RETF% imm16 [i: od# ca iw] 8086
340-
$zwdq RETN% void [ nw o# c3] 8086,BND,ND,(d:NOLONG)
341-
$zwdq RETN% imm16 [i: nw o# c2 iw] 8086,BND,ND,(d:NOLONG)
340+
$zwdq RETN% void [ nw od# c3] 8086,BND,ND,(d:NOLONG)
341+
$zwdq RETN% imm16 [i: nw od# c2 iw] 8086,BND,ND,(d:NOLONG)
342342

343343
;# Interrupts, system calls, and returns
344344
INT imm8 [i: cd ib,u] 8086

0 commit comments

Comments
 (0)