In /instr_80*86.txt, also change [bp+si] to [bx+si] in 0F-prefixed opcodes

diff --git a/instr_80186.txt b/instr_80186.txt
index 59e4f58..11c8770 100644 (file)
--- a/instr_80186.txt
+++ b/instr_80186.txt
@@ -6480,14 +6480,14 @@ illegal_opcode
 illegal_opcode
 
 opcode 0f b9
-00000000  0FB902            ud1 ax,word [bp+si]
-00000000  0FB90A            ud1 cx,word [bp+si]
-00000000  0FB912            ud1 dx,word [bp+si]
-00000000  0FB91A            ud1 bx,word [bp+si]
-00000000  0FB922            ud1 sp,word [bp+si]
-00000000  0FB92A            ud1 bp,word [bp+si]
-00000000  0FB932            ud1 si,word [bp+si]
-00000000  0FB93A            ud1 di,word [bp+si]
+00000000  0FB900            ud1 ax,word [bx+si]
+00000000  0FB908            ud1 cx,word [bx+si]
+00000000  0FB910            ud1 dx,word [bx+si]
+00000000  0FB918            ud1 bx,word [bx+si]
+00000000  0FB920            ud1 sp,word [bx+si]
+00000000  0FB928            ud1 bp,word [bx+si]
+00000000  0FB930            ud1 si,word [bx+si]
+00000000  0FB938            ud1 di,word [bx+si]
 
 opcode 0f ba
 illegal_opcode

diff --git a/instr_80286.txt b/instr_80286.txt
index 93ae1e8..2f2dc0b 100644 (file)
--- a/instr_80286.txt
+++ b/instr_80286.txt
@@ -4630,44 +4630,44 @@ illegal_opcode
 
 opcodes 0f
 opcode 0f 00
-00000000  0F0002            sldt [bp+si]
-00000000  0F000A            str [bp+si]
-00000000  0F0012            lldt [bp+si]
-00000000  0F001A            ltr [bp+si]
-00000000  0F0022            verr [bp+si]
-00000000  0F002A            verw [bp+si]
+00000000  0F0000            sldt [bx+si]
+00000000  0F0008            str [bx+si]
+00000000  0F0010            lldt [bx+si]
+00000000  0F0018            ltr [bx+si]
+00000000  0F0020            verr [bx+si]
+00000000  0F0028            verw [bx+si]
 illegal_opcode
 illegal_opcode
 
 opcode 0f 01
-00000000  0F0102            sgdt [bp+si]
-00000000  0F010A            sidt [bp+si]
-00000000  0F0112            lgdt [bp+si]
-00000000  0F011A            lidt [bp+si]
-00000000  0F0122            smsw [bp+si]
+00000000  0F0100            sgdt [bx+si]
+00000000  0F0108            sidt [bx+si]
+00000000  0F0110            lgdt [bx+si]
+00000000  0F0118            lidt [bx+si]
+00000000  0F0120            smsw [bx+si]
 illegal_opcode
-00000000  0F0132            lmsw [bp+si]
+00000000  0F0130            lmsw [bx+si]
 illegal_opcode
 
 opcode 0f 02
-00000000  0F0202            lar ax,[bp+si]
-00000000  0F020A            lar cx,[bp+si]
-00000000  0F0212            lar dx,[bp+si]
-00000000  0F021A            lar bx,[bp+si]
-00000000  0F0222            lar sp,[bp+si]
-00000000  0F022A            lar bp,[bp+si]
-00000000  0F0232            lar si,[bp+si]
-00000000  0F023A            lar di,[bp+si]
+00000000  0F0200            lar ax,[bx+si]
+00000000  0F0208            lar cx,[bx+si]
+00000000  0F0210            lar dx,[bx+si]
+00000000  0F0218            lar bx,[bx+si]
+00000000  0F0220            lar sp,[bx+si]
+00000000  0F0228            lar bp,[bx+si]
+00000000  0F0230            lar si,[bx+si]
+00000000  0F0238            lar di,[bx+si]
 
 opcode 0f 03
-00000000  0F0302            lsl ax,[bp+si]
-00000000  0F030A            lsl cx,[bp+si]
-00000000  0F0312            lsl dx,[bp+si]
-00000000  0F031A            lsl bx,[bp+si]
-00000000  0F0322            lsl sp,[bp+si]
-00000000  0F032A            lsl bp,[bp+si]
-00000000  0F0332            lsl si,[bp+si]
-00000000  0F033A            lsl di,[bp+si]
+00000000  0F0300            lsl ax,[bx+si]
+00000000  0F0308            lsl cx,[bx+si]
+00000000  0F0310            lsl dx,[bx+si]
+00000000  0F0318            lsl bx,[bx+si]
+00000000  0F0320            lsl sp,[bx+si]
+00000000  0F0328            lsl bp,[bx+si]
+00000000  0F0330            lsl si,[bx+si]
+00000000  0F0338            lsl di,[bx+si]
 
 opcode 0f 04
 illegal_opcode
@@ -6480,14 +6480,14 @@ illegal_opcode
 illegal_opcode
 
 opcode 0f b9
-00000000  0FB902            ud1 ax,word [bp+si]
-00000000  0FB90A            ud1 cx,word [bp+si]
-00000000  0FB912            ud1 dx,word [bp+si]
-00000000  0FB91A            ud1 bx,word [bp+si]
-00000000  0FB922            ud1 sp,word [bp+si]
-00000000  0FB92A            ud1 bp,word [bp+si]
-00000000  0FB932            ud1 si,word [bp+si]
-00000000  0FB93A            ud1 di,word [bp+si]
+00000000  0FB900            ud1 ax,word [bx+si]
+00000000  0FB908            ud1 cx,word [bx+si]
+00000000  0FB910            ud1 dx,word [bx+si]
+00000000  0FB918            ud1 bx,word [bx+si]
+00000000  0FB920            ud1 sp,word [bx+si]
+00000000  0FB928            ud1 bp,word [bx+si]
+00000000  0FB930            ud1 si,word [bx+si]
+00000000  0FB938            ud1 di,word [bx+si]
 
 opcode 0f ba
 illegal_opcode

diff --git a/nasm b/nasm
index 3b0d383..dcaf844 160000 (submodule)
--- a/nasm
+++ b/nasm
@@ -1 +1 @@
-Subproject commit 3b0d3836329ef5439ab9f28362074d14bc0827d2
+Subproject commit dcaf844fbf6b8ad75ee197b0fab236552a041d6a