1
0
mirror of https://github.com/cc65/cc65.git synced 2024-06-09 06:29:38 +00:00

Resolved conflict and removed adaptation for strpbrk for time being.

This commit is contained in:
IrgendwerA8 2018-05-21 13:07:26 +02:00
parent 911b86de67
commit 839aa93198
2 changed files with 7 additions and 5 deletions

View File

@ -7,7 +7,7 @@
.constructor initiobuf
.export iobuf_alloc, iobuf_free
.import __STARTUP_RUN__
.import __MAIN_START__
.import incsp2, popptr1
.include "zeropage.inc"
@ -18,7 +18,7 @@
initiobuf:
; Convert end address highbyte to table index
lda #>__STARTUP_RUN__
lda #>__MAIN_START__
sec
sbc #>$0800
lsr

View File

@ -5,15 +5,17 @@
;
.export _strpbrk
.import popax, popptr1, return0
.import popax, return0
.importzp ptr1, ptr2, tmp1, tmp2, tmp3
_strpbrk:
jsr popax ; get s2
sta ptr2
stx ptr2+1
jsr popptr1 ; get s1
; ldy #$00 Y=0 guaranteed by popptr1
jsr popax ; get s1
sta ptr1
stx ptr1+1
ldy #$00
L1: lda (ptr1),y ; get next char from s1
beq L9 ; jump if done