From 839aa93198e25b4fd48204c3c55f2149a095e9b8 Mon Sep 17 00:00:00 2001 From: IrgendwerA8 Date: Mon, 21 May 2018 13:07:26 +0200 Subject: [PATCH] Resolved conflict and removed adaptation for strpbrk for time being. --- libsrc/apple2/extra/iobuf-0800.s | 4 ++-- libsrc/common/strpbrk.s | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libsrc/apple2/extra/iobuf-0800.s b/libsrc/apple2/extra/iobuf-0800.s index c7a9dae2e..694b91fdb 100644 --- a/libsrc/apple2/extra/iobuf-0800.s +++ b/libsrc/apple2/extra/iobuf-0800.s @@ -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 diff --git a/libsrc/common/strpbrk.s b/libsrc/common/strpbrk.s index afe90ecab..5d1482913 100644 --- a/libsrc/common/strpbrk.s +++ b/libsrc/common/strpbrk.s @@ -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