Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-04-28 19:37:05 +00:00
Code Issues Projects Releases Wiki Activity

fix: ignore EOF when looking for error status after reading first byte of newly-opened file (#166)

Browse Source 
* fix: ignore EOF when looking for error status after reading first byte of newly-opened file

* fix: replace hard-coded $40 and $BF with STATUS_EOF and ~STATUS_EOF
This commit is contained in:
markjreed 2025-03-19 18:00:55 -04:00 committed by GitHub
parent 1dc412eb90
commit 29fac122e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/res/prog8lib/cx16/diskio.p8
View File

@ -21,6 +21,7 @@ diskio {
const ubyte READ_IO_CHANNEL=12 const ubyte READ_IO_CHANNEL=12
const ubyte WRITE_IO_CHANNEL=13 const ubyte WRITE_IO_CHANNEL=13
const ubyte STATUS_EOF=$40
ubyte @shared drivenumber = 8 ; user programs can set this to the drive number they want to load/save to! ubyte @shared drivenumber = 8 ; user programs can set this to the drive number they want to load/save to!
@ -94,7 +95,7 @@ io_error:
cbm.CLRCHN() ; restore default i/o devices cbm.CLRCHN() ; restore default i/o devices
cbm.CLOSE(READ_IO_CHANNEL) cbm.CLOSE(READ_IO_CHANNEL)
if status!=0 and status & $40 == 0 { ; bit 6=end of file if status!=0 and status & STATUS_EOF == 0 { ; bit 6=end of file
txt.print("\ni/o error, status: ") txt.print("\ni/o error, status: ")
txt.print_ub(status) txt.print_ub(status)
txt.nl() txt.nl()
@ -346,7 +347,7 @@ close_end:
if cbm.READST()==0 { if cbm.READST()==0 {
iteration_in_progress = true iteration_in_progress = true
void cbm.CHRIN() ; read first byte to test for file not found void cbm.CHRIN() ; read first byte to test for file not found
if cbm.READST()==0 { if cbm.READST() & ~STATUS_EOF == 0 {
cbm.CLOSE(READ_IO_CHANNEL) ; close file because we already consumed first byte cbm.CLOSE(READ_IO_CHANNEL) ; close file because we already consumed first byte
void cbm.OPEN() ; re-open the file void cbm.OPEN() ; re-open the file
cbm.CLRCHN() ; reset default i/o channels cbm.CLRCHN() ; reset default i/o channels
@ -375,7 +376,7 @@ close_end:
cbm.CLRCHN() ; reset default i/o channels cbm.CLRCHN() ; reset default i/o channels
if cx16.r0L!=0 { if cx16.r0L!=0 {
f_close() f_close()
if cx16.r0L & $40 == 0 if cx16.r0L & STATUS_EOF == 0
return 0 return 0
} }
return 1 return 1
@ -395,7 +396,7 @@ close_end:
if msb(bufferpointer) == $c0 if msb(bufferpointer) == $c0
bufferpointer = mkword($a0, lsb(bufferpointer)) ; wrap over bank boundary bufferpointer = mkword($a0, lsb(bufferpointer)) ; wrap over bank boundary
num_bytes -= readsize num_bytes -= readsize
if cbm.READST() & $40 !=0 { if cbm.READST() & STATUS_EOF !=0 {
f_close() ; end of file, close it f_close() ; end of file, close it
break break
} }
@ -423,7 +424,7 @@ m_in_buffer sta $ffff
if_nz { if_nz {
f_close() f_close()
cbm.CLRCHN() ; reset default i/o channels cbm.CLRCHN() ; reset default i/o channels
if cx16.r0L & $40 !=0 ; eof? if cx16.r0L & STATUS_EOF !=0 ; eof?
return list_blocks ; number of bytes read return list_blocks ; number of bytes read
return 0 ; error. return 0 ; error.
} }
@ -941,7 +942,7 @@ internal_vload:
io_error: io_error:
cbm.CLRCHN() cbm.CLRCHN()
cbm.CLOSE(READ_IO_CHANNEL) cbm.CLOSE(READ_IO_CHANNEL)
if status!=0 and status & $40 == 0 if status!=0 and status & STATUS_EOF == 0
return 0 return 0
if @(cx16.r12)==0 { if @(cx16.r12)==0 {
cx16.r12-- cx16.r12--

9
compiler/res/prog8lib/shared_cbm_diskio.p8
View File

@ -10,6 +10,7 @@ diskio {
const ubyte READ_IO_CHANNEL=12 const ubyte READ_IO_CHANNEL=12
const ubyte WRITE_IO_CHANNEL=13 const ubyte WRITE_IO_CHANNEL=13
const ubyte STATUS_EOF=$40
ubyte @shared drivenumber = 8 ; user programs can set this to the drive number they want to load/save to! ubyte @shared drivenumber = 8 ; user programs can set this to the drive number they want to load/save to!
@ -72,7 +73,7 @@ io_error:
cbm.CLRCHN() ; restore default i/o devices cbm.CLRCHN() ; restore default i/o devices
cbm.CLOSE(READ_IO_CHANNEL) cbm.CLOSE(READ_IO_CHANNEL)
if status!=0 and status & $40 == 0 { ; bit 6=end of file if status!=0 and status & STATUS_EOF == 0 {
txt.print("\ni/o error, status: ") txt.print("\ni/o error, status: ")
txt.print_ub(status) txt.print_ub(status)
txt.nl() txt.nl()
@ -322,7 +323,7 @@ close_end:
if cbm.READST()==0 { if cbm.READST()==0 {
iteration_in_progress = true iteration_in_progress = true
void cbm.CHRIN() ; read first byte to test for file not found void cbm.CHRIN() ; read first byte to test for file not found
if cbm.READST()==0 { if cbm.READST() & ~STATUS_EOF == 0 {
cbm.CLOSE(READ_IO_CHANNEL) ; close file because we already consumed first byte cbm.CLOSE(READ_IO_CHANNEL) ; close file because we already consumed first byte
void cbm.OPEN() ; re-open the file void cbm.OPEN() ; re-open the file
cbm.CLRCHN() ; reset default i/o channels cbm.CLRCHN() ; reset default i/o channels
@ -349,7 +350,7 @@ close_end:
cbm.CLRCHN() ; reset default i/o channels cbm.CLRCHN() ; reset default i/o channels
if cx16.r0L!=0 { if cx16.r0L!=0 {
f_close() f_close()
if cx16.r0L & $40 == 0 if cx16.r0L & STATUS_EOF == 0
return 0 return 0
} }
return 1 return 1
@ -375,7 +376,7 @@ m_in_buffer sta $ffff
if_nz { if_nz {
f_close() f_close()
cbm.CLRCHN() ; reset default i/o channels cbm.CLRCHN() ; reset default i/o channels
if cx16.r0L & $40 !=0 ; eof? if cx16.r0L & STATUS_EOF !=0 ; eof?
return list_blocks ; number of bytes read return list_blocks ; number of bytes read
return 0 ; error. return 0 ; error.
} }