X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fcodeinfo.c;h=322b471ff0e8109a9bfb0d906d870ff67a7cb614;hb=4a667ead00c10797fb57298b3dd33c2efc6c8d3f;hp=3912dae9113e1ebe2c561c563fb1d5ce98d7de4a;hpb=e68b8160ed1a2ff1c154ce0ed9f8539531a09c65;p=cc65

diff --git a/src/cc65/codeinfo.c b/src/cc65/codeinfo.c
index 3912dae91..322b471ff 100644
--- a/src/cc65/codeinfo.c
+++ b/src/cc65/codeinfo.c
@@ -124,18 +124,25 @@ static const FuncInfo FuncInfoTable[] = {
     { "laddeq",		REG_EAXY|REG_PTR1_LO, REG_EAXY | REG_PTR1_HI         },
     { "laddeq1",       	REG_Y | REG_PTR1_LO,  REG_EAXY | REG_PTR1_HI         },
     { "laddeqa",        REG_AY | REG_PTR1_LO, REG_EAXY | REG_PTR1_HI         },
+    { "laddeq0sp",      REG_EAX,              REG_EAXY                       },
+    { "laddeqysp",      REG_EAXY,             REG_EAXY                       },
     { "ldaidx",         REG_AXY,              REG_AX | REG_PTR1		     },
     { "ldauidx",        REG_AXY,              REG_AX | REG_PTR1		     },
     { "ldax0sp",       	REG_NONE,             REG_AXY                        },
     { "ldaxi",          REG_AX,               REG_AXY | REG_PTR1	     },
     { "ldaxidx",        REG_AXY,              REG_AXY | REG_PTR1       	     },
     { "ldaxysp",       	REG_Y, 	       	      REG_AXY  	       	       	     },
+    { "ldeax0sp",       REG_NONE,             REG_EAXY                       },
+    { "ldeaxi",         REG_AX,               REG_EAXY | REG_PTR1            },
+    { "ldeaxidx",       REG_AXY,              REG_EAXY | REG_PTR1            },
+    { "ldeaxysp",       REG_Y,                REG_EAXY                       },
     { "leaasp",         REG_A,                REG_AX			     },
     { "lsubeq",         REG_EAXY|REG_PTR1_LO, REG_EAXY | REG_PTR1_HI         },
     { "lsubeq0sp",      REG_EAX,              REG_EAXY                       },
     { "lsubeq1",        REG_Y | REG_PTR1_LO,  REG_EAXY | REG_PTR1_HI         },
     { "lsubeqa",        REG_AY | REG_PTR1_LO, REG_EAXY | REG_PTR1_HI         },
     { "lsubeqysp",      REG_EAXY,             REG_EAXY                       },
+    { "lsubeq0sp",      REG_EAX,              REG_EAXY                       },
     { "negax",          REG_AX,               REG_AX			     },
     { "push0", 	       	REG_NONE,             REG_AXY			     },
     { "push1", 	       	REG_NONE,             REG_AXY			     },
@@ -144,16 +151,23 @@ static const FuncInfo FuncInfoTable[] = {
     { "push4", 	       	REG_NONE,             REG_AXY			     },
     { "push5", 	       	REG_NONE,             REG_AXY			     },
     { "push6", 	       	REG_NONE,             REG_AXY			     },
-    { "push7", 	       	REG_NONE,             REG_AXY			     },
+    { "push7", 	       	REG_NONE,             REG_AXY	 		     },
     { "pusha", 	       	REG_A, 	       	      REG_Y			     },
     { "pusha0",	       	REG_A, 	       	      REG_XY			     },
+    { "pusha0sp",       REG_NONE,             REG_AY                         },
     { "pushax",	       	REG_AX,	       	      REG_Y			     },
+    { "pushaysp",       REG_Y,                REG_AY                         },
     { "pushc0",	       	REG_NONE,             REG_A | REG_Y                  },
     { "pushc1",	       	REG_NONE,             REG_A | REG_Y                  },
     { "pushc2",	       	REG_NONE,             REG_A | REG_Y                  },
     { "pusheax",        REG_EAX,              REG_Y			     },
+    { "pushw",         	REG_AX,        	      REG_AXY | REG_PTR1             },
     { "pushw0sp",      	REG_NONE,      	      REG_AXY			     },
+    { "pushwidx",      	REG_AXY,       	      REG_AXY | REG_PTR1	     },
     { "pushwysp",      	REG_Y, 	       	      REG_AXY			     },
+    { "regswap",        REG_AXY,              REG_AXY | REG_TMP1             },
+    { "regswap1",       REG_XY,               REG_A                          },
+    { "regswap2",       REG_XY,               REG_A | REG_Y                  },
     { "shlax1",         REG_AX,	       	      REG_AX | REG_TMP1		     },
     { "shlax2",         REG_AX,	       	      REG_AX | REG_TMP1		     },
     { "shlax3",         REG_AX,	       	      REG_AX | REG_TMP1		     },
@@ -169,13 +183,17 @@ static const FuncInfo FuncInfoTable[] = {
     { "staspidx",       REG_A | REG_Y,        REG_Y | REG_TMP1 | REG_PTR1    },
     { "stax0sp",        REG_AX,               REG_Y   			     },
     { "staxysp",        REG_AXY,              REG_Y   			     },
+    { "steax0sp",       REG_EAX,              REG_Y                          },
+    { "steaxysp",       REG_EAXY,             REG_Y                          },
     { "subeq0sp",       REG_AX,               REG_AXY                        },
     { "subeqysp",       REG_AXY,              REG_AXY                        },
     { "tosadda0",       REG_A,                REG_AXY                        },
     { "tosaddax",       REG_AX,               REG_AXY                        },
-    { "tosdiva0",       REG_AX,	       	      REG_ALL 			     },
-    { "tosdivax",       REG_AX,	       	      REG_ALL 			     },
-    { "tosdiveax",      REG_EAX,       	      REG_ALL 			     },
+    { "tosanda0",       REG_A,                REG_AXY                        },
+    { "tosandax",       REG_AX,               REG_AXY                        },
+    { "tosdiva0",       REG_AY,       	      REG_ALL 			     },
+    { "tosdivax",       REG_AXY,              REG_ALL 			     },
+    { "tosdiveax",      REG_EAXY,             REG_ALL 			     },
     { "toseqeax",       REG_EAX,       	      REG_AXY | REG_PTR1             },
     { "tosgeeax",       REG_EAX,       	      REG_AXY | REG_PTR1             },
     { "tosgteax",       REG_EAX,       	      REG_AXY | REG_PTR1             },
@@ -269,8 +287,7 @@ void GetFuncInfo (const char* Name, unsigned short* Use, unsigned short* Chg)
      	    FuncDesc* D = E->V.F.Func;
      	    if ((D->Flags & FD_FASTCALL) != 0 && D->ParamCount > 0) {
      		/* Will use registers depending on the last param */
-     		SymEntry* LastParam = D->SymTab->SymTail;
-                unsigned LastParamSize = CheckedSizeOf (LastParam->Type);
+                unsigned LastParamSize = CheckedSizeOf (D->LastParam->Type);
      		if (LastParamSize == 1) {
      		    *Use = REG_A;
      		} else if (LastParamSize == 2) {
@@ -577,6 +594,14 @@ int RegAXUsed (struct CodeSeg* S, unsigned Index)
 
 
 
+int RegEAXUsed (struct CodeSeg* S, unsigned Index)
+/* Check if any of the four bytes in EAX are used. */
+{
+    return (GetRegInfo (S, Index, REG_EAX) & REG_EAX) != 0;
+}
+
+
+
 unsigned GetKnownReg (unsigned Use, const RegContents* RC)
 /* Return the register or zero page location from the set in Use, thats
  * contents are known. If Use does not contain any register, or if the
@@ -591,6 +616,10 @@ unsigned GetKnownReg (unsigned Use, const RegContents* RC)
 	return (RC == 0 || RC->RegY >= 0)? REG_Y : REG_NONE;
     } else if ((Use & REG_TMP1) != 0) {
 	return (RC == 0 || RC->Tmp1 >= 0)? REG_TMP1 : REG_NONE;
+    } else if ((Use & REG_PTR1_LO) != 0) {
+	return (RC == 0 || RC->Ptr1Lo >= 0)? REG_PTR1_LO : REG_NONE;
+    } else if ((Use & REG_PTR1_HI) != 0) {
+	return (RC == 0 || RC->Ptr1Hi >= 0)? REG_PTR1_HI : REG_NONE;
     } else if ((Use & REG_SREG_LO) != 0) {
 	return (RC == 0 || RC->SRegLo >= 0)? REG_SREG_LO : REG_NONE;
     } else if ((Use & REG_SREG_HI) != 0) {
@@ -600,7 +629,7 @@ unsigned GetKnownReg (unsigned Use, const RegContents* RC)
     }
 }
 
-
+                              
 
 static cmp_t FindCmpCond (const char* Code, unsigned CodeLen)
 /* Search for a compare condition by the given code using the given length */