remove ZP_CIOV_save and ZP_SIOV_save

[cc65] / libsrc / atari / rwcommon.s

diff --git a/libsrc/atari/rwcommon.s b/libsrc/atari/rwcommon.s
index 7f77e15a716a140a9d6ec59ce6acddbe62351a73..5f51cc5f7f8fa962599845a2916c0bb06295c4ed 100644 (file)
--- a/libsrc/atari/rwcommon.s
+++ b/libsrc/atari/rwcommon.s
@@ -1,71 +1,43 @@
 ;
 ; common iocb setup routine for read, write
-; expects parameters (int fd,void *buf,int count)
+; expects __fastcall__ parameters (int fd, void *buf, int count)
 ;
         .include "atari.inc"
-       .include "../common/errno.inc"
-        .importzp tmp2,tmp3
-        .import incsp6,ldax0sp,ldaxysp
-       .import __errno,__oserror
-       .import fdtoiocb
-        
+        .include "errno.inc"
+        .import popax
+        .import fdtoiocb
+
         .export __rwsetup
 
+
 __rwsetup:
-       
-        ldy     #5
-        jsr     ldaxysp         ; get fd
-       jsr     fdtoiocb        ; convert to iocb
-       bmi     iocberr
-        sta     tmp3            ; save it
-        jsr     ldax0sp         ; get size
-        stx     tmp2
-        ldx     tmp3            ; iocb
-       cpx     #$80            ; iocb must be 0...7
-       bcs     iocberr
-        sta     ICBLL,x
-        lda     tmp2            ; size hi
-        sta     ICBLH,x
-        ldy     #3              ; get buf addr (was 2 in orig. version)
-        jsr     ldaxysp
-        stx     tmp2
-        ldx     tmp3
-        sta     ICBAL,x
-        lda     tmp2
+
+        pha                     ; push size in stack
+        txa
+        pha
+        jsr     popax           ; get buffer address
+        pha
+        txa
+        pha
+        jsr     popax           ; get handle
+        jsr     fdtoiocb        ; convert to iocb
+        bmi     iocberr         ; negative (X=$FF or A>$7F) on error.
+        tax
+        pla                     ; store address
         sta     ICBAH,x
-       jsr     incsp6          ; pop args
-       lda     ICBLL,x
-       ora     ICBLH,x         ; return with Z if length was 0
+        pla
+        sta     ICBAL,x
+        pla                     ; store length
+        sta     ICBLH,x
+        pla
+        sta     ICBLL,x
+        ora     ICBLH,x         ; returns Z if length is 0
         rts
 
-iocberr:jsr     incsp6          ; pop args
-       ldx     #$FF            ; indicate error + clear ZF
-       rts
-
-       
-;
-; this routine updates errno.  do a JMP here right after calling
-; CIOV.  we expect status in Y.
-;
-        .export __do_oserror,__seterrno,__inviocb
-__do_oserror:
-       sty     __oserror       ; save os dependent error code
-retminus:      
-       lda     #$FF
-       tax                     ; return -1
-       rts
-
-__seterrno:
-        sta     __errno
-        stx     __errno+1
+iocberr:pla
+        pla
+        pla
+        pla
+        ldx     #$FF            ; indicate error + clear ZF
         rts
 
-;
-; sets EINVAL error code and returns -1
-;
-
-__inviocb:
-       lda     #<EINVAL
-       ldx     #>EINVAL
-       jsr     __seterrno
-       jmp     retminus        ; return -1