From: sdattalo <sdattalo@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 18 Feb 2001 04:24:19 +0000 (+0000)
Subject: Resolved CVS merge conflicts. Re-added GcurMemap (for now).
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d04cacac3001188872590ba862573092f0eb0e22;p=fw%2Fsdcc

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 b8e599e0..46f95a36 100644
--- 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;