From 7c55f30627b208e8ba53ccfa965abad5cbdaf506 Mon Sep 17 00:00:00 2001
From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Thu, 27 Aug 2009 16:13:17 +0000
Subject: [PATCH] Fixed a problem with OptPtrLoad6 (must correct stack
 pointer).

git-svn-id: svn://svn.cc65.org/cc65/trunk@4054 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 src/cc65/coptptrload.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/cc65/coptptrload.c b/src/cc65/coptptrload.c
index 39b69e7d3..99118cefc 100644
--- a/src/cc65/coptptrload.c
+++ b/src/cc65/coptptrload.c
@@ -550,7 +550,7 @@ unsigned OptPtrLoad6 (CodeSeg* S)
 /* Search for the sequence:
  *
  *      jsr     pushax
- *      ldy     xxx
+ *      ldy     #xxx
  *      ldx     #$00
  *      lda     (sp),y
  *      jsr     tosaddax
@@ -561,11 +561,12 @@ unsigned OptPtrLoad6 (CodeSeg* S)
  *
  *      sta     ptr1
  *      stx     ptr1+1
- *      ldy     xxx
+ *      ldy     #xxx-2
  *      lda     (sp),y
  *      tay
  *      ldx     #$00
  *      lda     (ptr1),y
+ *      ldy     #$00
  */
 {
     unsigned Changes = 0;
@@ -583,6 +584,8 @@ unsigned OptPtrLoad6 (CodeSeg* S)
        	if (CE_IsCallTo (L[0], "pushax")                &&
        	    CS_GetEntries (S, L+1, I+1, 6)     	        &&
             L[1]->OPC == OP65_LDY                       &&
+            CE_IsConstImm (L[1])                        &&
+            L[1]->Num >= 2                              &&
        	    L[2]->OPC == OP65_LDX                       &&
             CE_IsKnownImm (L[2], 0)                     &&
             L[3]->OPC == OP65_LDA                       &&
@@ -593,7 +596,8 @@ unsigned OptPtrLoad6 (CodeSeg* S)
             CE_IsCallTo (L[6], "ldauidx")               &&
        	    !CS_RangeHasLabel (S, I+1, 6)) {
 
-	    CodeEntry* X;
+	    CodeEntry*  X;
+            const char* Arg;
 
             /* sta ptr1 */
             X = NewCodeEntry (OP65_STA, AM65_ZP, "ptr1", 0, L[0]->LI);
@@ -603,8 +607,9 @@ unsigned OptPtrLoad6 (CodeSeg* S)
             X = NewCodeEntry (OP65_STX, AM65_ZP, "ptr1+1", 0, L[0]->LI);
             CS_InsertEntry (S, X, I+8);
 
-            /* ldy yyy */
-            X = NewCodeEntry (OP65_LDY, L[1]->AM, L[1]->Arg, 0, L[1]->LI);
+            /* ldy #xxx-2 */
+            Arg = MakeHexArg (L[1]->Num - 2);
+            X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, L[1]->LI);
             CS_InsertEntry (S, X, I+9);
 
             /* lda (sp),y */
@@ -623,6 +628,10 @@ unsigned OptPtrLoad6 (CodeSeg* S)
 	    X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "ptr1", 0, L[6]->LI);
 	    CS_InsertEntry (S, X, I+13);
 
+            /* ldy #$00 (will eventually get removed later) */
+            X = NewCodeEntry (OP65_LDY, AM65_IMM, "$00", 0, L[5]->LI);
+            CS_InsertEntry (S, X, I+14);
+
 	    /* Remove the old code */
 	    CS_DelEntries (S, I, 7);