Fixed formatting and two import issues.

diff --git a/libsrc/common/memchr.s b/libsrc/common/memchr.s
index de39a04f95f2953c7f686ba69b915a72c207d6fb..c11a467d08d061b0310bf0595f76adb4e315add8 100644 (file)
--- a/libsrc/common/memchr.s
+++ b/libsrc/common/memchr.s
@@ -5,7 +5,7 @@
 ;
 
         .export         _memchr
-        .import         popax, popptr1 return0
+        .import         popax, popptr1, return0
         .importzp       ptr1, ptr2
 
 

diff --git a/libsrc/common/strncpy.s b/libsrc/common/strncpy.s
index e6cafd990c2942e7d6263ac0e3a125a841a1aeb2..56387f880b6c3344de45b4abde41a4e95d529de6 100644 (file)
--- a/libsrc/common/strncpy.s
+++ b/libsrc/common/strncpy.s
@@ -5,7 +5,7 @@
 ;
 
         .export         _strncpy
-        .import         popptr1
+        .import         popax, popptr1
         .importzp       ptr1, ptr2, tmp1, tmp2, tmp3
 
 .proc   _strncpy

diff --git a/libsrc/runtime/popptr1.s b/libsrc/runtime/popptr1.s
index 64da308a8b27749e237629568570567d028fe278..2167717ce9563303b52642e06fcc83a66dcfdb6e 100644 (file)
--- a/libsrc/runtime/popptr1.s
+++ b/libsrc/runtime/popptr1.s
@@ -5,25 +5,19 @@
 ; X is untouched, low byte in A, Y is defined to be 0!
 
         .export         popptr1
-        .import                incsp2
+        .import         incsp2
         .importzp       sp, ptr1
 
-               .macpack cpu
-
-.proc  popptr1                                 ; 14 bytes, 
+        .macpack        cpu
 
+.proc   popptr1                 ; 14 bytes (four usages = at least 2 bytes saved) 
         ldy     #1
         lda     (sp),y          ; get hi byte
-        sta            ptr+1           ; into ptr hi
-        dey                                            ; note: apply even for 65C02 to have Y=0 at exit! 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)            ; get lo byte
-.else
+        sta     ptr1+1          ; into ptr hi
+        dey                     ; no optimization for 65C02 here to have Y=0 at exit! 
         lda     (sp),y          ; get lo byte
-.endif
-               sta             ptr1                    ; to ptr lo
-
-               jmp             incsp2
+        sta     ptr1            ; to ptr lo
+        jmp     incsp2
 .endproc