Apple-2gs-SW
/
ORCALib
mirror of https://github.com/byteworksinc/ORCALib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restore changes to allow ungetc of byte values 0x80 through 0xFF. 

These are the stdio.asm changes that were present in the beta source code on Opus ][, but had been reverted in commit e3c0c962d4. As it turns out, the changes to stdio.asm were OK--the issue was simply that the definitions of stdin/stdout/stderr and the associated initialization code in vars.asm had not been updated to account for the new version of the FILE structure. That has now been done, allowing the changes to work properly.

This fixes #7.
This commit is contained in:
Stephen Heumann 2022-06-27 17:56:52 -05:00
parent 7c2fb70c4a
commit 38666ee111
3 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
equates.asm
View File

@ -74,7 +74,7 @@ FILE_end gequ FILE_base+4 end of the file buffer
FILE_size gequ FILE_end+4 size of the file buffer
FILE_cnt gequ FILE_size+4 # chars that can be read/written to buffer
FILE_pbk gequ FILE_cnt+4 put back character
FILE_flag gequ FILE_pbk+2 buffer flags
FILE_flag gequ FILE_pbk+4 buffer flags
FILE_file gequ FILE_flag+2 GS/OS file ID
sizeofFILE gequ FILE_file+2 size of the record

68
stdio.asm
View File

@ -437,14 +437,16 @@ lb0 lda #EOF
lb1 ldy #FILE_pbk if there is a char in the putback buffer
lda [stream],Y
and #$0080
bne lb2
lda [stream],Y return it
and #$00FF
bmi lb2
and #$00FF return it
sta c
lda [stream],Y pop the putback buffer
xba
ora #$FF00
ldy #FILE_pbk+2 pop the putback buffer
lda [stream],Y
tax
lda #$FFFF
sta [stream],Y
ldy #FILE_pbk
txa
sta [stream],Y
brl gc9
@ -940,6 +942,8 @@ ar6b sta [fileBuff],Y
ldy #FILE_pbk nothing in the putback buffer
lda #$FFFF
sta [fileBuff],Y
ldy #FILE_pbk+2
sta [fileBuff],Y
ldy #FILE_file set the file ID
lda opRefNum
sta [fileBuff],Y
@ -1228,6 +1232,8 @@ ar6b sta [fileBuff],Y
ldy #FILE_pbk nothing in the putback buffer
lda #$FFFF
sta [fileBuff],Y
ldy #FILE_pbk+2
sta [fileBuff],Y
ldy #FILE_file set the file ID
lda opRefNum
sta [fileBuff],Y
@ -1824,6 +1830,8 @@ lb6 ldy #FILE_flag clear the EOF , READ, WRITE flags
ldy #FILE_pbk nothing in the putback buffer
lda #$FFFF
sta [stream],Y
ldy #FILE_pbk+2
sta [stream],Y
stz err
rts plb
@ -1937,12 +1945,15 @@ lb1 move4 gmPosition,pos set the position
lda pos+2
sbc [stream],Y
sta pos+2
ldy #FILE_pbk if there is a char in the putback
lda [stream],Y buffer then
and #$0080
bne rts
dec4 pos dec pos by 1
ldy #FILE_file set the file's mark
ldy #FILE_pbk dec pos by 1 for each char in the
lda [stream],Y putback buffer then
bmi lb2
dec4 pos
ldy #FILE_pbk+2
lda [stream],Y
bmi lb2
dec4 pos
lb2 ldy #FILE_file set the file's mark
lda [stream],Y
sta spRefNum
move4 pos,spPosition
@ -2048,7 +2059,7 @@ lb5 div4 wrTransferCount,element_size,count
lb6 plb
creturn 4:count return
wr dc i'5' parameter block for OSRead
wr dc i'5' parameter block for OSWrite
wrRefNum ds 2
wrDataBuffer ds 4
wrRequestCount ds 4
@ -2084,15 +2095,13 @@ getchar start
; get the char from the keyboard
;
lda >stdin+4+FILE_pbk if there is a char in the putback
and #$0080 buffer then
bne lb1
lda >stdin+4+FILE_pbk save it in x
and #$00FF
tax
lda >stdin+4+FILE_pbk pop the buffer
xba
ora #$FF00
bmi lb1 buffer then
and #$00FF save it in X
tax
lda >stdin+4+FILE_pbk+2 pop the buffer
sta >stdin+4+FILE_pbk
lda #$FFFF
sta >stdin+4+FILE_pbk+2
txa restore the char
bra lb2
@ -3173,21 +3182,18 @@ char equ 1 character to return
lda c error if EOF is pushed
cmp #EOF
beq rts
ldy #FILE_pbk+1 error if the buffer is full
short M
ldy #FILE_pbk+2 error if the buffer is full
lda [stream],Y
bpl rts
dey push the old character (if any)
ldy #FILE_pbk push the old character (if any)
lda [stream],Y
iny
ldy #FILE_pbk+2
sta [stream],Y
dey
lda c put back the character
ldy #FILE_pbk put back the character
lda c
and #$00FF
sta [stream],Y
sta char
stz char+1
bpl rts
dec char+1
rts long M
creturn 2:char
end

20
vars.asm
View File

@ -45,12 +45,12 @@ _toolErr entry last error in a tool call (C)
*
~InitIO start
ldx #24 set up the file records
lb1 lda stderr+34,X
ldx #sizeofFILE-4-2 set up the file records
lb1 lda stderr+4+sizeofFILE,X
sta stderr+8,X
lda stdin+34,X
lda stdin+4+sizeofFILE,X
sta stdin+8,X
lda stdout+34,X
lda stdout+4+sizeofFILE,X
sta stdout+8,X
dex
dex
@ -77,7 +77,7 @@ lb1 dc a4'0' next file
dc a4'0' end of the file buffer
dc i4'0' size of the file buffer
dc i4'0' count
dc i'EOF' putback buffer
dc i'EOF,EOF' putback buffer
dc i'_IONBF+_IOWRT+_IOTEXT' no buffering; allow writes; text file
dc i'stderrID' error out
@ -86,7 +86,7 @@ lb1 dc a4'0' next file
dc a4'0' end of the file buffer
dc i4'0' size of the file buffer
dc i4'0' count
dc i'EOF' putback buffer
dc i'EOF,EOF' putback buffer
dc i'_IONBF+_IOWRT+_IOTEXT' no buffering; allow writes; text file
dc i'stderrID' error out
end
@ -107,7 +107,7 @@ lb1 dc a4'stdout+4' next file
dc a4'0' end of the file buffer
dc i4'0' size of the file buffer
dc i4'0' count
dc i'EOF' putback buffer
dc i'EOF,EOF' putback buffer
dc i'_IONBF+_IOREAD+_IOTEXT' no buffering; allow reads; text file
dc i'stdinID' standard in
@ -116,7 +116,7 @@ lb1 dc a4'stdout+4' next file
dc a4'0' end of the file buffer
dc i4'0' size of the file buffer
dc i4'0' count
dc i'EOF' putback buffer
dc i'EOF,EOF' putback buffer
dc i'_IONBF+_IOREAD+_IOTEXT' no buffering; allow reads; text file
dc i'stdinID' standard in
end
@ -137,7 +137,7 @@ lb1 dc a4'stderr+4' next file
dc a4'0' end of the file buffer
dc i4'0' size of the file buffer
dc i4'0' count
dc i'EOF' putback buffer
dc i'EOF,EOF' putback buffer
dc i'_IONBF+_IOWRT+_IOTEXT' no buffering; allow writes; text file
dc i'stdoutID' standard out
@ -146,7 +146,7 @@ lb1 dc a4'stderr+4' next file
dc a4'0' end of the file buffer
dc i4'0' size of the file buffer
dc i4'0' count
dc i'EOF' putback buffer
dc i'EOF,EOF' putback buffer
dc i'_IONBF+_IOWRT+_IOTEXT' no buffering; allow writes; text file
dc i'stdoutID' standard out
end