changeset 116:6be44b5de445

fix asm09.game
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Tue, 01 Jan 2019 22:35:50 +0900
parents 54b4e3afcd0e
children f8f44153f8c1
files game09/asm09.game game09/disasm09.game game09/game09.asm
diffstat 3 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/game09/asm09.game	Tue Jan 01 08:57:35 2019 +0900
+++ b/game09/asm09.game	Tue Jan 01 22:35:50 2019 +0900
@@ -28,7 +28,7 @@
 180  E=0 P=1 /"PASS 1"/ C(6)=-1 .=6
 190  @ !=700 L=L+2 !=900 X=0 ;=L:0)="*" #=250
 200  ;=L:X)<>" " !=1000 ;=#L:X) #=250
-210  !=1500 !=W*100+6900
+210  !=1500 !=(W*100)+6900
 215  ;=W=$12 A=A+H:0) #=250
 220  A=A+(C(0)>0)+(C(1)>=0)+(C(2)>=0)+(C(3)>0)
 230  A=A+(C(3)=2)+(C(3)=4)
@@ -38,7 +38,7 @@
 275  P=2 ;=M:0)=0 .=6
 280  @ !=700 C(5)=A X=0 L=L+2 ;=L:0)="*" #=307
 290  !=850 ;=L:X)=0 #=305
-300  !=1500 !=W*100+6900 ;=C(3)>0 !=100*C(3)+3500
+300  !=1500 !=(W*100)+6900 ;=C(3)>0 !=(100*C(3))+3500
 303  !=460
 307  ;=M:0) !=520 #=420
 400  !=900 !=500
@@ -101,7 +101,7 @@
 1568  J=K:2)-"0" G=K:3)-"0" W=K:5)-"0"
 1570  G=G>9*-7+G J=J>9*-7+J W=W>9*-7+W
 1584  ;=K:4)="1" W=W+16
-1590  C(1)=J*16+G ]
+1590  C(1)=(J*16)+G ]
 1595  "OPCODE?" X=X-3 W=13
 1600  Z=0,2 C(Z)=$12 @=Z+1 #=20000
 1700  F=F+1 !=1530 X=X+1 ;=W<>12 ]
@@ -196,11 +196,11 @@
 6020  ;=(B>="A")&(B<="Z") F=F+1 !=2000 B=L:X) #=6100
 6030  ;=B<>"$" #=6060
 6040  X=X+1 B=L:X) ;=(B>"9")&(B<"A")+(B<"0")+(B>"F") #=6100
-6050  @ D=D*16+B-"0" ;=B>"9" D=D-7
+6050  @ D=(D*16)+B-"0" ;=B>"9" D=D-7
 6055  X=X+1 B=L:X)  @=(B>"9")&(B<"A")+(B<"0")+(B>"F")
 6060  ;=B=""" D=L:X+1) X=X+3 B=L:X) #=6100
 6070  ;=(B<"0")+(B>"9") #=6100
-6080  @ D=D*10+B-"0" X=X+1 B=L:X) @=(B<"0")+(B>"9")
+6080  @ D=(D*10)+B-"0" X=X+1 B=L:X) @=(B<"0")+(B>"9")
 6100  ;=B="+" X=X+1 G=D !=6010 D=G+D #=6120
 6101  ;=B="*" X=X+1 G=D !=6010 D=G*D #=6120
 6102  ;=B<>"/" #=6110
@@ -284,7 +284,7 @@
 8502  X=X+1 !=8510 @ K=L:X) X=X+1 @=(K=",")+(K=0)
 8504  ;=#K #=8565
 8505  Y=G !=8510 ;=Y<8<>(G<8) "tfr 16<>8" #=20000
-8508  C(2)=Y*16+G ]
+8508  C(2)=(Y*16)+G ]
 8510  K=L:X)
 8515  ;=K="A" G=8 ]
 8520  ;=K="B" G=9 ]
@@ -302,7 +302,7 @@
 8610  ;=C(1)=$20 C(1)=$16 ]
 8620  ;=C(1)=$8D C(1)=$17 ]
 8630  C(0)=$10 ]
-8700  K=C(1) C(1)=-1 Z=0 !=K*100+8800 H:0)=Z ]
+8700  K=C(1) C(1)=-1 Z=0 !=(K*100)+8800 H:0)=Z ]
 8800  ;=P=2 C(5)=X X=0 !=2000 X=C(5)
 8810  C(5)=Y !=6000 Y=C(5) Y(0)=D C(5)=D ]
 8900  @ X=X+1 !=6000 !=9800
--- a/game09/disasm09.game	Tue Jan 01 08:57:35 2019 +0900
+++ b/game09/disasm09.game	Tue Jan 01 22:35:50 2019 +0900
@@ -2,7 +2,7 @@
 110  "TO     =" D=? @ !=900
 120  @=(A>D) #=-1
 900  / ??=A .=20 E=A !=1000
-910  $=$D .=5 B=0,5 ;=E+B>=A .=3 #=930
+910  / .=5 B=0,5 ;=E+B>=A .=3 #=930
 920  ?$=E:B) " "
 930  @=B+1 .=30 B=0,5 ;=E+B>=A #=970
 950  ;=E:B)>" " $=E:B) #=970
--- a/game09/game09.asm	Tue Jan 01 08:57:35 2019 +0900
+++ b/game09/game09.asm	Tue Jan 01 22:35:50 2019 +0900
@@ -1102,7 +1102,7 @@
         ldx         ,u
         lda         #1
         os9         I$Open
-        bcs         ploaderr
+        bcs         ploader1
         sta         ,s
 ploadloop
         lda         ,s
@@ -1135,6 +1135,7 @@
 ploaderr
         lda         ,s
         os9         I$Close
+ploader1
         puls        a,x,y
         lbra        warmst