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

diff --git a/doc/geos.sgml b/doc/geos.sgml
index 0d1987a9d292d083a638474066286fbdee722787..32996d11417101ae4dcc4b8ee064ebaf626b6e84 100644 (file)
--- a/doc/geos.sgml
+++ b/doc/geos.sgml
@@ -290,7 +290,7 @@ Draws single point on the screen, no matter what the current pattern is.
 <p>
 <tt/char TestPoint (struct pixel *myPixel)/
 <p>
-This function tests if given pixel is set and returns true or false.
+This function tests if given pixel is set and returns <tt/true/ (non-zero) or <tt/false/ (zero).
 
 <sect2>Character and string output
 
@@ -624,6 +624,7 @@ GEOSLib function (if its type is <tt/char/), but in all cases last error is save
 location. If it is nonzero - an error occured. See <tt/gdisk.h/ for the list of possible errorcodes.
 You need to include <tt/errno.h/ to get <tt/__oserror/, together with standard <tt/errno/. The
 latter gives less verbose, but still usable information and can be used with <tt/strerror/.
+Probably you will get more information using <tt/stroserror/ in similar way.
 <p>
 For passing parameters use almost always pointer to your data e.g. <tt/ReadBuff (&amp;myTrSe)/.
 
@@ -1038,7 +1039,7 @@ is also copied.
 <tt/char CmpString (char *s1, char *s2)/
 <p>
 This function compares string <tt/s1/ to <tt/s2/ for equality - this is case sensitive, and both
-strings have to have the same length. It returns either <tt/true/ or <tt/false/.
+strings have to have the same length. It returns either <tt/true/ (non-zero) or <tt/false/ (zero).
 
 <sect2>CopyFString and CmpFString
 <p>

diff --git a/libsrc/geos/conio/where.s b/libsrc/geos/conio/where.s
index fbe3bcebfcbd298d1a7e923b34f59a856fd4c6fd..5690fa6d243abd0a7130b8c8b532ddd89c48e1b7 100644 (file)
--- a/libsrc/geos/conio/where.s
+++ b/libsrc/geos/conio/where.s
@@ -4,6 +4,7 @@
 ;
 ; 27.10.2001
 ; 06.03.2002
+; 02.01.2003
 
 ; unsigned char wherex (void);
 ; unsigned char wherey (void);
@@ -11,10 +12,10 @@
            .export _wherex, _wherey
            .importzp cursor_c, cursor_r
 
-           .include "../inc/jumptab.inc"
-
 _wherex:    lda cursor_c
+           ldx #0
            rts
 
 _wherey:    lda cursor_r
+           ldx #0
            rts

diff --git a/libsrc/geos/devel/fio_module.s b/libsrc/geos/devel/fio_module.s
index dca349712d44693399138717692fba480ac327af..d32f11569c3de8cb21b79decaf506d749f2b0af6 100644 (file)
--- a/libsrc/geos/devel/fio_module.s
+++ b/libsrc/geos/devel/fio_module.s
@@ -57,6 +57,7 @@ _open:
        lda     ptr1
        ldx     ptr1+1
        jsr     _FindFile       ; try to find the file
+       tax
        bne     @error
 
        lda     dirEntryBuf + OFF_DE_TR_SC              ; tr&se for ReadByte (r1)
@@ -139,7 +140,7 @@ _read:
        bne     @L2
        inc     ptr3+1
 
-@L2:   txa                     ; was there error ?
+@L2:   lda     __oserror       ; was there error ?
        beq     @L3
        cmp     #BFR_OVERFLOW   ; EOF?
        bne     @error

diff --git a/libsrc/geos/devel/geos-tgi.s b/libsrc/geos/devel/geos-tgi.s
index ed9a24f681890cb1edfbad357213cdb9f5e34bd8..784d2834b5e174085fdb8265b33bbd1041c623b7 100644 (file)
--- a/libsrc/geos/devel/geos-tgi.s
+++ b/libsrc/geos/devel/geos-tgi.s
@@ -303,6 +303,8 @@ INIT:
 ;
 
 DONE:
+       jsr GETERROR            ; clear error (if any)
+
        lda #0
        jsr SETVIEWPAGE         ; switch into viewpage 0
 
@@ -434,6 +436,8 @@ SETCOLOR:
 ;
 
 SETPALETTE:
+       jsr     GETERROR        ; clear error (if any)
+
         ldy     #PALETTESIZE - 1
 @L1:    lda     (ptr1),y        ; Copy the palette
         and     #$0F            ; Make a valid color

diff --git a/libsrc/geos/disk/Makefile b/libsrc/geos/disk/Makefile
index 519dc0bfb19480f32f6ee6f9de08920181bb0aff..45fed6905db9622b182210fa0d2205b7626ed1c0 100644 (file)
--- 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
 

diff --git a/libsrc/geos/disk/blkalloc.s b/libsrc/geos/disk/blkalloc.s
index 64a665aba5cba73563fd0851162f45176ee67a01..7048400a0ed6a0c2a38b5bab42579d8601b04bb5 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/changediskdevice.s b/libsrc/geos/disk/changediskdevice.s
index 19fbd1c94787b0a613d98556c253bbeab55ba038..6d5aab0709990614bd1c666368a3289620546d3c 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/chkdkgeos.s b/libsrc/geos/disk/chkdkgeos.s
index 8a81d3f6db5f7ed5e3fd2e4489560f6b1f217837..52b7165d408db1edc40778f971146abd0bb2df5c 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/dio_write.s b/libsrc/geos/disk/dio_write.s
index 836157b9fbcc98e117938457ffa42c4832a54e4a..9f522c2df518c6b809507e97ff4f59aaaff4497b 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/findbambit.s b/libsrc/geos/disk/findbambit.s
index 66a6898857602ac6ab61cc9103be66029c6f96a8..22f847be694769d1ef0b0f0de66ef83ddb669f5c 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/freeblock.s b/libsrc/geos/disk/freeblock.s
index effef0a849453131d71f786d270109028713d0bc..63de4d05b28b2de4eb9c77df1421e48744689d13 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/getblock.s b/libsrc/geos/disk/getblock.s
index 2e6d409195db4e6c8dd7e2d03597bed456b1c0d0..8d0d22810ebd8067d1124a2ded0df832cc4b8e2f 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/getdirhead.s b/libsrc/geos/disk/getdirhead.s
index 63fdcad7a398e5de9736d5585a1b250debbcf20d..1794d18898089c57111d320fdfee293bc4fc4fb2 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/newdisk.s b/libsrc/geos/disk/newdisk.s
index d0a23b1e4e6360ad7baadd6e56a164349d84c24e..60862a956ce604dab1aed26368f2a37291a7ef74 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/nxtblkalloc.s b/libsrc/geos/disk/nxtblkalloc.s
index 568c85393339a5b6211dda8362f2a882e64a8351..620de7eb959e4edfb5fd94fd5d957204c9b67e5f 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/opendisk.s b/libsrc/geos/disk/opendisk.s
index 254e028a0176fe75ec01ad1c19483ed4458b8c33..88040c390fe1feda4a70eec8e3de14538b240ed4 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/putblock.s b/libsrc/geos/disk/putblock.s
index d48446b422067223661c649eac3a6f54a823959a..122de9303e2124a4ca7a68ac60d19ae2821184e0 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/putdirhead.s b/libsrc/geos/disk/putdirhead.s
index 71468305e565cf4cbe93ca4890f9c4a1d49de18c..9b94020e60efcbf35b7051cbec1786e66d09cd02 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/readblock.s b/libsrc/geos/disk/readblock.s
index 63f326bc7f8982d7e58db0d2b344598f457b5401..d99a09b0df531730532a1caf1413a3cbdecfe41b 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/readbuff.s b/libsrc/geos/disk/readbuff.s
index 0e945c48ac5bb553c31b899fea3bbc3a292c2c5f..bbc13018ece0ef85a76ad8b3759deb286d5aeed6 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/setgeosdisk.s b/libsrc/geos/disk/setgeosdisk.s
index 92e0808d8637d87a2b46368c9dc2f0e9481bfca7..520cc8d393b19e8ae8b7f6aadcb69c9933affdfb 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/setoserror.s b/libsrc/geos/disk/setoserror.s
new file mode 100644 (file)
index 0000000..382f565
--- /dev/null
+++ 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

diff --git a/libsrc/geos/disk/verwriteblock.s b/libsrc/geos/disk/verwriteblock.s
index 27ac611cbc56dd41a8b21c83c164686e6947fb2d..5758fc53cdfc87ff57e51892b004ee045845d889 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/writeblock.s b/libsrc/geos/disk/writeblock.s
index 591add7a925002966501ab40d3e2b6c7cea17c2e..63a7194c02e50c1c213ebc7cd96840e680749313 100644 (file)
--- 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

diff --git a/libsrc/geos/disk/writebuff.s b/libsrc/geos/disk/writebuff.s
index 24a9c5ec13db9d7f5ccfae17e2e04854fce2a3c1..96904ca0e2bdc291cc9bd3fc2c2e9e9bb8abd493 100644 (file)
--- 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

diff --git a/libsrc/geos/dlgbox/dodlgbox.s b/libsrc/geos/dlgbox/dodlgbox.s
index b17a4f686296b435416af5b2a3cccbe7cc81932e..3e8629b1692759b151b84ba88ed4118f186ff97d 100644 (file)
--- a/libsrc/geos/dlgbox/dodlgbox.s
+++ b/libsrc/geos/dlgbox/dodlgbox.s
@@ -1,8 +1,8 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char DoDlgBox         (char *myParamString);
 
@@ -15,5 +15,6 @@ _DoDlgBox:
            sta r0L
            stx r0H
            jsr DoDlgBox
+           ldx #0
            lda r0L
            rts

diff --git a/libsrc/geos/file/appendrecord.s b/libsrc/geos/file/appendrecord.s
index 9fb12b0b95c72bcce7d3c911459c030fb7982705..9e2b2d85ed19a5d3e15995b9f36dda264ed30e2e 100644 (file)
--- a/libsrc/geos/file/appendrecord.s
+++ b/libsrc/geos/file/appendrecord.s
@@ -1,20 +1,17 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char AppendRecord  (void);
 
-           .import __oserror
+           .import setoserror
            .export _AppendRecord
 
            .include "../inc/jumptab.inc"
-           .include "../inc/geossym.inc"
        
 _AppendRecord:
 
        jsr AppendRecord
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/closerecordfile.s b/libsrc/geos/file/closerecordfile.s
index 9b7f4955f967fb4d41b6657d9a7048df1044352c..abfd0e7198d137fab47bb47a142e4904930e5b0f 100644 (file)
--- a/libsrc/geos/file/closerecordfile.s
+++ b/libsrc/geos/file/closerecordfile.s
@@ -1,19 +1,16 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char CloseRecordFile  (void);
 
-           .import __oserror
+           .import setoserror
            .export _CloseRecordFile
 
            .include "../inc/jumptab.inc"
-           .include "../inc/geossym.inc"
        
 _CloseRecordFile:
        jsr CloseRecordFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/deletefile.s b/libsrc/geos/file/deletefile.s
index 900b47cd4fb295795bfb2c19b87bcdbe4e79b3bb..bc98b439b93205bdfdff99c06756ec781df3732f 100644 (file)
--- a/libsrc/geos/file/deletefile.s
+++ b/libsrc/geos/file/deletefile.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char DeleteFile  (char *myName);
 
-           .import __oserror
+           .import setoserror
            .export _DeleteFile
 
            .include "../inc/jumptab.inc"
@@ -16,6 +16,4 @@ _DeleteFile:
        sta r0L
        stx r0H
        jsr DeleteFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/deleterecord.s b/libsrc/geos/file/deleterecord.s
index e25c84b8a44701a5e64e5418c9e72f409508bc3f..aeaba7e0565d26e2405aedff1ebcf89f3d092511 100644 (file)
--- a/libsrc/geos/file/deleterecord.s
+++ b/libsrc/geos/file/deleterecord.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char DeleteRecord  (void);
 
-           .import __oserror
+           .import setoserror
            .export _DeleteRecord
 
            .include "../inc/jumptab.inc"
@@ -14,6 +14,4 @@
        
 _DeleteRecord:
        jsr DeleteRecord
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/findfile.s b/libsrc/geos/file/findfile.s
index 1494f0ba815258c349c87ef9e2c57770635ad399..1ed04a743ae0bd10b442e959be952f3daebb4ed1 100644 (file)
--- a/libsrc/geos/file/findfile.s
+++ b/libsrc/geos/file/findfile.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char FindFile  (char *myName);
 
-           .import __oserror
+           .import setoserror
            .export _FindFile
 
            .include "../inc/jumptab.inc"
@@ -16,6 +16,4 @@ _FindFile:
        sta r6L
        stx r6H
        jsr FindFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/findftypes.s b/libsrc/geos/file/findftypes.s
index 6b5b260d417319cbb3e045b0bb9d17e47c28462b..bc5fcf3bd82e4d5e96a1d0fcef198c3349ca82ff 100644 (file)
--- a/libsrc/geos/file/findftypes.s
+++ b/libsrc/geos/file/findftypes.s
@@ -2,12 +2,12 @@
 ;
 ; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99, 30.7.2000
+; 25.12.1999, 2.1.2003
 
 ; char FindFTypes  (char *buffer, char fileType, char fileMax, char *Class);
 
            .export _FindFTypes
-           .import popax, popa, __oserror
+           .import popax, popa, setoserror
 
            .include "../inc/jumptab.inc"
            .include "../inc/geossym.inc"
@@ -26,7 +26,7 @@ _FindFTypes:
        sta r6L
        stx r6H
        jsr FindFTypes
-       stx __oserror
+       jsr setoserror
 ; return (fileMax - r7H)
        lda tmpFileMax
        sec

diff --git a/libsrc/geos/file/followchain.s b/libsrc/geos/file/followchain.s
index efdb17a640420656a021ffee297f8af373fbc1af..12fe6600dc93393dc5c6654c66493d09d94dc54a 100644 (file)
--- a/libsrc/geos/file/followchain.s
+++ b/libsrc/geos/file/followchain.s
@@ -1,13 +1,13 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char FollowChain  (struct tr_se *myTrSe, char *buffer);
 
            .export _FollowChain
-           .import popax, __oserror
+           .import popax, setoserror
            .import gettrse
 
            .include "../inc/jumptab.inc"
@@ -21,6 +21,4 @@ _FollowChain:
        sta r1L
        stx r1H
        jsr FollowChain
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/freefile.s b/libsrc/geos/file/freefile.s
index 1df7287a153e27eb6ae1856df2532a4a0134f8c6..4e2acd1c7fbcf5e92af0b49a09122b5ea2118622 100644 (file)
--- a/libsrc/geos/file/freefile.s
+++ b/libsrc/geos/file/freefile.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char FreeFile  (struct trse myTrSe[]);
 
-           .import __oserror
+           .import setoserror
            .export _FreeFile
 
            .include "../inc/jumptab.inc"
@@ -16,6 +16,4 @@ _FreeFile:
        sta r9L
        stx r9H
        jsr FreeFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/getfhdrinfo.s b/libsrc/geos/file/getfhdrinfo.s
index aef9ebd0963f119e15387fc58ddac47d9f1b66c3..03171f082d7abd16a4d9bf8c6f302adf4dbacb56 100644 (file)
--- a/libsrc/geos/file/getfhdrinfo.s
+++ b/libsrc/geos/file/getfhdrinfo.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char GetFHdrInfo  (struct filehandle *myFile);
 
-           .import __oserror
+           .import setoserror
            .export _GetFHdrInfo
 
            .include "../inc/jumptab.inc"
@@ -16,6 +16,4 @@ _GetFHdrInfo:
        sta r9L
        stx r9H
        jsr GetFHdrInfo
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/insertrecord.s b/libsrc/geos/file/insertrecord.s
index 2953ecad3e3a5136fc09b35242ab77e9e50b46a3..b27af3b97c92fb3d9ace8f60227da310b801375c 100644 (file)
--- a/libsrc/geos/file/insertrecord.s
+++ b/libsrc/geos/file/insertrecord.s
@@ -1,19 +1,16 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char InsertRecord  (void);
 
-           .import __oserror
+           .import setoserror
            .export _InsertRecord
 
            .include "../inc/jumptab.inc"
-           .include "../inc/geossym.inc"
-       
+
 _InsertRecord:
        jsr InsertRecord
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/nextrecord.s b/libsrc/geos/file/nextrecord.s
index eec5a88faa3a6d97516b47737b3b9e103b73638b..df3806a2fb1f91722628328dbbbbd0961366c402 100644 (file)
--- a/libsrc/geos/file/nextrecord.s
+++ b/libsrc/geos/file/nextrecord.s
@@ -1,19 +1,16 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char NextRecord  (void);
 
-           .import __oserror
+           .import setoserror
            .export _NextRecord
 
            .include "../inc/jumptab.inc"
-           .include "../inc/geossym.inc"
-       
+
 _NextRecord:
        jsr NextRecord
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/openrecordfile.s b/libsrc/geos/file/openrecordfile.s
index 218a01fcf770cf6a1233a8d08d4868862c4f5497..40f8497f93d4a98a1a7cf79e17dc15d843e9082e 100644 (file)
--- a/libsrc/geos/file/openrecordfile.s
+++ b/libsrc/geos/file/openrecordfile.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char OpenRecordFile  (char *myName);
 
-           .import __oserror
+           .import setoserror
            .export _OpenRecordFile
 
            .include "../inc/jumptab.inc"
@@ -16,6 +16,4 @@ _OpenRecordFile:
        sta r0L
        stx r0H
        jsr OpenRecordFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/pointrecord.s b/libsrc/geos/file/pointrecord.s
index b7d6d4aa5ea6f01676164a366c757f6c9b81a59b..3bf6dec608b55d72d2594664f0c2a7f8e483cfb4 100644 (file)
--- a/libsrc/geos/file/pointrecord.s
+++ b/libsrc/geos/file/pointrecord.s
@@ -1,19 +1,16 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char PointRecord  (char recordNum);
 
-           .import __oserror
+           .import setoserror
            .export _PointRecord
 
            .include "../inc/jumptab.inc"
-           .include "../inc/geossym.inc"
        
 _PointRecord:
        jsr PointRecord
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/previousrecord.s b/libsrc/geos/file/previousrecord.s
index f74ee8ba67faaba5532e5a3081670171edea792e..d535abf1a2f8b8f650609a84cc33f536b2ea90f9 100644 (file)
--- a/libsrc/geos/file/previousrecord.s
+++ b/libsrc/geos/file/previousrecord.s
@@ -1,19 +1,16 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char PreviousRecord  (void);
 
-           .import __oserror
+           .import setoserror
            .export _PreviousRecord
 
            .include "../inc/jumptab.inc"
-           .include "../inc/geossym.inc"
 
 _PreviousRecord:
        jsr PreviousRecord
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/readbyte.s b/libsrc/geos/file/readbyte.s
index 9995b848a9546cddbc3e071f8b8a7f5104c05de3..fe7c82aa653bd972870411872dab48f43c41d867 100644 (file)
--- a/libsrc/geos/file/readbyte.s
+++ b/libsrc/geos/file/readbyte.s
@@ -1,8 +1,8 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char ReadByte  (void);
 
@@ -10,9 +10,9 @@
            .export _ReadByte
 
            .include "../inc/jumptab.inc"
-           .include "../inc/geossym.inc"
 
 _ReadByte:
        jsr ReadByte
        stx __oserror
+       ldx #0
        rts

diff --git a/libsrc/geos/file/readfile.s b/libsrc/geos/file/readfile.s
index 5136e4561e5f8d3b411a52431373c24eb000cf48..ac1cda404ab5a37229cf0efbf47aaecc5d30fe0c 100644 (file)
--- a/libsrc/geos/file/readfile.s
+++ b/libsrc/geos/file/readfile.s
@@ -1,13 +1,13 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char ReadFile  (struct tr_se *myTS, char *buffer, int length);
 
            .export _ReadFile
-           .import popax, __oserror
+           .import popax, setoserror
            .import gettrse
 
            .include "../inc/jumptab.inc"
@@ -24,6 +24,4 @@ _ReadFile:
        sta r1L
        stx r1H
        jsr ReadFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/readrecord.s b/libsrc/geos/file/readrecord.s
index ec7d227b9bafaf95df3e0582e60ad17b4dba34bc..6b1a46d69630cbe4768fc519c446bba3c85938b2 100644 (file)
--- a/libsrc/geos/file/readrecord.s
+++ b/libsrc/geos/file/readrecord.s
@@ -1,13 +1,13 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char ReadRecord  (char *buffer, int length);
 
            .export _ReadRecord
-           .import popax, __oserror
+           .import popax, setoserror
 
            .include "../inc/jumptab.inc"
            .include "../inc/geossym.inc"
@@ -19,6 +19,4 @@ _ReadRecord:
        sta r7L
        stx r7H
        jsr ReadRecord
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/renamefile.s b/libsrc/geos/file/renamefile.s
index b0b835de5c416f3f11b8343f2e80ade691505fe7..24834603e69cc5ad84a4dc9de8d45b4431c4209d 100644 (file)
--- a/libsrc/geos/file/renamefile.s
+++ b/libsrc/geos/file/renamefile.s
@@ -1,17 +1,17 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char RenameFile  (char *source, char *target);
 
            .export _RenameFile
-           .import popax, __oserror
+           .import popax, setoserror
 
            .include "../inc/jumptab.inc"
            .include "../inc/geossym.inc"
-       
+
 _RenameFile:
        sta r0L
        stx r0H
@@ -19,6 +19,4 @@ _RenameFile:
        sta r6L
        stx r6H
        jsr RenameFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/savefile.s b/libsrc/geos/file/savefile.s
index 520dbf3fba4991578d6953234592bdebd5dacf22..85bc8c484a93729265cf7f9be0adbba803372261 100644 (file)
--- a/libsrc/geos/file/savefile.s
+++ b/libsrc/geos/file/savefile.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char SaveFile  (struct fileheader *myHeader);
 
-           .import __oserror
+           .import setoserror
            .export _SaveFile
 
            .include "../inc/jumptab.inc"
@@ -16,6 +16,4 @@ _SaveFile:
        sta r9L
        stx r9H
        jsr SaveFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/updaterecordfile.s b/libsrc/geos/file/updaterecordfile.s
index 2338a9ab1a07e766bf501dfcd4ff0f7e03ad774a..e395c4af952f0f178750377054a8b4164c0f8b86 100644 (file)
--- a/libsrc/geos/file/updaterecordfile.s
+++ b/libsrc/geos/file/updaterecordfile.s
@@ -1,19 +1,16 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char UpdateRecordFile  (void);
 
-           .import __oserror
+           .import setoserror
            .export _UpdateRecordFile
 
            .include "../inc/jumptab.inc"
-           .include "../inc/geossym.inc"
 
 _UpdateRecordFile:
        jsr UpdateRecordFile
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/file/writerecord.s b/libsrc/geos/file/writerecord.s
index 7652abc53918a2a90e8fd18ed18623bb618b110d..1a6d087720e486cfb4d2293b1a1154fc4f8730b7 100644 (file)
--- a/libsrc/geos/file/writerecord.s
+++ b/libsrc/geos/file/writerecord.s
@@ -1,13 +1,13 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 25.12.99
+; 25.12.1999, 2.1.2003
 
 ; char WriteRecord  (char *buffer, int length);
 
            .export _WriteRecord
-           .import popax, __oserror
+           .import popax, setoserror
 
            .include "../inc/jumptab.inc"
            .include "../inc/geossym.inc"
@@ -19,6 +19,4 @@ _WriteRecord:
        sta r7L
        stx r7H
        jsr WriteRecord
-       stx __oserror
-       txa
-       rts
+       jmp setoserror

diff --git a/libsrc/geos/graph/getcharwidth.s b/libsrc/geos/graph/getcharwidth.s
index e0f08864bf7dd0b1efa3921d97e8145b38968b68..82ffd1018e21326b8b185fc5cfe7ff572aa6eb67 100644 (file)
--- a/libsrc/geos/graph/getcharwidth.s
+++ b/libsrc/geos/graph/getcharwidth.s
@@ -1,8 +1,8 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003
 
 ; char GetCharWidth (char character);
 
@@ -10,4 +10,7 @@
 
            .include "../inc/jumptab.inc"
 
-_GetCharWidth = GetCharWidth
+_GetCharWidth:
+           jsr GetCharWidth
+           ldx #0
+           rts

diff --git a/libsrc/geos/graph/testpoint.s b/libsrc/geos/graph/testpoint.s
index f068e77b5ef20c6f7057ca864cd42e3636ca5a60..6a502cc96ecdf4c10e7a0683c75e4ffd8585057c 100644 (file)
--- a/libsrc/geos/graph/testpoint.s
+++ b/libsrc/geos/graph/testpoint.s
@@ -1,12 +1,13 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 29.10.99
+; 29.10.1999, 2.1.2003
 
 ; char TestPoint       (struct pixel *mypixel);
 
            .import PointRegs
+           .import return0, return1
            .export _TestPoint
 
            .include "../inc/jumptab.inc"
@@ -15,7 +16,5 @@ _TestPoint:
            jsr PointRegs
            jsr TestPoint
            bcc goFalse
-           lda #$ff
-           rts
-goFalse:    lda #0
-           rts
+           jmp return1
+goFalse:    jmp return0

diff --git a/libsrc/geos/memory/cmpstring.s b/libsrc/geos/memory/cmpstring.s
index 8ebe70a515c881d73e36223705fe9c0ffe6f4ae0..1310de284ee2bb27ed9448be8f10588d02a672cb 100644 (file)
--- a/libsrc/geos/memory/cmpstring.s
+++ b/libsrc/geos/memory/cmpstring.s
@@ -1,16 +1,20 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 22.12.99
+; 22.12.1999, 2.1.2003
 
 ; char CmpString (char *dest, char* source);
 
            .import DoubleSPop
+           .import return0, return1
            .export _CmpString
 
            .include "../inc/jumptab.inc"
 
 _CmpString:
            jsr DoubleSPop
-           jmp CmpString
+           jsr CmpString
+           bne L1
+           jmp return0
+L1:        jmp return1

diff --git a/libsrc/geos/memory/verifyram.s b/libsrc/geos/memory/verifyram.s
index 0ff362371de492660877885ce7d17740c27474f7..ad2384f45f2eb84a2fc8c325be7fb3150bbde22c 100644 (file)
--- a/libsrc/geos/memory/verifyram.s
+++ b/libsrc/geos/memory/verifyram.s
@@ -1,8 +1,8 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003
 
 ; char VerifyRAM (char REUBank, int length, char *reuaddy, char *cpuaddy);
 
@@ -16,4 +16,5 @@ _VerifyRAM:
            jsr REURegs
            jsr VerifyRAM
            txa
+           ldx #0
            rts

diff --git a/libsrc/geos/mousesprite/getnextchar.s b/libsrc/geos/mousesprite/getnextchar.s
index 85cd9e04367372f4b9aabd0ee15f3a031ddc697b..fed9f8b08d75ac3c70f8876567c8f86ef82f3082 100644 (file)
--- a/libsrc/geos/mousesprite/getnextchar.s
+++ b/libsrc/geos/mousesprite/getnextchar.s
@@ -1,8 +1,8 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003
 
 ; char GetNextChar (void);
 ;      note that if it returns 0 (FALSE) then no characters are available
@@ -11,4 +11,8 @@
 
            .include "../inc/jumptab.inc"
 
-_GetNextChar = GetNextChar
\ No newline at end of file
+_GetNextChar:
+           jsr GetNextChar
+           ldx #0
+           tay                 ; preserve Z flag
+           rts

diff --git a/libsrc/geos/mousesprite/ismseinregion.s b/libsrc/geos/mousesprite/ismseinregion.s
index 4d35fa8ddd1dc49fa54ccbd24a53369eb621d9fe..dcdb1e86a966c64b7c13cb4ce4a64fb8e9be84ce 100644 (file)
--- a/libsrc/geos/mousesprite/ismseinregion.s
+++ b/libsrc/geos/mousesprite/ismseinregion.s
@@ -1,12 +1,13 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 21.12.99
+; 21.12.1999, 2.1.2003
 
 ; char IsMseInRegion (struct window *mywindow);
 
            .import RectRegs
+           .import return0, return1
 
            .export _IsMseInRegion
            
@@ -14,4 +15,7 @@
 
 _IsMseInRegion:
            jsr RectRegs
-           jmp IsMseInRegion
+           jsr IsMseInRegion
+           bne L1
+           jmp return0
+L1:        jmp return1

diff --git a/libsrc/geos/mousesprite/mouse.s b/libsrc/geos/mousesprite/mouse.s
index f71b67b1f06580c785382699c1b6ec72fe097d39..263c9f832ee8dce19904bdd9b39df727c027e029 100644 (file)
--- a/libsrc/geos/mousesprite/mouse.s
+++ b/libsrc/geos/mousesprite/mouse.s
@@ -51,6 +51,7 @@ _mse_storex:
        stx     mouseRight+1
 _mse_initend:
        lda     #0
+       tax
 ; --------------------------------------------------------------------------
 ;
 ; void mouse_done (void);
@@ -178,6 +179,7 @@ _mouse_move:
 ;
 
 _mouse_buttons:
+       ldx     #0
        lda     pressFlag
        and     #SET_MOUSE
        lsr

diff --git a/libsrc/geos/system/get_ostype.s b/libsrc/geos/system/get_ostype.s
index f92f634a91b8b341c5b2cba8738eae034526c050..264f80b3f004a7d6b551396b29d0488e2aa49cc4 100644 (file)
--- a/libsrc/geos/system/get_ostype.s
+++ b/libsrc/geos/system/get_ostype.s
@@ -15,6 +15,7 @@
            .include "../inc/geossym2.inc"
 
 get_ostype:
+           ldx #0
            lda version
            and #%11110000
            cmp #$10
@@ -50,5 +51,6 @@ ntsc:     lda #$80                    ; NTSC
 
 modeend:    stx tmp1
            ora tmp1
+           ldx #0
            plp                         ; restore interrupt state
            rts

diff --git a/libsrc/geos/system/getrandom.s b/libsrc/geos/system/getrandom.s
index c9245fd0f6edbe67b4243729c6bae65d0b63b02e..9bb70f4d355aaf77f1bc5ef895b02557d93e68ac 100644 (file)
--- a/libsrc/geos/system/getrandom.s
+++ b/libsrc/geos/system/getrandom.s
@@ -1,13 +1,16 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 30.10.99
+; 30.10.1999, 2.1.2003
 
-; int GetRandom (void);
+; char GetRandom (void);
 
            .export _GetRandom
 
            .include "../inc/jumptab.inc"
 
-_GetRandom = GetRandom
+_GetRandom:
+           jsr GetRandom
+           ldx #0
+           rts