OSI, KIM, CBM1, CBM2 assemble identically

mist64 · mist64 · commit a2b269a4d391 · 2008-10-07T10:05:20.000Z
diff --git a/defines_cbm.s b/defines_cbm.s
@@ -21,6 +21,7 @@ Z16             := $0005
 Z17             := $0006
 Z18             := $0007
 LINNUM          := $0008
+TXPSV			:= $0008
 INPUTBUFFER     := $000A
 TEMPPT          := $0065
 LASTPT          := $0066
@@ -85,11 +86,12 @@ L0001           := $0001
 L0002           := $0002
 GOWARM          := $0003
 Z15             := $0004
-Z16             := $0005
+Z16             := $00C6;05
 Z17             := $0006
 GOSTROUT        := $0006
 Z18             := $0007
 LINNUM          := $0011;0008
+TXPSV			:= $0048
 GOGIVEAYF       := $0008
 INPUTBUFFER     := $0200;00A
 Z03				:= $000E;3 ; same
@@ -163,7 +165,11 @@ RNDSEED			:= $00DA-82
 .endif
 
 BYTES_PER_FRAME := $12
+.ifdef CBM1
 SPACE_FOR_GOSUB := $36
+.else
+SPACE_FOR_GOSUB := $3E
+.endif
 FOR_STACK1		:= $0F
 FOR_STACK2		:= $09
 NUM_TOKENS		:= $23
@@ -215,5 +221,9 @@ MONCOUT	:= CHROUT
 MONRDKEY := GETIN
 
 
-
+.ifdef CBM1
+ENTROPY = $9044
+.else
+ENTROPY = $E844
+.endif
 
diff --git a/defines_kim.s b/defines_kim.s
@@ -20,6 +20,7 @@ Z16             := $0016
 Z17             := $0017
 Z18             := $0018
 LINNUM          := $0019
+TXPSV           := $0019
 INPUTBUFFER     := $001B
 TEMPPT          := $0063
 LASTPT          := $0064
diff --git a/defines_osi.s b/defines_osi.s
@@ -11,6 +11,7 @@ Z16             := $000E
 Z17             := $000F
 Z18             := $0010
 LINNUM          := $0011
+TXPSV           := $0011
 INPUTBUFFER     := $0013
 CHARAC          := $005B
 ENDCHR          := $005C
diff --git a/make.sh b/make.sh
@@ -22,9 +22,9 @@ diff -u kb9.bin.txt kb9-new.bin.txt | head
 # 2
 ca65 -D CBM -D CBM2 -D CONFIG_2 msbasic.s -o cbmbasic2.o &&
 ld65 -C cbmbasic.cfg cbmbasic2.o -o cbmbasic2-new.bin && 
-#xxd -g 1 cbmbasic2.bin > cbmbasic2.bin.txt
-#xxd -g 1 cbmbasic2-new.bin > cbmbasic2-new.bin.txt
-#diff -u cbmbasic2.bin.txt cbmbasic2-new.bin.txt | head
+xxd -g 1 cbmbasic2.bin > cbmbasic2.bin.txt
+xxd -g 1 cbmbasic2-new.bin > cbmbasic2-new.bin.txt
+diff -u cbmbasic2.bin.txt cbmbasic2-new.bin.txt | head
 
-da65 --info cbmbasic2-temp.txt 
+#da65 --info cbmbasic2-temp.txt 
 #opendiff ../cbmbasic2.s cbmbasic2-new.s
diff --git a/msbasic.s b/msbasic.s
