Resolved CVS merge conflicts. Re-added GcurMemap (for now).

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

diff --git a/src/SDCCast.c b/src/SDCCast.c
index b8e599e0916d2f6710f6a90fd7bc2dbc27080478..46f95a3689f22c522da917e8c070e47400dca8f5 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -56,6 +56,7 @@ ast *optimizeRRCRLC (ast *);
 ast *optimizeGetHbit (ast *);
 ast *backPatchLabels (ast *, symbol *, symbol *);
 int inInitMode = 0;
+memmap *GcurMemmap=NULL;  /* points to the memmap that's currently active */
 FILE *codeOutFile;
 int 
 ptt (ast * tree)
@@ -4073,6 +4074,7 @@ createFunction (symbol * name, ast * body)
     }
 
   /* create the node & generate intermediate code */
+  GcurMemmap = code;
   codeOutFile = code->oFile;
   piCode = iCodeFromAst (ex);
 
@@ -4087,6 +4089,7 @@ createFunction (symbol * name, ast * body)
   /* if there are any statics then do them */
   if (staticAutos)
     {
+      GcurMemmap = statsg;
       codeOutFile = statsg->oFile;
       eBBlockFromiCode (iCodeFromAst (decorateType (resolveSymbols (staticAutos))));
       staticAutos = NULL;