コミット: 7b9a5a57b99fd4578bce153aac53d44f913a5b20 - exorsim6801 (git)

Motorola M6800 (6800) Exorciser / SWTPC emulator plus 6801 instruction set emulation

コミットメタ情報

• リビジョン: 7b9a5a57b99fd4578bce153aac53d44f913a5b20 (tree)
• 日時: 2020-11-17 19:51:19
• 作者: Joel Matthew Rees <joel.rees@gmai...>
• コミッター: Joel Matthew Rees

ログメッセージ

forth conversion complete

変更サマリ

• modified: fig-forth6801_exorsim.68c
• modified: forthtests.fs

差分

--- a/fig-forth6801_exorsim.68c
+++ b/fig-forth6801_exorsim.68c
@@ -361,7 +361,7 @@ PUSHBA	PSH B		8 cycles until 'NEXT'
 * = = = = = = =   t h e   v i r t u a l   m a c h i n e   = = = = =
 *                                                                 =
 NEXT	LDX	IP
-	INX		pre-increment mode
+NEXTWI	INX		pre-increment mode
 	INX
 	STX	IP
 NEXT2	LDX	0,X	get W which points to CFA of word to be done
@@ -1019,7 +1019,7 @@ SEMIS	FDB	*+2
 	INX
 	STX	RP
 	LDX	0,X	get address we have just finished.
-	JMP	NEXT+2	increment the return address & do next word
+	JMP	NEXTWI	increment the return address & do next word
 *
 * ######>> screen 27 <<
 * ======>>  27  <<
@@ -1088,7 +1088,7 @@ ZEQUT	LDD	#1	Make it stealable.
 ZLESS	FDB	*+2
 	TSX
 	LDD	0,X
-	BMI	ZEQUT
+ZLESSQ	BMI	ZEQUT
 ZLESSF	CLR A
 	CLR B
 	JMP	STABX
@@ -1274,11 +1274,7 @@ STORE	FDB	*+2
 	FCB	$A1
 	FDB	STORE-4
 CSTORE	FDB	*+2
-
-	TSX
-	LDX	0,X	get address
-	INS
-	INS
+	PULX	get address
 	INS
 	PUL B
 	STA B	0,X
@@ -1299,16 +1295,14 @@ COLON	FDB	DOCOL,QEXEC,SCSP,CURENT,AT,CONTXT,STORE
 * nested words in the virtual machine:
 * ( ;S is the equivalent un-nester )
 
-DOCOL	LDX	RP	make room in the stack
+DOCOL	LDX	RP	make room in the return stack
 	DEX
 	DEX
 	STX	RP
-	LDA A	IP
-	LDA B	IP+1	
-	STA A	2,X	Store address of the high level word
-	STA B	3,X	that we are starting to execute
+	LDD	IP	Store address of the high level word
+	STD	2,X	that we are starting to execute.
 	LDX	W	Get first sub-word of that definition
-	JMP	NEXT+2	and execute it
+	JMP	NEXTWI	and execute it.
 *
 * ======>>  48  <<
 	FCB	$C1	;   imnediate code
@@ -1325,8 +1319,7 @@ SEMI	FDB	DOCOL,QCSP,COMPIL,SEMIS,SMUDGE,LBRAK
 	FDB	SEMI-4
 CON	FDB	DOCOL,CREATE,SMUDGE,COMMA,PSCODE
 DOCON	LDX	W
-	LDA A	2,X	
-	LDA B	3,X	A & B now contain the constant
+	LDD	2,X	A & B now contain the constant
 	JMP	PUSHBA
 *
 * ======>>  50  <<
@@ -1335,10 +1328,8 @@ DOCON	LDX	W
 	FCB	$C5
 	FDB	CON-11
 VAR	FDB	DOCOL,CON,PSCODE
-DOVAR	LDA A	W
-	LDA B	W+1
-	ADD B	#2
-	ADC A	#0	A,B now contain the address of the variable
+DOVAR	LDD	W
+	ADDD	#2	A,B now contain the address of the variable
 	JMP	PUSHBA
 *
 * ======>>  51  <<
@@ -1348,10 +1339,8 @@ DOVAR	LDA A	W
 	FDB	VAR-11
 USER	FDB	DOCOL,CON,PSCODE
 DOUSER	LDX	W	get offset  into user's table
-	LDA A	2,X
-	LDA B	3,X
-	ADD B	UP+1	add to users base address
-	ADC A	UP
+	LDD	2,X
+	ADDD	UP	add to users base address
 	JMP	PUSHBA	push address of user's variable
 *
 * ######>> screen 35 <<
@@ -1368,6 +1357,9 @@ ZERO	FDB	DOCON
 	FDB	ZERO-4
 ONE	FDB	DOCON
 	FDB	1
+*	FDB	*+2
+*	LDD	#1
+*	JMP	PUSHBA	7 bytes vs. 4, faster, semantic tag as constant altered to machine code
 *
 * ======>>  54  <<
 	FCB	$81
@@ -1626,6 +1618,16 @@ COLUMS	FDB	DOUSER
 	FDB	COLUMS-10
 ONEP	FDB	DOCOL,ONE,PLUS
 	FDB	SEMIS
+*ONEP	FDB	*+2
+*	TSX
+*	LDD	0,X
+*	ADDD	#1
+*	JMP	STABX	9 bytes vs. 6, faster, semantic link to constant broken
+* or
+*	PULX
+*	INX
+*	PSHX
+*	JMP	NEXT	6 bytes vs. 6, faster, semantic link broken
 *
 * ======>>  84  <<
 	FCB	$82
@@ -1642,6 +1644,10 @@ TWOP	FDB	DOCOL,TWO,PLUS
 	FDB	TWOP-5
 HERE	FDB	DOCOL,DP,AT
 	FDB	SEMIS
+*HERE	FDB	*+2
+*	LDX	UP
+*	LDD	XDP-UORIG,X
+*	JMP	PUSHBA		7 bytes vs. 6 bytes, faster, semantic tag altered
 *
 * ======>>  86  <<
 	FCB	$85
@@ -1650,6 +1656,13 @@ HERE	FDB	DOCOL,DP,AT
 	FDB	HERE-7
 ALLOT	FDB	DOCOL,DP,PSTORE
 	FDB	SEMIS
+*ALLOT	FDB *+2
+*	PUL A
+*	PUL B
+*	LDX	UP
+*	ADDD	XDP-UORIG,X
+*	STD	XDP-UORIG,X
+*	JMP	NEXT		11 bytes vs. 6, etc.
 *
 * ======>>  87  <<
 	FCB	$81	; , (COMMA)
@@ -1670,14 +1683,22 @@ CCOMM	FDB	DOCOL,HERE,CSTORE,ONE,ALLOT
 	FCB	$81	; -
 	FCB	$AD
 	FDB	CCOMM-5
-SUB	FDB	DOCOL,MINUS,PLUS
-	FDB	SEMIS
+SUB	FDB	*+2
+	TSX
+	LDD	2,X	Not commutative.
+	SUBD	0,X
+	STD	2,X	TXS would be one byte less, but why jump to a branch?
+	INS
+	INS
+	JMP	NEXT	12 bytes vs. 6, but much faster
+*SUB	FDB	DOCOL,MINUS,PLUS
+*	FDB	SEMIS
 *
 * ======>>  90  <<
 	FCB	$81	=
 	FCB	$BD
 	FDB	SUB-4
-EQUAL	FDB	DOCOL,SUB,ZEQU
+EQUAL	FDB	DOCOL,SUB,ZEQU		and we can use the speedier SUB here.
 	FDB	SEMIS
 *
 * ======>>  91  <<
@@ -1685,21 +1706,13 @@ EQUAL	FDB	DOCOL,SUB,ZEQU
 	FCB	$BC	
 	FDB	EQUAL-4
 LESS	FDB	*+2
-	PUL A
-	PUL B
 	TSX
-	CMP A	0,X
-	INS
-	BGT	LESST
-	BNE	LESSF
-	CMP B	1,X
-	BHI	LESST
-LESSF	CLR B
-	BRA	LESSX
-LESST	LDA B	#1
-LESSX	CLR A
-	INS
-	JMP	PUSHBA
+	LDD	2,X	Not commutative.
+	SUBD	0,X
+	INX
+	INX
+	TXS
+	JMP	ZLESSQ
 *
 * ======>>  92  <<
 	FCB	$81	>
@@ -1978,24 +1991,20 @@ BUILDS	FDB	DOCOL,ZERO,CON
 	FDB	BUILDS-10
 DOES	FDB	DOCOL,FROMR,TWOP,LATEST,PFA,STORE
 	FDB	PSCODE
-DODOES	LDA A	IP
-	LDA B	IP+1
+DODOES	LDD	IP
 	LDX	RP	make room on return stack
 	DEX
 	DEX
 	STX	RP
-	STA A 	2,X	push return address
-	STA B	3,X
+	STD 	2,X	push return address
 	LDX	W	get addr of pointer to run-time code
 	INX
 	INX
 	STX	N	stash it in scratch area
 	LDX	0,X	get new IP
 	STX	IP
-	CLR A		get address of parameter
-	LDA B	#2
-	ADD B	N+1
-	ADC A	N
+	LDD	#2	get address of parameter
+	ADDD	N
 	PSH B		and push it on data stack
 	PSH A
 	JMP	NEXT2
@@ -3319,7 +3328,7 @@ ZZZZ	FDB	0,0,0,0,0,0,0,0	end of rom program
 *
 	ORG	MEMEND	simulating disc on-line
 * SCREEN 0
-	FCC	"0) Index to BIF HI-LEVEL disk                                   "
+	FCC	"0) Index to HI-LEVEL disk                                       "
 	FCC	"1)                                                              "
 	FCC	"2) Title page, Copr. notice                                     "
 	FCC	"3) MONITOR CALL TO DEBUG                                        "

--- a/forthtests.fs
+++ b/forthtests.fs
@@ -33,6 +33,10 @@ SP@ .
 
 SP@ .
 
+FORTH
+
+
+
 45AA 10 SWAP . .
 
 SP@ .