the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into pcenginetarget

Browse Source
This commit is contained in:
mrdudz
2015-07-20 18:42:04 +02:00
parent 4afcfb3498 db16a8eb24
commit 0e29a0993f
6 changed files with 224 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
libsrc/common/vsnprintf.s
View File

@@ -1,7 +1,8 @@
;
; int __fastcall__ vsnprintf (char* Buf, size_t size, const char* Format, va_list ap);
;
; Ullrich von Bassewitz, 2009-09-26
; 2009-09-26, Ullrich von Bassewitz
; 2015-07-17, Greg King
;
.export _vsnprintf, vsnprintf
@@ -9,6 +10,8 @@
.import _memcpy, __printf
.importzp sp, ptr1
.include "errno.inc"
.macpack generic
.data
@@ -46,8 +49,10 @@ vsnprintf:
sta ccount+1 ; Clear ccount
; Get the size parameter and replace it by a pointer to outdesc. This is to
; build a stack frame for the call to _printf.
; If size is zero, there's nothing to do.
; build a stack frame for the call to _printf. The size must not be greater
; than INT_MAX because the return type is int. If the size is zero,
; then nothing will be written into the buffer; but, the arguments still will
; be formatted and counted.
ldy #2
lda (sp),y
@@ -58,15 +63,13 @@ vsnprintf:
iny
lda (sp),y
bmi L9 ; More than $7FFF
sta ptr1+1
ora ptr1
beq L9
lda #>outdesc
sta (sp),y
; Write size-1 to outdesc.uns
; Write size-1 to outdesc.uns. It will be -1 if there is no buffer.
ldy ptr1+1
ldx ptr1
@@ -83,24 +86,32 @@ L1: dex
sta bufptr+0
stx bufptr+1
; There must be a buffer if its size is non-zero.
bit bufsize+1
bmi L5
ora bufptr+1
bze L0 ; The pointer shouldn't be NULL
; Restore ap and call _printf
pla
L5: pla
tax
pla
jsr __printf
; Terminate the string. The last char is either at bufptr+ccount or
; bufptr+bufsize, whichever is smaller.
; Terminate the string if there is a buffer. The last char. is at either
; bufptr+bufsize or bufptr+ccount, whichever is smaller.
ldx bufsize+1
bmi L4 ; -1 -- No buffer
lda bufsize+0
cpx ccount+1
bne L2
cmp ccount+0
L2: bcc L3
lda ccount+0
ldx ccount+1
cpx bufsize+1
bne L2
cmp bufsize+0
L2: bcc L3
lda bufsize+0
ldx bufsize+1
clc
L3: adc bufptr+0
sta ptr1
@@ -114,16 +125,22 @@ L3: adc bufptr+0
; Return the number of bytes written and drop buf
lda ccount+0
L4: lda ccount+0
ldx ccount+1
jmp incsp2
; Bail out if size is zero.
; Bail out if size is too high.
L9: pla
pla ; Discard ap
lda #0
tax
L9: ldy #ERANGE
.byte $2C ;(bit $xxxx)
; NULL buffer pointers usually are invalid.
L0: ldy #EINVAL
pla ; Drop ap
pla
tya
jsr __directerrno ; Return -1
jmp incsp6 ; Drop parameters
@@ -146,10 +163,11 @@ out:
sbc ccount+0 ; Low byte of bytes already written
sta ptr1
lda bufsize+1
bmi @L9 ; -1 -- No buffer
sbc ccount+1
sta ptr1+1
bcs @L0 ; Branch if space left
lda #$00
@L9: lda #$0000
sta ptr1
sta ptr1+1 ; No space left

22
libsrc/sim6502/errno.s
View File

@@ -1,11 +1,29 @@
;
; Oliver Schmidt, 2013-05-16
; 2013-05-16, Oliver Schmidt
; 2015-07-18, Greg King
;
; extern int errno;
; Helper functions for several high-level functions.
;
.include "errno.inc"
; ----------------------------------------------------------------------------
; int __fastcall__ _directerrno (unsigned char code);
; /* Set errno to a specific error code; and, return -1. Used
; ** by the library.
; */
__directerrno:
jsr __seterrno ; Save in errno
fail: lda #$FF ; Return -1
tax
ok: rts
; ----------------------------------------------------------------------------
;
; extern int _errno;
;
.bss
__errno: