Debugging the condes support

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

src/ar65/library.c

@@ -390,12 +390,19 @@ static void LibCheckExports (ObjData* O)
     }
     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);
 

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;
 
 
 
+	  

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;
 };