Debugging the condes support

git-svn-id: svn://svn.cc65.org/cc65/trunk@461 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ar65/library.c b/src/ar65/library.c
index 5c1ba063cd813e46018d7c0105584fe4b4408361..21b9f072e429dcdba48997453d24ccad1fbf60c5 100644 (file)
--- a/src/ar65/library.c
+++ b/src/ar65/library.c
@@ -389,13 +389,20 @@ static void LibCheckExports (ObjData* O)
         printf ("Module `%s' (%u exports):\n", O->Name, Count);
     }
     while (Count--) {
+                     
+       unsigned char   Tag;
+       unsigned        Len;
+       char*           Name;
 
        /* Get the export tag */
-       unsigned char Tag = *Exports++;
+       Tag = *Exports++;
+
+       /* condes decls may follow */
+       Exports += GET_EXP_CONDES_COUNT (Tag);
 
                /* Next thing is name of symbol */
-       unsigned Len = GetVar (&Exports);
-       char* Name = xmalloc (Len + 1);
+       Len = GetVar (&Exports);
+       Name = xmalloc (Len + 1);
        memcpy (Name, Exports, Len);
        Name [Len] = '\0';
        Exports += Len;
@@ -414,7 +421,7 @@ static void LibCheckExports (ObjData* O)
 
        /* Insert the name into the hash table */
        if (Verbose > 1) {
-               printf ("  %s\n", Name);
+               printf ("  %s\n", Name);
        }
        ExpInsert (Name, O->Index);
 

diff --git a/src/ca65/fragment.h b/src/ca65/fragment.h
index e2ef06517ba4b008dbb67200a626ef7a7e31d4b2..e160462b419de0b990ba1e23ba96a904372fdf36 100644 (file)
--- a/src/ca65/fragment.h
+++ b/src/ca65/fragment.h
@@ -38,13 +38,14 @@
 
 
 
-#include "../common/exprdefs.h"
-#include "../common/filepos.h"
+/* common */
+#include "exprdefs.h"
+#include "filepos.h"
 
 
 
 /*****************************************************************************/
-/*                             struct Fragment                              */
+/*                             struct Fragment                              */
 /*****************************************************************************/
 
 
@@ -76,3 +77,4 @@ extern Fragment* FragLast;
 
 
 
+         

diff --git a/src/common/exprdefs.h b/src/common/exprdefs.h
index 4e95685e6422fb5b3ee5effe94ab2981509deab4..4bf38bf7fd6f8de0d151788a17fe438fd9919cde 100644 (file)
--- a/src/common/exprdefs.h
+++ b/src/common/exprdefs.h
@@ -111,6 +111,7 @@ struct ExprNode {
        unsigned            SegNum;     /* If this is a segment */
        unsigned            ImpNum;     /* If this is an import */
        struct Memory*      MemArea;    /* If this is a memory area */
+       struct Section*     Sec;        /* If segment and Obj is NULL */
     } V;
 };