NASM 0.98p3.6nasm-0.98p3.6

3 files changed, 12 insertions, 6 deletions

diff --git a/MODIFIED b/MODIFIED
index 4e0ddb15..7a0307b4 100644
--- a/MODIFIED
+++ b/MODIFIED
@@ -2,6 +2,12 @@ This is a modified version of NASM, modified and released by H. Peter
 Anvin <hpa@zytor.com>; it is not the original form released by the
 NASM authors.
 
+For release 0.98p3.6:
+
+* Fixed a bunch of instructions that were added in 0.98p3.5 which had
+  memory operands, and the address-size prefix was missing from the
+  instruction pattern.
+
 For release 0.98p3.5:
 
 * Merged in changes from John S. Fine's 0.98-J5 release.  John's based
diff --git a/insns.dat b/insns.dat
index deb5b118..4427e148 100644
--- a/insns.dat
+++ b/insns.dat
@@ -863,8 +863,8 @@ ROR       rm16,imm            \320\300\1\xC1\201\25         186,SB
 ROR       rm32,unity          \321\300\1\xD1\201            386
 ROR       rm32,reg_cl         \321\300\1\xD3\201            386
 ROR       rm32,imm            \321\300\1\xC1\201\25         386,SB
-RSDC      reg_sreg,mem80      \2\x0F\x79\101		    486,CYRIX,SMM
-RSLDT     mem80               \2\x0F\x7B\200		    486,CYRIX,SMM
+RSDC      reg_sreg,mem80      \301\2\x0F\x79\101	    486,CYRIX,SMM
+RSLDT     mem80               \300\2\x0F\x7B\200	    486,CYRIX,SMM
 RSM       void                \2\x0F\xAA                    PENT,SMM
 SAHF      void                \1\x9E                        8086
 SAL       rm8,unity           \300\1\xD0\204                8086,ND
@@ -990,9 +990,9 @@ SUB       rm32,imm            \321\300\1\x81\205\41         386,SM
 SUB       mem,imm8            \300\1\x80\205\21             8086,SM
 SUB       mem,imm16           \320\300\1\x81\205\31         8086,SM
 SUB       mem,imm32           \321\300\1\x81\205\41         386,SM
-SVDC	  mem80,reg_sreg      \2\x0F\x78\101		    486,CYRIX,SMM
-SVLDT     mem80               \2\x0F\x7A\200                486,CYRIX,SMM
-SVTS      mem80               \2\x0F\x7C\200                486,CYRIX,SMM
+SVDC	  mem80,reg_sreg      \300\2\x0F\x78\101            486,CYRIX,SMM
+SVLDT     mem80               \300\2\x0F\x7A\200            486,CYRIX,SMM
+SVTS      mem80               \300\2\x0F\x7C\200            486,CYRIX,SMM
 SYSCALL   void                \2\x0F\x05                    P6,AMD
 SYSENTER  void                \2\x0F\x34                    P6
 SYSEXIT   void                \2\x0F\x36                    P6,PRIV
diff --git a/nasm.h b/nasm.h
index 73a3fd90..0d3002a0 100644
--- a/nasm.h
+++ b/nasm.h
@@ -13,7 +13,7 @@
 
 #define NASM_MAJOR_VER 0
 #define NASM_MINOR_VER 98
-#define NASM_VER "0.98 pre-release 3.5"
+#define NASM_VER "0.98 pre-release 3.6"
 
 #ifndef NULL
 #define NULL 0