Fixed to build with latest tools.

jefftranter · Apr 22, 2015 · 8ded04d · 8ded04d
1 parent 03844c4
commit 8ded04d
Show file tree

Hide file tree

Showing 27 changed files with 118 additions and 60 deletions.
diff --git a/asm/6522via/Makefile b/asm/6522via/Makefile
@@ -4,55 +4,55 @@ exp1.mon: exp1.bin
 	bintomon -v exp1.bin >exp1.mon
 
 exp1.bin: exp1.o
-	ld65 -t replica1 -vm -m exp1.map -o exp1.bin exp1.o
+	ld65 -t none -vm -m exp1.map -o exp1.bin exp1.o
 
 exp1.o: exp1.s
-	ca65 -g -l exp1.s
+	ca65 -g -l exp1.lst exp1.s
 
 exp2.mon: exp2.bin
 	bintomon -v exp2.bin >exp2.mon
 
 exp2.bin: exp2.o
-	ld65 -t replica1 -vm -m exp2.map -o exp2.bin exp2.o
+	ld65 -t none -vm -m exp2.map -o exp2.bin exp2.o
 
 exp2.o: exp2.s
-	ca65 -g -l exp2.s
+	ca65 -g -l exp2.lst exp2.s
 
 exp3.mon: exp3.bin
 	bintomon -v exp3.bin >exp3.mon
 
 exp3.bin: exp3.o
-	ld65 -t replica1 -vm -m exp3.map -o exp3.bin exp3.o
+	ld65 -t none -vm -m exp3.map -o exp3.bin exp3.o
 
 exp3.o: exp3.s
-	ca65 -g -l exp3.s
+	ca65 -g -l exp3.lst exp3.s
 
 exp4.mon: exp4.bin
 	bintomon -v exp4.bin >exp4.mon
 
 exp4.bin: exp4.o
-	ld65 -t replica1 -vm -m exp4.map -o exp4.bin exp4.o
+	ld65 -t none -vm -m exp4.map -o exp4.bin exp4.o
 
 exp4.o: exp4.s
-	ca65 -g -l exp4.s
+	ca65 -g -l exp4.lst exp4.s
 
 exp5.mon: exp5.bin
 	bintomon -v exp5.bin >exp5.mon
 
 exp5.bin: exp5.o
-	ld65 -t replica1 -vm -m exp5.map -o exp5.bin exp5.o
+	ld65 -t none -vm -m exp5.map -o exp5.bin exp5.o
 
 exp5.o: exp5.s
-	ca65 -g -l exp5.s
+	ca65 -g -l exp5.lst exp5.s
 
 exp6.mon: exp6.bin
 	bintomon -v exp6.bin >exp6.mon
 
 exp6.bin: exp6.o
-	ld65 -t replica1 -vm -m exp6.map -o exp6.bin exp6.o
+	ld65 -t none -vm -m exp6.map -o exp6.bin exp6.o
 
 exp6.o: exp6.s
-	ca65 -g -l exp6.s
+	ca65 -g -l exp6.lst exp6.s
 
 clean:
 	$(RM) *.o *.lst *.mon *.map *.bin

diff --git a/asm/6551acia/Makefile b/asm/6551acia/Makefile
@@ -4,19 +4,19 @@ exp1.mon: exp1.bin
 	bintomon -v exp1.bin >exp1.mon
 
 exp1.bin: exp1.o
-	ld65 -t replica1 -vm -m exp1.map -o exp1.bin exp1.o
+	ld65 -t none -vm -m exp1.map -o exp1.bin exp1.o
 
 exp1.o: exp1.s
-	ca65 -g -l exp1.s
+	ca65 -g -l exp1.lst exp1.s
 
 jmon.mon: jmon.bin
 	bintomon jmon.bin >jmon.mon
 
 jmon.bin: jmon.o
-	ld65 -t replica1 -vm -m jmon.map -o jmon.bin jmon.o
+	ld65 -t none -vm -m jmon.map -o jmon.bin jmon.o
 
 jmon.o:	jmon.s
-	ca65 -g -l jmon.s
+	ca65 -g -l jmon.lst jmon.s
 
 clean:
 	$(RM) *.o *.lst *.mon *.map *.bin

diff --git a/asm/65816/Makefile b/asm/65816/Makefile
@@ -0,0 +1,11 @@
+SUBDIRS = debug16 demos
+
+all:
+	@for i in $(SUBDIRS); do \
+	echo "make all in $$i..."; \
+	(cd "$$i"; $(MAKE) $(MFLAGS) all); done
+
+clean:
+	@for i in $(SUBDIRS); do \
+	echo "Clearing in $$i..."; \
+	(cd "$$i"; $(MAKE) $(MFLAGS) clean); done
diff --git a/asm/65816/debug16/Makefile b/asm/65816/debug16/Makefile
@@ -4,10 +4,10 @@ debug16.mon: debug16.bin
 	bintomon -l 0x6000 -r - debug16.bin >debug16.mon
 
 debug16.bin: debug16.o
-	ld65 -t replica1 -vm -m debug16.map -o debug16.bin debug16.o
+	ld65 -t none -vm -m debug16.map -o debug16.bin debug16.o
 
 debug16.o: debug16.s
-	ca65 -g -l debug16.s
+	ca65 -g -l debug16.lst debug16.s
 
 clean:
 	$(RM) *.o *.lst *.mon *.map *.bin

diff --git a/asm/65816/debug16/debug16.s b/asm/65816/debug16/debug16.s
@@ -538,7 +538,7 @@ MAKEHEX: SEP #M+IX      ; ALL EIGHT BIT
                         ; FALL THROUGH TO CONVERT
 
 FORMNIB: CMP #$A        ; IF GREATER THAN OR EQUAL TO
- BGE HEXDIG             ; 10, USE DIGITS A..F
+ BCS HEXDIG             ; 10, USE DIGITS A..F
  CLC                    ; ELSE SIMPLY ADD ‘0' TO
  ADC #'0'               ; CONVERT TO ASCII
  RTS
@@ -625,7 +625,7 @@ UPDATE:
  BIT #$F+2              ; IS LSD+2 ZERO?
  BNE CHKA               ; CHECK ACCUMULATOR OPCODES
  CMP #PREG              ; MUST = LDY# OR GREATER
- BLT CHKA               ; NO, MAYBE ACCUMULATOR
+ BCC CHKA               ; NO, MAYBE ACCUMULATOR
  LDA PREG               ; IF IT IS, WHAT IS FLAG SETTING?
  AND #IX
  BEQ LONG               ; CLEAR – 16 BIT MODE
@@ -745,7 +745,7 @@ TRACE:
 
  LDX BRKN+1             ; FIND OUT WHERE BRKN POINTS TO
  CPX #$C000             ; MAKE SURE IT'S RAM ON AN APPLE
- BLT @OK
+ BCC @OK
  JMP QUIT               ; MIGHT AS WELL GIVE UP NOW...
 @OK: STX USRBRKN
 
@@ -984,7 +984,7 @@ HIT: SEP #IX
 
  TXA                    ; IF INDEX WAS LESS THAN 9, IT'S
  CMP #9                 ; A BRANCH
- BGE NOTBR
+ BCS NOTBR
 
  LSR A                  ; SEE IF ‘ODD OR EVEN'
  TAX

diff --git a/asm/Apple][DOS/Makefile b/asm/Apple][DOS/Makefile
@@ -6,10 +6,10 @@ apple_dos.bin: apple_dos.o
 	ld65 -t apple2 -vm -m apple_dos.map -o apple_dos.bin apple_dos.o
 
 apple_dos_rw.o:	apple_dos_rw.s
-	ca65 -g -l apple_dos_rw.s
+	ca65 -g -l apple_dos_rw.lst apple_dos_rw.s
 
 apple_dos.o:	apple_dos.s
-	ca65 -g -l apple_dos.s
+	ca65 -g -l apple_dos.lst apple_dos.s
 
 clean:
 	$(RM) *.o *.lst *.map *.bin

diff --git a/asm/Apple][Monitor/Makefile b/asm/Apple][Monitor/Makefile
@@ -4,10 +4,10 @@ appleiimonitor.mon: appleiimonitor.bin
 	bintomon -v `./getaddress` appleiimonitor.bin >appleiimonitor.mon
 
 appleiimonitor.bin: appleiimonitor.o
-	ld65 -t replica1 -vm -m appleiimonitor.map -o appleiimonitor.bin appleiimonitor.o
+	ld65 -t none -vm -m appleiimonitor.map -o appleiimonitor.bin appleiimonitor.o
 
 appleiimonitor.o: appleiimonitor.s
-	ca65 -g -l appleiimonitor.s
+	ca65 -g -l appleiimonitor.lst appleiimonitor.s
 
 clean:
 	$(RM) *.o *.lst *.mon *.map *.bin

diff --git a/asm/Apple][Monitor/getaddress b/asm/Apple][Monitor/getaddress
@@ -3,6 +3,6 @@
 # Get load and run addresses from map file and output in hex in format
 # to be used as arguments to the bintomon program.
 
-L=`grep "REL      " appleiimonitor.map | awk '{ print $5 }'`
-R=`grep "MON      " appleiimonitor.map | awk '{ print $2 }'`
+L=`grep "REL      " appleiimonitor.map | head -1 | awk '{ print $5 }'`
+R=`grep "MON      " appleiimonitor.map | head -1 | awk '{ print $2 }'`
 echo "-l 0x$L -r 0x$R"
diff --git a/asm/BeyondGames/Makefile b/asm/BeyondGames/Makefile
@@ -7,10 +7,10 @@ C13.bin: C13.o
 	ld65 -t none -vm -m C13.map -o C13.bin C13.o
 
 C1.o:	C1.s
-	ca65 -g -l --feature labels_without_colons --feature pc_assignment C1.s
+	ca65 -g -l C1.lst --feature labels_without_colons --feature pc_assignment C1.s
 
 C13.o: C13.s
-	ca65 -g -l --feature labels_without_colons --feature pc_assignment C13.s
+	ca65 -g -l C13.lst --feature labels_without_colons --feature pc_assignment C13.s
 
 clean:
 	$(RM) *.o *.lst *.mon *.map *.bin ALL.bas

diff --git a/asm/Makefile b/asm/Makefile
@@ -0,0 +1,30 @@
+SUBDIRS = \
+    2ksa \
+    6522via \
+    6551acia \
+    65816 \
+    a1basic \
+    Apple][DOS \
+    Apple][Monitor \
+    BeyondGames \
+    disasm \
+    ehbasic \
+    jmon \
+    KIM-1 \
+    msbasic \
+    OSI \
+    sweet16 \
+    tinybasic \
+    wozaci \
+    wozfp \
+    wozmon \
+
+all:
+	@for i in $(SUBDIRS); do \
+	echo "make all in $$i..."; \
+	(cd "$$i"; $(MAKE) $(MFLAGS) all); done
+
+clean:
+	@for i in $(SUBDIRS); do \
+	echo "Clearing in $$i..."; \
+	(cd "$$i"; $(MAKE) $(MFLAGS) clean); done
diff --git a/asm/a1basic/Makefile b/asm/a1basic/Makefile
@@ -1,11 +1,13 @@
+all: a1basic.mon
+
 a1basic.mon: a1basic.bin
 	bintomon -v `./getaddress` a1basic.bin >a1basic.mon
 
 a1basic.bin: a1basic.o
-	ld65 -t replica1 -vm -m a1basic.map -o a1basic.bin a1basic.o
+	ld65 -t none -vm -m a1basic.map -o a1basic.bin a1basic.o
 
 a1basic.o:	a1basic.s
-	ca65 -g -l a1basic.s
+	ca65 -g -l a1basic.lst a1basic.s
 
 clean:
 	$(RM) *.o *.lst *.map *.bin

diff --git a/asm/a1basic/getaddress b/asm/a1basic/getaddress
@@ -3,6 +3,6 @@
 # Get load and run addresses from map file and output in hex in format
 # to be used as arguments to the bintomon program.
 
-L=`grep "START    " a1basic.map | awk '{ print $2 }'`
-R=`grep "START    " a1basic.map | awk '{ print $2 }'`
+L=`grep "START    " a1basic.map | head -1 | awk '{ print $2 }'`
+R=`grep "START    " a1basic.map | head -1 | awk '{ print $2 }'`
 echo "-l 0x$L -r 0x$R"
diff --git a/asm/disasm/Makefile b/asm/disasm/Makefile
@@ -1,11 +1,13 @@
+all: disasm.mon
+
 disasm.mon: disasm.bin
 	bintomon disasm.bin >disasm.mon
 
 disasm.bin: disasm.o
-	ld65 -t replica1 -vm -m disasm.map -o disasm.bin disasm.o
+	ld65 -t none -vm -m disasm.map -o disasm.bin disasm.o
 
 disasm.o:	disasm.s
-	ca65 -g -l disasm.s
+	ca65 -g -l disasm.lst disasm.s
 
 archive: disasm.mon
 	zip disasm-0.9.zip disasm.s disasm.mon Makefile README.txt LICENSE-2.0.txt

diff --git a/asm/ehbasic/Makefile b/asm/ehbasic/Makefile
@@ -1,12 +1,14 @@
 # Adjust the run address to match the .org in the source code
+all: basic.mon
+
 basic.mon: basic.bin
 	bintomon -v -l 0x5000 basic.bin >basic.mon
 
 basic.bin: basic.o
-	ld65 -t replica1 -vm -m basic.map -o basic.bin basic.o
+	ld65 -t none -vm -m basic.map -o basic.bin basic.o
 
 basic.o: basic.asm min_mon.asm
-	ca65 -g -l --feature labels_without_colons -o basic.o min_mon.asm
+	ca65 -g -l min_mon.lst --feature labels_without_colons -o basic.o min_mon.asm
 
 clean:
 	$(RM) *.o *.lst *.map *.bin

diff --git a/asm/msbasic/Makefile b/asm/msbasic/Makefile
@@ -1,3 +1,5 @@
+all: default
+
 default:
 	cd msbasic ; ./make.sh
 

diff --git a/asm/msbasic/msbasic/float.s b/asm/msbasic/msbasic/float.s
@@ -774,7 +774,7 @@ FDIVT:
         jsr     ADD_EXPONENTS
         inc     FAC
         beq     JOV
-        ldx     #-MANTISSA_BYTES
+        ldx     #<-MANTISSA_BYTES
         lda     #$01
 L39A1:
         ldy     ARG+1
@@ -1446,7 +1446,7 @@ L3C8C:
         ldy     #>CON_BILLION
         jsr     FMULT
 .ifdef CONFIG_SMALL
-        lda     #-6 ; exponent adjustment
+        lda     #<-6 ; exponent adjustment
 .else
         lda     #-9
 .endif

diff --git a/asm/msbasic/msbasic/make.sh b/asm/msbasic/msbasic/make.sh
@@ -6,7 +6,7 @@ fi
 for i in osi; do
 
 echo $i
-ca65 -l -D $i msbasic.s -o tmp/$i.o &&
+ca65 -l msbasic.lst -D $i msbasic.s -o tmp/$i.o &&
 ld65 -vm -m tmp/$i.map -C $i.cfg tmp/$i.o -o tmp/$i.bin -Ln tmp/$i.lbl
 done
 

diff --git a/asm/msbasic/msbasic/memory.s b/asm/msbasic/msbasic/memory.s
@@ -136,7 +136,7 @@ L2300:
         dex
         bpl     L2300
         jsr     GARBAG
-        ldx     #TEMP1-FAC+1
+        ldx     #<(TEMP1-FAC+1)
 L230B:
         pla
         sta     FAC,x

diff --git a/asm/sweet16/Makefile b/asm/sweet16/Makefile
@@ -4,13 +4,13 @@ sweet16.mon: sweet16.bin
 	bintomon -l 0x289 sweet16.bin >sweet16.mon
 
 sweet16.bin: sweet16.o
-	ld65 -t replica1 -vm -m sweet16.map -o sweet16.bin sweet16.o
+	ld65 -t none -vm -m sweet16.map -o sweet16.bin sweet16.o
 
 sweet16.o: sweet16.s
-	ca65 -g -l sweet16.s
+	ca65 -g -l sweet16.lst sweet16.s
 
 test.o: test.s
-	ca65 -g -l test.s
+	ca65 -g -l test.lst test.s
 
 clean:
 	$(RM) *.o *.lst *.mon *.map *.bin

diff --git a/asm/tinybasic/Makefile b/asm/tinybasic/Makefile
@@ -1,4 +1,7 @@
 # Adjust the run address to match the .org in the source code
+
+all: TinyBasic.mon
+
 TinyBasic.mon: TinyBasic.bin
 	bintomon -v -l 0x7600 TinyBasic.bin >TinyBasic.mon
 

diff --git a/asm/wozaci/Makefile b/asm/wozaci/Makefile
@@ -1,11 +1,13 @@
+all: wozaci.mon
+
 wozaci.mon: wozaci.bin
 	bintomon -v `./getaddress` wozaci.bin >wozaci.mon
 
 wozaci.bin: wozaci.o
-	ld65 -t replica1 -vm -m wozaci.map -o wozaci.bin wozaci.o
+	ld65 -t none -vm -m wozaci.map -o wozaci.bin wozaci.o
 
 wozaci.o: wozaci.s
-	ca65 -g -l wozaci.s
+	ca65 -g -l wozaci.lst wozaci.s
 
 clean:
 	$(RM) *.o *.lst *.map *.bin

diff --git a/asm/wozaci/getaddress b/asm/wozaci/getaddress
@@ -3,6 +3,6 @@
 # Get load and run addresses from map file and output in hex in format
 # to be used as arguments to the bintomon program.
 
-L=`grep "WOZACI   " wozaci.map | awk '{ print $2 }'`
-R=`grep "WOZACI   " wozaci.map | awk '{ print $2 }'`
+L=`grep "WOZACI   " wozaci.map | head -1 | awk '{ print $2 }'`
+R=`grep "WOZACI   " wozaci.map | head -1 | awk '{ print $2 }'`
 echo "-l 0x$L -r 0x$R"