From: ian <ian>
Date: Sun, 24 Apr 2005 14:20:29 +0000 (+0000)
Subject: Add tst_w; fix incf and decf
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=4b56d70e64a77358999b74788760702deba6af55;p=trains.git

Add tst_w; fix incf and decf
---

diff --git a/iwjpictest/Makefile b/iwjpictest/Makefile
index fc1d501..5d65a44 100644
--- a/iwjpictest/Makefile
+++ b/iwjpictest/Makefile
@@ -22,6 +22,6 @@ insn-check.txt:	insn-makecheck insn-aliases.inc
 		./$^ $o
 
 insn-%.ps:	insn-%.txt Makefile
-		atp -T A4 -B -f Courier7.7 <$< $o
+		atp -T A4 -B -f Courier7.4 <$< $o
 
 copybits.o serialloop.o:	onecopybit.inc
diff --git a/iwjpictest/insn-aliases.inc-gen b/iwjpictest/insn-aliases.inc-gen
index 5235b41..eec19e8 100755
--- a/iwjpictest/insn-aliases.inc-gen
+++ b/iwjpictest/insn-aliases.inc-gen
@@ -146,15 +146,16 @@ ds='Complement (bitwise NOT)';	als_fda_1fw	comf	com_
 ds='Compare; if F==W then...';	als_fa		cpfseq	cmp_fw	_ifne
 ds='Compare; if F<=W then...';	als_fa		cpfsgt	cmp_fw	_ifle
 ds='Compare; if F>=W then...';	als_fa		cpfslt	cmp_fw	_ifge
-ds='Decrement';			als_fda_1fw	dec	dec_
+ds='Decrement';			als_fda_1fw	decf	dec_
 ds='Decrement; if !=0 then...';	als_fda_1fw	decfsz	dec_	_ifnz
 ds='Decrement; if =0 then...';	als_fda_1fw	dcfsnz	dec_	_ifz
-ds='Increment';			als_fda_1fw	inc	inc_
+ds='Increment';			als_fda_1fw	incf	inc_
 ds='Increment; if !=0 then...';	als_fda_1fw	incfsz	inc_	_ifnz
 ds='Increment; if =0 then...';	als_fda_1fw	infsnz	inc_	_ifz
 ds='Move';			als_fa		movf	mov_fw	''	,0
 ds='Move F to same F';		als_fa		movf	mov_fsf	''	,1
 ds='Move (flags unchanged)';	alias_f		movff	mov_ff	f,g	f,g
+ds='Test';			alias_f		movf	tst_w	$w,0,0	'' w
 ds='Negate';			als_fda_1fw	negf	neg_
 ds='Rotate left (through carry)'; als_fda_1fw	rlcf	rlc_
 ds='Rotate left';		als_fda_1fw	rlncf	rl_
@@ -170,6 +171,7 @@ ds='Test; if !=0 then...';	als_fa_1fw	tstfsz	tst_	_ifnz
 # `bit-oriented file register operations' (DS280)
 ds='Bit Clear';		als_fa_1fw	bcf	bc_	''	,b	,b
 ds='Bit Set';		als_fa_1fw	bsf	bs_	''	,b	,b
+ds='Bit Toggle';	als_fa_1fw	btg	btg_	''	,b	,b
 ds='Bit Test; if 1 then...'; als_fa_1fw	btfsc	bt_	_if1	,b	,b
 ds='Bit Test; if 0 then...'; als_fa_1fw	btfss	bt_	_if0	,b	,b
 
@@ -208,16 +210,19 @@ if $macros; then echo ' ; the end'; fi
 exit 0
 #--by-opcode--
 PIC18F458 INSTRUCTIONS AND PROVIDED OPCODE ALIASES  sorted by OPCODE/ALIAS
+
  Our opcode    Args   Notes Description                            Official
  ------------- ------ ----- --------------------------------------- -------
 #--0--
 #--by-desc--
 PIC18F458 INSTRUCTIONS AND PROVIDED OPCODE ALIASES   sorted by DESCRIPTION
+
  Our opcode    Args   Notes Description                            Official
  ------------- ------ ----- --------------------------------------- -------
 #--0--
 #--by-official--
 PIC18F458 INSTRUCTIONS AND PROVIDED OPCODE ALIASES  sorted by OFFICIAL INSN
+
  Our opcode    Args   Notes Description                            Official
  ------------- ------ ----- --------------------------------------- -------
 #--0--
@@ -230,6 +235,6 @@ Notes:  r  Branch uses relative offset.
         u  Official opcode, not an alias/macro.  Listed for completeness.y
 	w  Macro (alias) using WREG (the mapping of W in the Access Bank).
    digits  Gives number of bits of address or offset.
-  Z N C F  Flags affected.  F: all the status flags C DC Z OV N affected.
+  Z N C F  Flags affected (out of C DC Z OV N).  F: all of those affected.
 $Id$
 #--0--