From 6011bdb2f63c86424fbd6e321d3eee3408b61b62 Mon Sep 17 00:00:00 2001
From: Piotr Fusik <fox@scene.pl>
Date: Wed, 17 May 2017 10:00:35 +0200
Subject: [PATCH 1/2] Optimize the inlined strlen.

---
 src/cc65/stdfunc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/cc65/stdfunc.c b/src/cc65/stdfunc.c
index 7a0450146..f658f0dcb 100644
--- a/src/cc65/stdfunc.c
+++ b/src/cc65/stdfunc.c
@@ -1245,9 +1245,8 @@ static void StdFunc_strlen (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             AddCodeLine ("ldy #$FF");
             g_defcodelabel (L);
             AddCodeLine ("iny");
-            AddCodeLine ("lda %s,y", ED_GetLabelName (&Arg, 0));
+            AddCodeLine ("ldx %s,y", ED_GetLabelName (&Arg, 0));
             AddCodeLine ("bne %s", LocalLabelName (L));
-            AddCodeLine ("tax");
             AddCodeLine ("tya");
 
             /* The function result is an rvalue in the primary register */

From 675dd3c9637e0f4a73ae549fefa4e312b8c4bbf5 Mon Sep 17 00:00:00 2001
From: Piotr Fusik <fox@scene.pl>
Date: Wed, 17 May 2017 10:08:08 +0200
Subject: [PATCH 2/2] Optimize the inlined memcpy/memset for the sizes of
 128/129.

---
 src/cc65/stdfunc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cc65/stdfunc.c b/src/cc65/stdfunc.c
index f658f0dcb..2d4317ef8 100644
--- a/src/cc65/stdfunc.c
+++ b/src/cc65/stdfunc.c
@@ -284,7 +284,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             Label = GetLocalLabel ();
 
             /* Generate memcpy code */
-            if (Arg3.Expr.IVal <= 127) {
+            if (Arg3.Expr.IVal <= 129) {
 
                 AddCodeLine ("ldy #$%02X", (unsigned char) (Arg3.Expr.IVal-1));
                 g_defcodelabel (Label);
@@ -355,7 +355,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             Label = GetLocalLabel ();
 
             /* Generate memcpy code */
-            if (Arg3.Expr.IVal <= 127 && !AllowOneIndex) {
+            if (Arg3.Expr.IVal <= 129 && !AllowOneIndex) {
 
                 if (Offs == 0) {
                     AddCodeLine ("ldy #$%02X", (unsigned char) (Offs + Arg3.Expr.IVal - 1));
@@ -433,7 +433,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             Label = GetLocalLabel ();
 
             /* Generate memcpy code */
-            if (Arg3.Expr.IVal <= 127 && !AllowOneIndex) {
+            if (Arg3.Expr.IVal <= 129 && !AllowOneIndex) {
 
                 if (Offs == 0) {
                     AddCodeLine ("ldy #$%02X", (unsigned char) (Arg3.Expr.IVal - 1));
@@ -499,7 +499,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             /* Generate memcpy code */
             AddCodeLine ("sta ptr1");
             AddCodeLine ("stx ptr1+1");
-            if (Arg3.Expr.IVal <= 127) {
+            if (Arg3.Expr.IVal <= 129) {
                 AddCodeLine ("ldy #$%02X", (unsigned char) (Arg3.Expr.IVal - 1));
                 g_defcodelabel (Label);
                 AddCodeLine ("lda (sp),y");
@@ -635,7 +635,7 @@ static void StdFunc_memset (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             Label = GetLocalLabel ();
 
             /* Generate memset code */
-            if (Arg3.Expr.IVal <= 127) {
+            if (Arg3.Expr.IVal <= 129) {
 
                 AddCodeLine ("ldy #$%02X", (unsigned char) (Arg3.Expr.IVal-1));
                 AddCodeLine ("lda #$%02X", (unsigned char) Arg2.Expr.IVal);
@@ -720,7 +720,7 @@ static void StdFunc_memset (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             /* Generate code */
             AddCodeLine ("sta ptr1");
             AddCodeLine ("stx ptr1+1");
-            if (Arg3.Expr.IVal <= 127) {
+            if (Arg3.Expr.IVal <= 129) {
                 AddCodeLine ("ldy #$%02X", (unsigned char) (Arg3.Expr.IVal-1));
                 AddCodeLine ("lda #$%02X", (unsigned char) Arg2.Expr.IVal);
                 g_defcodelabel (Label);