Get the sysalias command building. It seems to work fine, except that BRIDGE.S16 is missing,

so under GS/OS we can't launch an S16 file from Davex (including one generated by sysalias).
2025-10-24 11:20:48 -07:00 · 2020-08-22 01:25:57 -07:00
parent 4b4b323dc1
commit 7cafe76b9a
2 changed files with 57 additions and 55 deletions
--- a/build/build-xtn.xml
+++ b/build/build-xtn.xml
@@ -63,7 +63,7 @@
 		<exec dir="${srcdir}" executable="${assemblerPath}/ca65"><arg line="-t none -I . -l ${srcdir}/xtn/2/setstart.lst ${srcdir}/xtn/2/setstart.asm -o ${obj2xtndir}/setstart.o" /></exec>
 		<exec dir="${srcdir}" executable="${assemblerPath}/ca65"><arg line="-t none -I . -l ${srcdir}/xtn/2/storage.lst ${srcdir}/xtn/2/storage.asm -o ${obj2xtndir}/storage.o" /></exec>
 		<exec dir="${srcdir}" executable="${assemblerPath}/ca65"><arg line="-t none -I . -l ${srcdir}/xtn/2/strings.lst ${srcdir}/xtn/2/strings.asm -o ${obj2xtndir}/strings.o" /></exec>
-<!--		<exec dir="${srcdir}" executable="${assemblerPath}/ca65"><arg line="-t none -I . -l ${srcdir}/xtn/2/sysalias.lst ${srcdir}/xtn/2/sysalias.asm -o ${obj2xtndir}/sysalias.o" /></exec> -->
+		<exec dir="${srcdir}" executable="${assemblerPath}/ca65"><arg line="-t none -I . -l ${srcdir}/xtn/2/sysalias.lst ${srcdir}/xtn/2/sysalias.asm -o ${obj2xtndir}/sysalias.o" /></exec>
 		<exec dir="${srcdir}" executable="${assemblerPath}/ca65"><arg line="-t none -I . -l ${srcdir}/xtn/2/vrestore.lst ${srcdir}/xtn/2/vrestore.asm -o ${obj2xtndir}/vrestore.o" /></exec>
 		<exec dir="${srcdir}" executable="${assemblerPath}/ca65"><arg line="-t none -I . -l ${srcdir}/xtn/2/vstore.lst ${srcdir}/xtn/2/vstore.asm -o ${obj2xtndir}/vstore.o" /></exec>
 		<exec dir="${srcdir}" executable="${assemblerPath}/ca65"><arg line="-t none -I . -l ${srcdir}/xtn/2/what.lst ${srcdir}/xtn/2/what.asm -o ${obj2xtndir}/what.o" /></exec>
@@ -128,7 +128,7 @@
 		<exec dir="${obj2xtndir}" executable="${assemblerPath}/ld65"><arg line="-o setstart -m setstart.map -C ${srcdir}/xtn/2/xtn_9000.cfg setstart.o" /></exec>
 		<exec dir="${obj2xtndir}" executable="${assemblerPath}/ld65"><arg line="-o storage -m storage.map -C ${srcdir}/xtn/2/xtn_a000.cfg storage.o" /></exec>
 		<exec dir="${obj2xtndir}" executable="${assemblerPath}/ld65"><arg line="-o strings -m strings.map -C ${srcdir}/xtn/2/xtn_a000.cfg strings.o" /></exec>
-<!--		<exec dir="${obj2xtndir}" executable="${assemblerPath}/ld65"><arg line="-o sysalias -m sysalias.map -C ${srcdir}/xtn/2/xtn_a000.cfg sysalias.o" /></exec> -->
+		<exec dir="${obj2xtndir}" executable="${assemblerPath}/ld65"><arg line="-o sysalias -m sysalias.map -C ${srcdir}/xtn/2/xtn_a000.cfg sysalias.o" /></exec>
 		<exec dir="${obj2xtndir}" executable="${assemblerPath}/ld65"><arg line="-o vrestore -m vrestore.map -C ${srcdir}/xtn/2/xtn_a800.cfg vrestore.o" /></exec>
 		<exec dir="${obj2xtndir}" executable="${assemblerPath}/ld65"><arg line="-o vstore -m vstore.map -C ${srcdir}/xtn/2/xtn_a800.cfg vstore.o" /></exec>
 		<exec dir="${obj2xtndir}" executable="${assemblerPath}/ld65"><arg line="-o what -m what.map -C ${srcdir}/xtn/2/xtn_9000.cfg what.o" /></exec>
@@ -204,7 +204,7 @@
 		<appleCommander command="p" input="${obj2xtndir}/setstart" imagename="${distdir}/DavexProDOS.po" filename="xtn/setstart" type="p8c" address="32769"/>
 		<appleCommander command="p" input="${obj2xtndir}/storage" imagename="${distdir}/DavexProDOS.po" filename="xtn/storage" type="p8c" address="32769"/>
 		<appleCommander command="p" input="${obj2xtndir}/strings" imagename="${distdir}/DavexProDOS.po" filename="xtn/strings" type="p8c" address="32769"/>
-<!--		<appleCommander command="p" input="${obj2xtndir}/sysalias" imagename="${distdir}/DavexProDOS.po" filename="xtn/sysalias" type="p8c" address="32769"/> -->
+		<appleCommander command="p" input="${obj2xtndir}/sysalias" imagename="${distdir}/DavexProDOS.po" filename="xtn/sysalias" type="p8c" address="32769"/>
 		<appleCommander command="p" input="${obj2xtndir}/vrestore" imagename="${distdir}/DavexProDOS.po" filename="xtn/vrestore" type="p8c" address="32769"/>
 		<appleCommander command="p" input="${obj2xtndir}/vstore" imagename="${distdir}/DavexProDOS.po" filename="xtn/vstore" type="p8c" address="32769"/>
 		<appleCommander command="p" input="${obj2xtndir}/what" imagename="${distdir}/DavexProDOS.po" filename="xtn/what" type="p8c" address="32769"/>
--- a/src/xtn/2/sysalias.asm
+++ b/src/xtn/2/sysalias.asm
@@ -93,7 +93,7 @@ path1	= xczpage	;ds 2
 path2	= path1+2	;ds 2
 stpath	= path2+2	;ds 2
 pfxptr	= stpath+2	;ds 2
-s16_flag	= pfxptr+2	;ds 2
+s16_flag	= pfxptr+2	;ds 1
 ; dend
 ;*********************************************
 myerror:	jmp xProDOS_err
@@ -215,7 +215,7 @@ copyname:	lda (path1),y
 	sta TheImage+thePathOffset,y
 	sta TheImage+S16QuitToOffset,y
 	dey
-	cpy #-1
+	cpy #<-1
 	bne copyname
 ;
 ; copy prefix into buffer if -p given
@@ -240,7 +240,7 @@ copyPfx:	lda (pfxptr),y
 	sta TheImage+thePrefixOffset,y
 	sta TheImage+S16PrefixOffset,y
 	dey
-	cpy #-1
+	cpy #<-1
 	bne copyPfx
 nopfx	= *
 ;
@@ -287,7 +287,7 @@ write_ref:	.res 1

 write_s16:	.byte 4
 write_ref2:	.res 1
-	.addr TheImage+s16imageOffset
+	.addr TheImage+S16ImageOffset
 	.addr s16image_end-s16image
 	.addr 0
 ;***********************************************
@@ -377,10 +377,10 @@ read_ref:	.byte 1
 ; there.
 ;
 ;***********************************************
-TheImage:	proc export
-
-image:	proc export, temporg $1000
+TheImage:	; proc export

+	.org $1000
+image:	; proc export, temporg $1000
 ;diff1	= $1000-image
 ;diff2	= $2000-image

@@ -451,7 +451,7 @@ noSetP	= *
 i_copycb:	lda $1006,y
 	sta $2006,y
 	dey
-	cpy #-1
+	cpy #<-1
 	bne i_copycb
 i_nocopy	= *
 ;
@@ -459,7 +459,7 @@ i_nocopy	= *
 cppath280:	lda thePath,y  ; +diff1
 	sta $280,y
 	dey
-	cpy #-1
+	cpy #<-1
 	bne cppath280
 	jmp $2000
 ;
@@ -495,54 +495,56 @@ thePrefix:
 	.byte 0,0,0,0,0,0,0,0,0,0
 	.byte 0,0,0,0,0,0,0,0,0,0
 	.byte 0,0,0,0,0
-image_end
+image_end:
+
 ;********************************************
-	export s16image
+;	export s16image
 s16image:
-	hex ED0100000000000070010000FF0A0402
-	hex 00000100000000000000000000000000
-	hex 00000100000000002C00400020202020
-	hex 20202020202020202020202020202020
-	hex F2700100004BABADE600F00A22A800E1
-	hex 090098000000AD2F0129FF00F06B4848
-	hex F4000018690A00488D9E0048A2020222
-	hex 0000E1F400C04848A20209220000E168
-	hex 8DA000688DA200B040F40000F42701AD
-	hex A20048ADA00048F40000AD9E0048A202
-	hex 28220000E1F40100F40100ADA20048AD
-	hex A00048A20115220000E1ADA20048ADA0
-	hex 0048A20210220000E122A800E1290090
-	hex 0000000000A5000000000000000000E6
-	hex 000000000000000000
-	hex 51
-	export S16QuitTo
+	.byte $ED,$01,$00,$00,$00,$00,$00,$00,$70,$01,$00,$00,$FF,$0A,$04,$02
+	.byte $00,$00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	.byte $00,$00,$01,$00,$00,$00,$00,$00,$2C,$00,$40,$00,$20,$20,$20,$20
+	.byte $20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
+	.byte $F2,$70,$01,$00,$00,$4B,$AB,$AD,$E6,$00,$F0,$0A,$22,$A8,$00,$E1
+	.byte $09,$00,$98,$00,$00,$00,$AD,$2F,$01,$29,$FF,$00,$F0,$6B,$48,$48
+	.byte $F4,$00,$00,$18,$69,$0A,$00,$48,$8D,$9E,$00,$48,$A2,$02,$02,$22
+	.byte $00,$00,$E1,$F4,$00,$C0,$48,$48,$A2,$02,$09,$22,$00,$00,$E1,$68
+	.byte $8D,$A0,$00,$68,$8D,$A2,$00,$B0,$40,$F4,$00,$00,$F4,$27,$01,$AD
+	.byte $A2,$00,$48,$AD,$A0,$00,$48,$F4,$00,$00,$AD,$9E,$00,$48,$A2,$02
+	.byte $28,$22,$00,$00,$E1,$F4,$01,$00,$F4,$01,$00,$AD,$A2,$00,$48,$AD
+	.byte $A0,$00,$48,$A2,$01,$15,$22,$00,$00,$E1,$AD,$A2,$00,$48,$AD,$A0
+	.byte $00,$48,$A2,$02,$10,$22,$00,$00,$E1,$22,$A8,$00,$E1,$29,$00,$90
+	.byte $00,$00,$00,$00,$00,$A5,$00,$00,$00,$00,$00,$00,$00,$00,$00,$E6
+	.byte $00,$00,$00,$00,$00,$00,$00,$00,$00
+	.byte $51
+;	export S16QuitTo
 S16QuitTo:
-	hex 000033343536
-	hex 37383132333435363738313233343536
-	hex 37383132333435363738313233343536
-	hex 37383132333435363738313233343536
-	hex 37383132333435363738
-	hex 50
-	Export S16Prefix
+	.byte $00,$00,$33,$34,$35,$36
+	.byte $37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34,$35,$36
+	.byte $37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34,$35,$36
+	.byte $37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34,$35,$36
+	.byte $37,$38,$31,$32,$33,$34,$35,$36,$37,$38
+	.byte $50
+;	Export S16Prefix
 S16Prefix:
-	hex 0000333435
-	hex 36373831323334353637383132333435
-	hex 36373831323334353637383132333435
-	hex 36373831323334353637383132333435
-	hex 3637383132333435363738
-	hex 4F
-	hex 0000000001000000
-	export S16Open
-S16Open:	hex 000033343536373831323334
-	hex 35363738313233343536373831323334
-	hex 35363738313233343536373831323334
-	hex 35363738313233343536373831323334
-	hex 3536373800F504000D009800F502F045
-	hex 002701F504008A009000F504009000A5
-	hex 00F504009A00E600F70F000000000C03
-	hex 12243C40484B4F56676B767A00
-	export s16image_end
+	.byte $00,$00,$33,$34,$35
+	.byte $36,$37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34,$35
+	.byte $36,$37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34,$35
+	.byte $36,$37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34,$35
+	.byte $36,$37,$38,$31,$32,$33,$34,$35,$36,$37,$38
+	.byte $4F
+	.byte $00,$00,$00,$00,$01,$00,$00,$00
+;	export S16Open
+S16Open:	.byte $00,$00,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34
+	.byte $35,$36,$37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34
+	.byte $35,$36,$37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34
+	.byte $35,$36,$37,$38,$31,$32,$33,$34,$35,$36,$37,$38,$31,$32,$33,$34
+	.byte $35,$36,$37,$38,$00,$F5,$04,$00,$0D,$00,$98,$00,$F5,$02,$F0,$45
+	.byte $00,$27,$01,$F5,$04,$00,$8A,$00,$90,$00,$F5,$04,$00,$90,$00,$A5
+	.byte $00,$F5,$04,$00,$9A,$00,$E6,$00,$F7,$0F,$00,$00,$00,$00,$0C,$03
+	.byte $12,$24,$3C,$40,$48,$4B,$4F,$56,$67,$6B,$76,$7A,$00
+;	export s16image_end
 s16image_end:
+
 ;****************************************************
 ;****************************************************
 ;           keep s16image