all functions returning char in A now have X cleared

git-svn-id: svn://svn.cc65.org/cc65/trunk@1868 b7a2c559-68d2-44c3-8de9-860c34a00d81
2003-01-02 01:50:39 +00:00
parent 38dcb86552
commit e6e35390d1
56 changed files with 239 additions and 279 deletions
--- a/libsrc/geos/disk/Makefile
+++ b/libsrc/geos/disk/Makefile
@@ -11,7 +11,7 @@ S_OBJS	= blkalloc.o calcblksfree.o changediskdevice.o chkdkgeos.o enterturbo.o e
 	  findbambit.o freeblock.o getblock.o getdirhead.o getptrcurdknm.o newdisk.o\
 	  nxtblkalloc.o opendisk.o purgeturbo.o putblock.o putdirhead.o readblock.o\
 	  readbuff.o setnextfree.o setgeosdisk.o writeblock.o writebuff.o verwriteblock.o\
-	  gettrse.o\
+	  gettrse.o setoserror.o\
 	  dio_openclose.o dio_cts.o dio_stc.o dio_read.o dio_write.o dio_writev.o\
 	  dio_params.o

--- a/libsrc/geos/disk/blkalloc.s
+++ b/libsrc/geos/disk/blkalloc.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char BlkAlloc (struct tr_se output[], int length);

-	    .import popax, __oserror
+	    .import popax, setoserror
 	    .export _BlkAlloc

 	    .include "../inc/jumptab.inc"
@@ -19,6 +19,4 @@ _BlkAlloc:
 	sta r4L
 	stx r4H
 	jsr BlkAlloc
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/changediskdevice.s
+++ b/libsrc/geos/disk/changediskdevice.s
@@ -1,19 +1,16 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char ChangeDiskDevice (char newDriveNumber);

-	    .import __oserror
+	    .import setoserror
 	    .export _ChangeDiskDevice

 	    .include "../inc/jumptab.inc"
-	    .include "../inc/geossym.inc"
 	
 _ChangeDiskDevice:
 	jsr ChangeDiskDevice
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/chkdkgeos.s
+++ b/libsrc/geos/disk/chkdkgeos.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char ChkDkGEOS (void);

-	    .import __oserror
+	    .import setoserror
 	    .export _ChkDkGEOS

 	    .include "../inc/jumptab.inc"
@@ -14,6 +14,6 @@
 	
 _ChkDkGEOS:
 	jsr ChkDkGEOS
-	stx __oserror
+	jsr setoserror
 	lda isGEOS
 	rts
--- a/libsrc/geos/disk/dio_write.s
+++ b/libsrc/geos/disk/dio_write.s
@@ -9,7 +9,7 @@
 ; sectnum_t - 16bit
 ;

-	.import		dio_params, __oserror
+	.import		dio_params, setoserror
 	.export		_dio_write
 	.include "../inc/geossym.inc"
 	.include "../inc/jumptab.inc"
@@ -18,8 +18,6 @@

 	jsr dio_params
 	jsr WriteBlock
-	stx __oserror
-	txa
-	rts
+	jmp setoserror

 .endproc
--- a/libsrc/geos/disk/findbambit.s
+++ b/libsrc/geos/disk/findbambit.s
@@ -1,13 +1,14 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char FindBAMBit (struct tr_se *TS);
 ; (might be called inUSE (if (!inUSE(block))))

 	    .import gettrse
+	    .import return0, return1
 	    .export _FindBAMBit

 	    .include "../inc/jumptab.inc"
@@ -19,7 +20,5 @@ _FindBAMBit:
 	stx r6H
 	jsr FindBAMBit
 	bne inUse
-	lda #0
-	rts
-inUse:	lda #$ff 
-	rts
+	jmp return0
+inUse:	jmp return1
--- a/libsrc/geos/disk/freeblock.s
+++ b/libsrc/geos/disk/freeblock.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char FreeBlock (struct tr_se *TS);

-	    .import gettrse, __oserror
+	    .import gettrse, setoserror
 	    .export _FreeBlock

 	    .include "../inc/jumptab.inc"
@@ -17,6 +17,4 @@ _FreeBlock:
 	sta r6L
 	stx r6H
 	jsr FreeBlock
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/getblock.s
+++ b/libsrc/geos/disk/getblock.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char GetBlock (struct tr_se *myTS, char *buffer);

-	    .import popax, __oserror
+	    .import popax, setoserror
 	    .import gettrse
 	    .export _GetBlock

@@ -21,6 +21,4 @@ _GetBlock:
 	sta r1L
 	stx r1H
 	jsr GetBlock
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/getdirhead.s
+++ b/libsrc/geos/disk/getdirhead.s
@@ -1,19 +1,16 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char GetDirHead (void);

-	    .import __oserror
+	    .import setoserror
 	    .export _GetDirHead

 	    .include "../inc/jumptab.inc"
-	    .include "../inc/geossym.inc"
-	
+
 _GetDirHead:
 	jsr GetDirHead
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/newdisk.s
+++ b/libsrc/geos/disk/newdisk.s
@@ -1,19 +1,16 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char NewDisk (void);

-	    .import __oserror
+	    .import setoserror
 	    .export _NewDisk

 	    .include "../inc/jumptab.inc"
-	    .include "../inc/geossym.inc"
 	
 _NewDisk:
 	jsr NewDisk
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/nxtblkalloc.s
+++ b/libsrc/geos/disk/nxtblkalloc.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char NxtBlkAlloc (struct tr_se *startTS, struct tr_se output[], int length );

-	    .import popax, __oserror
+	    .import popax, setoserror
 	    .import gettrse
 	    .importzp ptr4
 	    .export _NxtBlkAlloc
@@ -25,6 +25,4 @@ _NxtBlkAlloc:
 	sta r3L
 	stx r3H
 	jsr NxtBlkAlloc
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/opendisk.s
+++ b/libsrc/geos/disk/opendisk.s
@@ -1,19 +1,16 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char OpenDisk (void);

-	    .import __oserror
+	    .import setoserror
 	    .export _OpenDisk

 	    .include "../inc/jumptab.inc"
-	    .include "../inc/geossym.inc"
 	
 _OpenDisk:
 	jsr OpenDisk
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/putblock.s
+++ b/libsrc/geos/disk/putblock.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char PutBlock (struct tr_se *myTS, char *buffer);

-	    .import popax, __oserror
+	    .import popax, setoserror
 	    .import gettrse
 	    .export _PutBlock

@@ -21,6 +21,4 @@ _PutBlock:
 	sta r1L
 	stx r1H
 	jsr PutBlock
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/putdirhead.s
+++ b/libsrc/geos/disk/putdirhead.s
@@ -1,19 +1,16 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.99, 2.1.2003

 ; char PutDirHead (void);

-	    .import __oserror
+	    .import setoserror
 	    .export _PutDirHead

 	    .include "../inc/jumptab.inc"
-	    .include "../inc/geossym.inc"
 	
 _PutDirHead:
 	jsr PutDirHead
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/readblock.s
+++ b/libsrc/geos/disk/readblock.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char ReadBlock (struct tr_se myTS, char *buffer);

-	    .import popax, __oserror
+	    .import popax, setoserror
 	    .import gettrse
 	    .export _ReadBlock

@@ -21,6 +21,4 @@ _ReadBlock:
 	sta r1L
 	stx r1H
 	jsr ReadBlock
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/readbuff.s
+++ b/libsrc/geos/disk/readbuff.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 26.10.99
+; 26.10.1999, 2.1.2003

 ; char ReadBuff  (struct tr_se);

-	    .import __oserror
+	    .import setoserror
 	    .import gettrse
 	    .export _ReadBuff

@@ -18,6 +18,4 @@ _ReadBuff:
 	sta r1L
 	stx r1H
 	jsr ReadBuff
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/setgeosdisk.s
+++ b/libsrc/geos/disk/setgeosdisk.s
@@ -1,19 +1,16 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char SetGEOSDisk (void);

-	    .import __oserror
+	    .import setoserror
 	    .export _SetGEOSDisk

 	    .include "../inc/jumptab.inc"
-	    .include "../inc/geossym.inc"

 _SetGEOSDisk:
 	jsr SetGEOSDisk
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/setoserror.s
+++ b/libsrc/geos/disk/setoserror.s
@@ -0,0 +1,16 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 2.1.2003
+;
+
+	    .export setoserror
+	    .import __oserror
+
+setoserror:
+	    stx __oserror
+	    txa
+	    ldx #0		; X is cleared (high byte for promoting char to int)
+	    tay			; Y register is used just to save flags state
+	    rts
--- a/libsrc/geos/disk/verwriteblock.s
+++ b/libsrc/geos/disk/verwriteblock.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char VerWriteBlock (struct tr_se *myTS, char *buffer);

-	    .import popax, __oserror
+	    .import popax, setoserror
 	    .import gettrse
 	    .export _VerWriteBlock

@@ -21,6 +21,4 @@ _VerWriteBlock:
 	sta r1L
 	stx r1H
 	jsr VerWriteBlock
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/writeblock.s
+++ b/libsrc/geos/disk/writeblock.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003

 ; char WriteBlock (struct tr_se *myTS, char *buffer);

-	    .import popax, __oserror
+	    .import popax, setoserror
 	    .import gettrse
 	    .export _WriteBlock

@@ -21,6 +21,4 @@ _WriteBlock:
 	sta r1L
 	stx r1H
 	jsr WriteBlock
-	stx __oserror
-	txa
-	rts
+	jmp setoserror
--- a/libsrc/geos/disk/writebuff.s
+++ b/libsrc/geos/disk/writebuff.s
@@ -1,12 +1,12 @@

 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 26.10.99
+; 26.10.1999, 2.1.2003

 ; char WriteBuff (struct tr_se*);

-	    .import __oserror
+	    .import setoserror
 	    .import gettrse
 	    .export _WriteBuff

@@ -18,6 +18,4 @@ _WriteBuff:
 	sta r1L
 	stx r1H
 	jsr WriteBuff
-	stx __oserror
-	txa
-	rts
+	jmp setoserror