Fixed bug when linking asmblink example

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

diff --git a/ChangeLog b/ChangeLog
index 9b9f1ce6f0f40828054dcd38c74c5bc3b296bd77..6289c21ade19d65a438046a781989b7bd798dafe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-11  Jesus Calvino-Fraga <jesusc@ece.ubc.ca>
+
+       * as/mcs51/lkmain.c: Added ASlink-Warning to messages 
+       * as/mcs51/lkaomf51.c: Fixed bug when linking asmblink example
+
 2003-03-11 Kevin Vigor <kevin@vigor.nu>
 
        * src/SDCCpeeph.c: fix so that operandsNotEqualX functions are

diff --git a/as/mcs51/lkaomf51.c b/as/mcs51/lkaomf51.c
index 9cf610e54376e730f7bc5d4170466995f0058c22..4caa8f58571dae1447b3493c238c6f0fda74e7c6 100644 (file)
--- a/as/mcs51/lkaomf51.c
+++ b/as/mcs51/lkaomf51.c
@@ -462,21 +462,29 @@ void OutputAOEMF51(void)
 
        for(j=-1; j<numproc; j++)
        {
-               if(j==-1)
+               if(numproc)
                {
-                       i=HexBegin;
-                       k=procedure[0].BeginAdd;
+                       if(j==-1)
+                       {
+                               i=HexBegin;
+                               k=procedure[0].BeginAdd;
+                       }
+                       else if(j==(numproc-1))
+                       {
+                               i=procedure[j].EndAdd+1;
+                               k=HexSize;
+                       }
+                       else
+                       {
+                               i=procedure[j].EndAdd+1;
+                               k=procedure[j+1].BeginAdd;
+                       }
                }
-               else if(j==(numproc-1))
+               else /*What, no procedures??? Ok, here it is the whole hex file*/
                {
-                       i=procedure[j].EndAdd+1;
+                       i=HexBegin;
                        k=HexSize;
                }
-               else
-               {
-                       i=procedure[j].EndAdd+1;
-                       k=procedure[j+1].BeginAdd;
-               }
 
                if(i<k)
                {