add a return -1 helper

This commit is contained in:
Colin Leroy-Mira 2024-01-11 18:19:13 +01:00
parent 57e65a6bf6
commit 5d49fde788
8 changed files with 28 additions and 39 deletions

View File

@ -19,7 +19,7 @@
.import findfreeiocb .import findfreeiocb
.import incsp4 .import incsp4
.import ldaxysp,addysp .import ldaxysp,addysp
.import ___oserror .import ___oserror, returnFFFF
.ifdef UCASE_FILENAME .ifdef UCASE_FILENAME
.import ucase_fn .import ucase_fn
.endif .endif
@ -39,9 +39,7 @@ parmok: jsr findfreeiocb
lda #<EMFILE ; "too many open files" lda #<EMFILE ; "too many open files"
seterr: jsr ___directerrno seterr: jsr ___directerrno
jsr incsp4 ; clean up stack jsr incsp4 ; clean up stack
lda #$FF jmp returnFFFF
tax
rts ; return -1
; process the mode argument ; process the mode argument

View File

@ -40,7 +40,7 @@
.export _cbm_read .export _cbm_read
.importzp ptr1, ptr2, ptr3, tmp1 .importzp ptr1, ptr2, ptr3, tmp1
.import popax, popa .import popax, popa, returnFFFF
.import ___oserror .import ___oserror
@ -107,7 +107,4 @@ _cbm_read:
; CHKIN failed ; CHKIN failed
@E1: sta ___oserror @E1: sta ___oserror
lda #$FF jmp returnFFFF
tax
rts ; return -1

View File

@ -32,7 +32,7 @@
.export _cbm_write .export _cbm_write
.importzp ptr1, ptr2, ptr3 .importzp ptr1, ptr2, ptr3
.import popax, popa .import popax, popa, returnFFFF
.import ___oserror .import ___oserror
@ -88,7 +88,4 @@ _cbm_write:
; Error entry, error code is in A ; Error entry, error code is in A
@E2: sta ___oserror @E2: sta ___oserror
lda #$FF jmp returnFFFF
tax
rts ; return -1

View File

@ -7,7 +7,7 @@
.export _fclose .export _fclose
.import _close .import _close, ___directerrno
.importzp ptr1 .importzp ptr1
.include "errno.inc" .include "errno.inc"
@ -31,10 +31,7 @@
; File is not open ; File is not open
lda #EINVAL lda #EINVAL
jsr ___seterrno jmp ___directerrno
lda #$FF ; Return -1
tax
rts
; File is open. Reset the flags and close the file. ; File is open. Reset the flags and close the file.
@ -47,4 +44,3 @@
jmp _close ; Will set errno and return an error flag jmp _close ; Will set errno and return an error flag
.endproc .endproc

View File

@ -5,7 +5,7 @@
; ;
.export _clearerr, _feof, _ferror, _fileno, _fflush .export _clearerr, _feof, _ferror, _fileno, _fflush
.import return0 .import return0, ___directerrno
.importzp ptr1 .importzp ptr1
.include "_file.inc" .include "_file.inc"
@ -78,10 +78,7 @@ err: rts
; If the file is not valid, fileno must set errno and return -1 ; If the file is not valid, fileno must set errno and return -1
error: lda #<EBADF error: lda #<EBADF
jsr ___seterrno jmp ___directerrno
lda #$FF
tax
rts
.endproc .endproc
; ;
@ -89,5 +86,3 @@ error: lda #<EBADF
; ;
_fflush = return0 _fflush = return0

View File

@ -10,7 +10,7 @@
.import _malloc, _free .import _malloc, _free
.import searchenv, copyenvptr .import searchenv, copyenvptr
.import __environ, __envcount, __envsize .import __environ, __envcount, __envsize
.import return0 .import return0, ___directerrno
.import ptr1:zp, ptr2:zp, ptr3:zp, tmp1:zp .import ptr1:zp, ptr2:zp, ptr3:zp, tmp1:zp
.include "errno.inc" .include "errno.inc"
@ -169,10 +169,7 @@ addentry:
; Error entries ; Error entries
nomem: lda #ENOMEM nomem: lda #ENOMEM
error: jsr ___seterrno error: jmp ___directerrno
lda #$FF ; Return -1
tax
rts
.endproc .endproc
@ -184,5 +181,3 @@ error: jsr ___seterrno
name: .addr 0 ; Pointer to name name: .addr 0 ; Pointer to name
newsize: .byte 0 ; New environment size newsize: .byte 0 ; New environment size

View File

@ -62,10 +62,6 @@
; File is not open or the character is invalid ; File is not open or the character is invalid
error: lda #EINVAL error: lda #EINVAL
jsr ___seterrno jmp ___directerrno
lda #$FF ; Return -1
tax
rts
.endproc .endproc

View File

@ -0,0 +1,15 @@
;
; Ullrich von Bassewitz, 25.10.2000
;
; CC65 runtime: Return -1 in a/x
;
.export returnFFFF
.proc returnFFFF
lda #$FF
tax
rts
.endproc