From 44bcdd4327b64140c793065f778b1a24aabf661f Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 25 Sep 2020 19:39:31 -0400
Subject: [PATCH] Document 8086 asm instructions list

Also, remove needless argtype in CALL and RET
---
 blk/033     |  4 ++--
 blk/042     |  2 +-
 blk/043     |  2 +-
 blk/450     |  2 +-
 blk/454     |  2 +-
 blk/455     |  2 +-
 doc/asm.txt | 33 ++++++++++++++++++++++++++++++++-
 7 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/blk/033 b/blk/033
index f7cc861..1dbce6d 100644
--- a/blk/033
+++ b/blk/033
@@ -1,5 +1,5 @@
 : OP1 CREATE C, DOES> C@ A, ;
-0xc3 OP1 RETn,       0xfa OP1 CLI,       0xfb OP1 STI,
+0xc3 OP1 RET,        0xfa OP1 CLI,       0xfb OP1 STI,
 0xf4 OP1 HLT,        0xfc OP1 CLD,       0xfd OP1 STD,
 0x90 OP1 NOP,        0x98 OP1 CBW,
 0xf3 OP1 REPZ,       0xf2 OP1 REPNZ,     0xac OP1 LODSB,
@@ -9,7 +9,7 @@
 ( no argument, jumps with relative addrs are special )
 0xeb OP1 JMPs,       0xe9 OP1 JMPn,      0x74 OP1 JZ,
 0x75 OP1 JNZ,        0x72 OP1 JC,        0x73 OP1 JNC,
-0xe8 OP1 CALLn,
+0xe8 OP1 CALL,
 
 : OP1r CREATE C, DOES> C@ + A, ;
 0x40 OP1r INCx,      0x48 OP1r DECx,
diff --git a/blk/042 b/blk/042
index 552aa71..cac2fcf 100644
--- a/blk/042
+++ b/blk/042
@@ -8,4 +8,4 @@
 : RPCn, PC - 2- A,, ;
 : AGAIN, ( BREAK?, ) RPCs, ;
 ( Use RPCx with appropriate JMP/CALL op. Example:
-  JMPs, 0x42 RPCs, or CALLn, 0x1234 RPCn, )
+  JMPs, 0x42 RPCs, or CALL, 0x1234 RPCn, )
diff --git a/blk/043 b/blk/043
index 4db01db..7955e94 100644
--- a/blk/043
+++ b/blk/043
@@ -4,4 +4,4 @@
 : ;CODE JMPn, 0x1a ( next ) RPCn, ;
 VARIABLE lblchkPS
 : chkPS, ( sz -- )
-    CX SWAP 2 * MOVxI, CALLn, lblchkPS @ RPCn, ;
+    CX SWAP 2 * MOVxI, CALL, lblchkPS @ RPCn, ;
diff --git a/blk/450 b/blk/450
index a62bc11..bc45bd4 100644
--- a/blk/450
+++ b/blk/450
@@ -1,7 +1,7 @@
 lblchkPS BSET ( CX -> expected size )
     AX PS_ADDR MOVxI, AX SP SUBxx, 2 SUBAXI, ( CALL adjust )
     AX CX CMPxx,
-    IFNC, ( we're good ) RETn, THEN,
+    IFNC, ( we're good ) RET, THEN,
     ( underflow ) DI 0x06 MOVxm, JMPs, lblexec @ RPCs,
 
 PC 3 - ORG @ 1+ ! ( main )
diff --git a/blk/454 b/blk/454
index 75b332a..a21f3a3 100644
--- a/blk/454
+++ b/blk/454
@@ -11,6 +11,6 @@ CODE OVER ( a b -- a b a ) 2 chkPS,
     DI SP MOVxx, AX [DI] 2 MOVx[]+, AX PUSHx, ;CODE
 CODE PICK
     DI POPx, DI SHLx1, ( x2 )
-    CX DI MOVxx, CX 2 ADDxi, CALLn, lblchkPS @ RPCn,
+    CX DI MOVxx, CX 2 ADDxi, CALL, lblchkPS @ RPCn,
     DI SP ADDxx, DI [DI] MOVx[], DI PUSHx,
 ;CODE
diff --git a/blk/455 b/blk/455
index aeb770f..23efa7d 100644
--- a/blk/455
+++ b/blk/455
@@ -1,5 +1,5 @@
 CODE (roll) ( "2 3 4 5 4 --> 2 4 5 5". See B311 )
-    CX POPx, CX 2 ADDxi, CALLn, lblchkPS @ RPCn, CX 2 SUBxi,
+    CX POPx, CX 2 ADDxi, CALL, lblchkPS @ RPCn, CX 2 SUBxi,
     SI SP MOVxx, SI CX ADDxx,
     DI SI MOVxx, DI 2 ADDxi, STD, REPZ, MOVSB,
 ;CODE
diff --git a/doc/asm.txt b/doc/asm.txt
index f6cf7ee..76a54ba 100644
--- a/doc/asm.txt
+++ b/doc/asm.txt
@@ -158,7 +158,38 @@ For jumps, it's special. 's' is SHORT, 'n' is NEAR, 'f' is FAR.
 
 # 8086 Instructions list
 
-TODO
+r -> AL BL CL DL AH BH CH DX
+x -> AX BX CX DX SP BP SI DI
+s -> ES CS SS DS
+[] -> [SI] [DI] [BP] [BX] [BX+SI] [BX+DI] [BP+SI] [BP+DI]
+
+RET   CLI   STI   HLT   CLD   STD   NOP   CBW   REPZ  REPNZ
+LODSB LODSW CMPSB SMPSW MOVSB MOVSW SCASB SCASW STOSB STOSW
+
+CALL  J[Z,NZ,C,NC] JMP[s,n,r,f]
+
+INC[r,x,[w],[b],[w]+,[b]+]
+DEC[r,x,[w],[b],[w]+,[b]+]
+POP[x,[w],[w]+]
+PUSH[x,[w],[w]+,s]
+MUL[r,x]
+DIV[r,x]
+XOR[rr,xx]
+OR[rr,xx]
+AND[rr,xx,ALi,AXI]
+ADD[rr,xx,ALi,AXI,xi]
+SUB[rr,xx,ALi,AXI,xi]
+INT
+
+CMP[rr,xx,r[],x[],r[]+,x[]+]
+MOV[rr,xx,r[],x[],[]r,[]x,r[]+,x[]+,[]+r,[]+x,ri,xI,sx,rm,xm
+    mr,mx]
+
+("1" means "shift by 1", "CL" means "shift by CL")
+ROL[r1,x1,rCL,xCL]
+ROR[r1,x1,rCL,xCL]
+SHL[r1,x1,rCL,xCL]
+SHR[r1,x1,rCL,xCL]
 
 # AVR assembler