From: jesusc <jesusc@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Wed, 11 Dec 2002 12:04:59 +0000 (+0000)
Subject: When generating aomf51 file, corrected bug in static functions, and a bug
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=347c4f93a45a67e19d6d5438327c447d446db419;p=fw%2Fsdcc

When generating aomf51 file, corrected bug in static functions, and a bug
when including debug information from the libraries.


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2115 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/as/mcs51/lkaomf51.c b/as/mcs51/lkaomf51.c
index 7082e675..d100081a 100644
--- a/as/mcs51/lkaomf51.c
+++ b/as/mcs51/lkaomf51.c
@@ -25,6 +25,7 @@
 
 #define EQ(A,B) !strcmp((A),(B))
 #define MEMSIZE 0x10000
+//#define DODUMP 1
 
 typedef struct
 {
@@ -122,7 +123,7 @@ void GetName(char * filepath, char * name)
 void SaveLinkedFilePath(char * filepath) 
 {
 	int j;
-	
+
 	if(dflag)
 	{
 		infn=realloc(infn, sizeof(_infn)*(numin+1));
@@ -143,7 +144,12 @@ void SaveLinkedFilePath(char * filepath)
 		GetName(infn[numin].PathName, infn[numin].ModuleName);
 		//printf("%s, %s\n", infn[numin].PathName, infn[numin].ModuleName);
 		
-		numin++;
+		/*Check if this filename is already in*/
+		for(j=0; j<numin; j++)
+		{
+			if(EQ(infn[numin].PathName, infn[j].PathName)) break;
+		}
+		if(j==numin) numin++;
 	}
 }
 
@@ -210,6 +216,7 @@ void OutputChkSum(void)
 	GlobalChkSum=0;
 }
 
+#ifdef DODUMP
 void DumpForDebug (void)
 {
 	char DumpFileName[PATH_MAX];
@@ -260,6 +267,7 @@ void DumpForDebug (void)
 
 	fclose(DumpFile);
 }
+#endif
 
 void OutputAOEMF51(void)
 {
@@ -536,6 +544,7 @@ void CollectInfoFromCDB(void)
 	if(CDBin==NULL)
 	{
 		printf("Couldn't open file '%s'\n", SourceName);
+		lkexit(1);
 	}
 
 	CurrentModule=0; /*Set the active module as the first one*/
@@ -725,6 +734,17 @@ void CollectInfoFromCDB(void)
 								break;
 							}
 						}
+						
+						/*It could be also a static function*/
+						for(j=0; j<numproc; j++)
+						{
+							if(EQ(procedure[j].name, name))
+							{
+								if( (procedure[j].BeginAdd==-1) ) procedure[j].BeginAdd=Address;
+								break;
+							}
+						}
+
 					break;
 					
 					case 'L': /*Example L:Lmain$j$1$1:29*/
@@ -925,7 +945,9 @@ void CreateAOMF51(void)
 	if(dflag)
 	{
 		CollectInfoFromCDB();
-		//DumpForDebug();
+		#ifdef DODUMP
+		DumpForDebug();
+		#endif
 		HexSize=ReadHexFile(&HexBegin)+1;
 		OutputAOEMF51();
 		FreeAll();
diff --git a/as/mcs51/lklibr.c b/as/mcs51/lklibr.c
index 26d4a881..555adb17 100644
--- a/as/mcs51/lklibr.c
+++ b/as/mcs51/lklibr.c
@@ -462,6 +462,7 @@ char *name;
 			if (dflag && dfp) {
 			    FILE *xfp = afile(str,"adb",0); //JCF: Nov 30, 2002
 			    if (xfp) {
+				SaveLinkedFilePath(str);
 				copyfile(dfp,xfp);
 				fclose(xfp);
 			    }
diff --git a/as/mcs51/lkmain.c b/as/mcs51/lkmain.c
index 1d8df7cf..e0f6a924 100644
--- a/as/mcs51/lkmain.c
+++ b/as/mcs51/lkmain.c
@@ -245,6 +245,7 @@ char *argv[];
 	
 	if (dflag){
 	    //dfp = afile("temp", "cdb", 1);
+		SaveLinkedFilePath(linkp->f_idp); //Must be the first one... 
 		dfp = afile(linkp->f_idp,"cdb",1); //JCF: Nov 30, 2002
 	    if (dfp == NULL) 
 		lkexit(1);