Fixed more E_MCONST issues

[cc65] / src / cc65 / codeinfo.c

diff --git a/src/cc65/codeinfo.c b/src/cc65/codeinfo.c
index b5e234ecd3d2cc7d010024cc417af7fa2507c549..162864422c5600839fc076d13f3e505e69579e4e 100644 (file)
--- a/src/cc65/codeinfo.c
+++ b/src/cc65/codeinfo.c
@@ -82,45 +82,61 @@ static const FuncInfo FuncInfoTable[] = {
     { "decax3",        REG_AX,         REG_AX          },
     { "decax4",        REG_AX,         REG_AX          },
     { "decax5",        REG_AX,         REG_AX          },
-    { "decax6",        REG_AX,         REG_AX          },
+    { "decax6",        REG_AX,         REG_AX          },
     { "decax7",        REG_AX,         REG_AX          },
-    { "decax8",        REG_AX,         REG_AX          },
-    { "decaxy",                REG_AXY,        REG_AX          },
-    { "decsp2",        REG_NONE,       REG_A           },
-    { "decsp3",        REG_NONE,       REG_A           },
-    { "decsp4",        REG_NONE,       REG_A           },
-    { "decsp5",        REG_NONE,       REG_A           },
-    { "decsp6",        REG_NONE,       REG_A           },
-    { "decsp7",        REG_NONE,       REG_A           },
-    { "decsp8",        REG_NONE,       REG_A           },
-    { "incsp1",                REG_NONE,       REG_NONE        },
-    { "incsp2",                REG_NONE,       REG_Y           },
-    { "incsp3",                REG_NONE,       REG_Y           },
-    { "incsp4",                REG_NONE,       REG_Y           },
-    { "incsp5",                REG_NONE,       REG_Y           },
-    { "incsp6",                REG_NONE,       REG_Y           },
-    { "incsp7",                REG_NONE,       REG_Y           },
-    { "incsp8",                REG_NONE,       REG_Y           },
-    { "ldax0sp",       REG_Y,          REG_AX          },
-    { "ldaxysp",       REG_Y,          REG_AX          },
-    { "pusha",         REG_A,          REG_Y           },
-    { "pusha0",                REG_A,          REG_XY          },
-    { "pushax",                REG_AX,         REG_Y           },
-    { "pushw0sp",      REG_NONE,       REG_AXY         },
-    { "pushwysp",      REG_Y,          REG_AXY         },
-    { "tosicmp",       REG_AX,         REG_AXY         },
+    { "decax8",        REG_AX,         REG_AX          },
+    { "decaxy",                REG_AXY,        REG_AX          },
+    { "decsp1",                REG_NONE,       REG_Y           },
+    { "decsp2",        REG_NONE,       REG_A           },
+    { "decsp3",        REG_NONE,       REG_A           },
+    { "decsp4",        REG_NONE,       REG_A           },
+    { "decsp5",        REG_NONE,       REG_A           },
+    { "decsp6",        REG_NONE,       REG_A           },
+    { "decsp7",        REG_NONE,       REG_A           },
+    { "decsp8",        REG_NONE,       REG_A           },
+    { "incsp1",                REG_NONE,       REG_NONE        },
+    { "incsp2",                REG_NONE,       REG_Y           },
+    { "incsp3",                REG_NONE,       REG_Y           },
+    { "incsp4",                REG_NONE,       REG_Y           },
+    { "incsp5",                REG_NONE,       REG_Y           },
+    { "incsp6",                REG_NONE,       REG_Y           },
+    { "incsp7",                REG_NONE,       REG_Y           },
+    { "incsp8",                REG_NONE,       REG_Y           },
+    { "ldaui",          REG_AX,         REG_AXY         },
+    { "ldauidx",        REG_AXY,        REG_AX          },
+    { "ldax0sp",       REG_Y,          REG_AX          },
+    { "ldaxi",          REG_AX,         REG_AXY         },
+    { "ldaxidx",        REG_AXY,        REG_AX          },
+    { "ldaxysp",       REG_Y,          REG_AX          },
+    { "leaasp",         REG_A,          REG_AX          },
+    { "pusha",         REG_A,          REG_Y           },
+    { "pusha0",                REG_A,          REG_XY          },
+    { "pushax",                REG_AX,         REG_Y           },
+    { "pushw0sp",      REG_NONE,       REG_AXY         },
+    { "pushwysp",      REG_Y,          REG_AXY         },
+    { "tosicmp",       REG_AX,         REG_AXY         },
 };
 #define FuncInfoCount  (sizeof(FuncInfoTable) / sizeof(FuncInfoTable[0]))
 
 /* Table with names of zero page locations used by the compiler */
-static const char* ZPNameTable[] = {
-    "ptr1", "regbank", "regsave", "sp", "sreg", "tmp1"
+typedef struct ZPInfo ZPInfo;
+struct ZPInfo {
+    unsigned char Len;         /* Length of the following string */
+    char          Name[11];     /* Name of zero page symbol */
 };
-#define ZPNameCount    (sizeof(ZPNameTable) / sizeof(ZPNameTable[0]))
+static const ZPInfo ZPInfoTable[] = {
+    {          4,      "ptr1"          },
+    {   7,      "regbank"       },
+    {   7,      "regsave"       },
+    {   2,      "sp"            },
+    {   4,      "sreg"          },
+    {   4,      "tmp1"          },
+};
+#define ZPInfoCount            (sizeof(ZPInfoTable) / sizeof(ZPInfoTable[0]))
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                          Code                                    */
 /*****************************************************************************/
 
 
@@ -147,11 +163,11 @@ void GetFuncInfo (const char* Name, unsigned char* Use, unsigned char* Chg)
     if (Name[0] == '_') {
 
        /* Search in the symbol table, skip the leading underscore */
-       SymEntry* E = FindSym (Name+1);
+       SymEntry* E = FindGlobalSym (Name+1);
 
        /* Did we find it in the top level table? */
-       if (E && E->Owner->PrevTab == 0 && IsTypeFunc (E->Type)) {
-
+       if (E && IsTypeFunc (E->Type)) {
+                
            /* A function may use the A or A/X registers if it is a fastcall
             * function. If it is not a fastcall function but a variadic one,
             * it will use the Y register (the parameter size is passed here).
@@ -207,10 +223,12 @@ int IsZPName (const char* Name)
 /* Return true if the given name is a zero page symbol */
 {
     unsigned I;
+    const ZPInfo* Info;
 
     /* Because of the low number of symbols, we do a linear search here */
-    for (I = 0; I < ZPNameCount; ++I) {
-       if (strcmp (Name, ZPNameTable[I]) == 0) {
+    for (I = 0, Info = ZPInfoTable; I < ZPInfoCount; ++I, ++Info) {
+               if (strncmp (Name, Info->Name, Info->Len) == 0 &&
+           (Name[Info->Len] == '\0' || Name[Info->Len] == '+')) {
            /* Found */
            return 1;
        }