From: jesusc <jesusc@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Thu, 12 Dec 2002 01:16:50 +0000 (+0000)
Subject: Corrected a bug when the CDB file does not propperly mark a function end.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=4b403d1cd317aab528757caf2aff9635252ffaf8;p=fw%2Fsdcc

Corrected a bug when the CDB file does not propperly mark a function end.


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

diff --git a/as/mcs51/lkaomf51.c b/as/mcs51/lkaomf51.c
index d100081a..e7933fe9 100644
--- a/as/mcs51/lkaomf51.c
+++ b/as/mcs51/lkaomf51.c
@@ -25,7 +25,7 @@
 
 #define EQ(A,B) !strcmp((A),(B))
 #define MEMSIZE 0x10000
-//#define DODUMP 1
+#define DODUMP 1
 
 typedef struct
 {
@@ -308,7 +308,7 @@ void OutputAOEMF51(void)
 		/*Public symbols defined in this module*/
 		recsize=2;
 		for(k=0; k<numsym; k++)/*Compute the record length*/
-			if ( (symbol[k].FileNameNumber==j) &&
+			if ( (symbol[k].FileNameNumber==j) && (symbol[k].Address!=-1) &&
 				 (symbol[k].Procedure==-1) &&
 				 (symbol[k].Static==-1) ) recsize+=((strlen(symbol[k].name)+1)+5);
 
@@ -319,7 +319,7 @@ void OutputAOEMF51(void)
 			OutputByte(0x01);	/*DEF TYPE: Public symbols*/
 			for(k=0; k<numsym; k++)
 			{
-				if ( (symbol[k].FileNameNumber==j) &&
+				if ( (symbol[k].FileNameNumber==j) && (symbol[k].Address!=-1) &&
 					 (symbol[k].Procedure==-1) &&
 					 (symbol[k].Static==-1) )
 				{
@@ -336,7 +336,7 @@ void OutputAOEMF51(void)
 		/*Local symbols defined in this module*/
 		recsize=2;
 		for(k=0; k<numsym; k++)/*Compute the record length*/
-			if ( (symbol[k].FileNameNumber==j) &&
+			if ( (symbol[k].FileNameNumber==j) && (symbol[k].Address!=-1) &&
 				 (symbol[k].Procedure==-1) &&
 				 (symbol[k].Static==j) ) recsize+=((strlen(symbol[k].name)+1)+5);
 
@@ -347,7 +347,7 @@ void OutputAOEMF51(void)
 			OutputByte(0x00);	/*DEF TYPE: Local symbols*/
 			for(k=0; k<numsym; k++)
 			{
-				if ( (symbol[k].FileNameNumber==j) && 
+				if ( (symbol[k].FileNameNumber==j) && (symbol[k].Address!=-1) &&
 					 (symbol[k].Procedure==-1) &&
 					 (symbol[k].Static==j) )
 				{
@@ -827,6 +827,11 @@ void CollectInfoFromCDB(void)
 		}
 	}
 
+	/*Make sure each procedure has an end*/
+	for(k=0; k<(numproc-1); k++)
+	{
+		if (procedure[k].EndAdd==-1) procedure[k].EndAdd=procedure[k+1].BeginAdd-1;
+	}
 	/*Asign each line number to a procedure*/
 	for(j=0; j<numlinenum; j++)
 	{