* src/SDCCsymt.h: a missing part of my last change

* src/pic/ralloc.c (regTypeNum),
* src/pic16/ralloc.c (regTypeNum): fixed statement/declaration order

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

diff --git a/ChangeLog b/ChangeLog
index 7c121627df1bbeac223484e98b03e51ae5feadab..edb3d273ab31b6e2fa31f45dc73c570703c0a0fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-23 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+       * src/SDCCsymt.h: a missing part of my last change
+       * src/pic/ralloc.c (regTypeNum),
+       * src/pic16/ralloc.c (regTypeNum): fixed statement/declaration order
+
 2004-04-23 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
 
        * src/SDCCicode.h,
@@ -10,7 +16,7 @@
        * src/hc08/ralloc.c (regTypeNum),
        * src/ds390/ralloc.c (regTypeNum),
        * src/mcs51/ralloc.c (regTypeNum): check for dependancy hazards before
-       creating pseudo symbols (fixed bugs #777768 and #933966)
+       creating pseudo symbols (fixed bugs #777768, #930484, and #933966)
 
 2004-04-22 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
 

diff --git a/src/SDCCsymt.h b/src/SDCCsymt.h
index 353f41f6f9fd0164ffc0f20077182b825932d8cb..394c4387b232b4cb932058ed80f3bd992c2f41f9 100644 (file)
--- a/src/SDCCsymt.h
+++ b/src/SDCCsymt.h
@@ -298,6 +298,7 @@ typedef struct symbol
     struct iCode *rematiCode;  /* rematerialse with which instruction */
     struct operand *reqv;      /* register equivalent of a local variable */
     struct symbol *prereqv;    /* symbol before register equiv. substituion */
+    struct symbol *psbase;     /* if pseudo symbol, the symbol it is based on */
     union
       {
        struct symbol *spillLoc;        /* register spil location */

diff --git a/src/pic/ralloc.c b/src/pic/ralloc.c
index 25c3036959085bdb26ba599793c41aa4e873da9a..e71c82f99352dd75d963e8bd85280c0a1241e3ec 100644 (file)
--- a/src/pic/ralloc.c
+++ b/src/pic/ralloc.c
@@ -2734,11 +2734,13 @@ regTypeNum ()
 
                                if (ptrPseudoSymSafe (sym, ic)) {
 
+                                       symbol *psym;
+                                       
                                        debugLog ("  %d - \n", __LINE__);
                                
                                        /* create a psuedo symbol & force a spil */
                                        //X symbol *psym = newSymbol (rematStr (OP_SYMBOL (IC_LEFT (ic))), 1);
-                                       symbol *psym = rematStr (OP_SYMBOL (IC_LEFT (ic)));
+                                       psym = rematStr (OP_SYMBOL (IC_LEFT (ic)));
                                        psym->type = sym->type;
                                        psym->etype = sym->etype;
                                        psym->psbase = ptrBaseRematSym (OP_SYMBOL (IC_LEFT (ic)));

diff --git a/src/pic16/ralloc.c b/src/pic16/ralloc.c
index c589bb41b4e50c32a68909b5f4ab559cde865fcc..1fd35e61ff2a3f1c0b894d2bc610c79673825dfe 100644 (file)
--- a/src/pic16/ralloc.c
+++ b/src/pic16/ralloc.c
@@ -2582,11 +2582,13 @@ regTypeNum ()
 
        if (ptrPseudoSymSafe (sym, ic)) {
           
+         symbol *psym;
+         
          debugLog ("  %d - \n", __LINE__);
              
          /* create a psuedo symbol & force a spil */
          //X symbol *psym = newSymbol (rematStr (OP_SYMBOL (IC_LEFT (ic))), 1);
-         symbol *psym = rematStr (OP_SYMBOL (IC_LEFT (ic)));
+         psym = rematStr (OP_SYMBOL (IC_LEFT (ic)));
          psym->type = sym->type;
          psym->etype = sym->etype;
          psym->psbase = ptrBaseRematSym (OP_SYMBOL (IC_LEFT (ic)));