From: jesusc <jesusc@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Fri, 14 May 2004 21:31:28 +0000 (+0000)
Subject: fixed bug [ 954173 ] code size miscalculation
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a130e769f5de7b2bd89ae4cd11c599c4c6cd545c;p=fw%2Fsdcc

fixed bug [ 954173 ] code size miscalculation


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

diff --git a/ChangeLog b/ChangeLog
index 7856e372..4206c032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-27 Jesus Calvino-Fraga <jesusc AT ece.ubc.ca>
+
+	* as/mcs51/lkmem.c, as/mcs51/lkaomf51: fixed bug 954173
+
 2004-05-14 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
 
 	* src/SDCCsymt.h: added IS_AUTO(symbol) test macro
diff --git a/as/mcs51/lkaomf51.c b/as/mcs51/lkaomf51.c
index 6172838f..82dccb3e 100644
--- a/as/mcs51/lkaomf51.c
+++ b/as/mcs51/lkaomf51.c
@@ -86,6 +86,12 @@ _UsageType UsageType[]=
 {
 	{"CSEG",		0},
 	{"GSINIT",		0},
+	{"GSINIT0",		0},
+	{"GSINIT1",		0},
+	{"GSINIT2",		0},
+	{"GSINIT3",		0},
+	{"GSINIT4",		0},
+	{"GSINIT5",		0},
 	{"GSFINAL",		0},
 	{"HOME",		0},
 	{"XINIT",		0},
diff --git a/as/mcs51/lkmem.c b/as/mcs51/lkmem.c
index bf4c4ef8..62eed5e1 100644
--- a/as/mcs51/lkmem.c
+++ b/as/mcs51/lkmem.c
@@ -152,6 +152,9 @@ int summary(struct area * areap)
 		}
 
 		else if( EQ(xp->a_id, "CSEG") || EQ(xp->a_id, "GSINIT") ||
+				 EQ(xp->a_id, "GSINIT0") || EQ(xp->a_id, "GSINIT1") ||
+				 EQ(xp->a_id, "GSINIT2") || EQ(xp->a_id, "GSINIT3") ||
+				 EQ(xp->a_id, "GSINIT4") || EQ(xp->a_id, "GSINIT5") ||
 				 EQ(xp->a_id, "GSFINAL") || EQ(xp->a_id, "HOME") )
 		{
 			Rom.Size+=xp->a_size;
@@ -403,7 +406,10 @@ int summary2(struct area * areap)
 	while (xp)
 	{
 		if( EQ(xp->a_id, "CSEG") || EQ(xp->a_id, "GSINIT") ||
-				 EQ(xp->a_id, "GSFINAL") || EQ(xp->a_id, "HOME") )
+			EQ(xp->a_id, "GSINIT0") || EQ(xp->a_id, "GSINIT1") ||
+			EQ(xp->a_id, "GSINIT2") || EQ(xp->a_id, "GSINIT3") ||
+			EQ(xp->a_id, "GSINIT4") || EQ(xp->a_id, "GSINIT5") ||
+			EQ(xp->a_id, "GSFINAL") || EQ(xp->a_id, "HOME") )
 		{
 			Rom.Size+=xp->a_size;
 			if(xp->a_addr<Rom.Start) Rom.Start=xp->a_addr;