Factor out state

cnf/Makefile

@@ -33,6 +33,7 @@ SOURCE= \
     funcs \
     gap \
     gasman \
+    globalstate \
     gmpints \
     gvars \
     intfuncs \

src/blister.c

@@ -98,9 +98,9 @@
 
 #include        "saveload.h"            /* saving and loading              */
 
-#include "code.h"		/* coder                           */
-#include "hpc/thread.h"		/* threads			   */
-#include "hpc/tls.h"			/* thread-local storage		   */
+#include	"code.h"		/* coder                           */
+#include	"hpc/thread.h"		/* threads			   */
+#include	"hpc/tls.h"		/* thread-local storage		   */
 
 
 /****************************************************************************

src/code.c

@@ -61,7 +61,7 @@
 **
 **  'PtrBody' is a pointer to the current body.
 */
-Stat * PtrBody;
+/* TL: Stat * PtrBody; */
 
 /****************************************************************************
 **
@@ -80,16 +80,14 @@ Obj FilenameCache;
 **  coding.
 */
 #define MAX_FUNC_EXPR_NESTING 1024
+/* TL: Stat OffsBody; */
 
+/* TL: Stat OffsBodyStack[1024]; */
+/* TL: UInt OffsBodyCount = 0; */
 
-Stat OffsBody;
-
-Stat OffsBodyStack[MAX_FUNC_EXPR_NESTING];
-UInt OffsBodyCount = 0;
-
-UInt LoopNesting = 0;
-UInt LoopStack[MAX_FUNC_EXPR_NESTING];
-UInt LoopStackCount = 0;
+/* TL: UInt LoopNesting = 0; */
+/* TL: UInt LoopStack[MAX_FUNC_EXPR_NESTING]; */
+/* TL: UInt LoopStackCount = 0; */
 
 static inline void PushOffsBody( void ) {
   assert(TLS(OffsBodyCount) <= MAX_FUNC_EXPR_NESTING-1);
@@ -101,6 +99,14 @@ static inline void PopOffsBody( void ) {
   TLS(OffsBody) = TLS(OffsBodyStack)[--TLS(OffsBodyCount)];
 }
 
+static void SetupOffsBodyStackAndLoopStack() {
+  // Careful: Malloc without free
+/* Since this mallocs we use a global variable at the moment
+  TLS(OffsBodyStack) = malloc(MAX_FUNC_EXPR_NESTING*sizeof(Stat));
+  TLS(LoopStack) = malloc(MAX_FUNC_EXPR_NESTING*sizeof(UInt));
+*/
+}
+
 static inline void PushLoopNesting( void ) {
   assert(TLS(LoopStackCount) <= MAX_FUNC_EXPR_NESTING-1);
   TLS(LoopStack)[TLS(LoopStackCount)++] = TLS(LoopNesting);
@@ -234,7 +240,7 @@ Expr            NewExpr (
 **  'CodeResult'  is the result  of the coding, i.e.,   the function that was
 **  coded.
 */
-Obj CodeResult;
+/* TL: Obj CodeResult; */
 
 
 /****************************************************************************
@@ -255,9 +261,9 @@ Obj CodeResult;
 **  'PopStat' returns the  top statement from the  statements  stack and pops
 **  it.  It is an error if the stack is empty.
 */
-Bag StackStat;
+/* TL: Bag StackStat; */
 
-Int CountStat;
+/* TL: Int CountStat; */
 
 void PushStat (
     Stat                stat )
@@ -349,9 +355,9 @@ Stat PopSeqStat (
 **  'PopExpr' returns the top expressions from the expressions stack and pops
 **  it.  It is an error if the stack is empty.
 */
-Bag StackExpr;
+/* TL: Bag StackExpr; */
 
-Int CountExpr;
+/* TL: Int CountExpr; */
 
 void PushExpr (
     Expr                expr )
@@ -531,7 +537,7 @@ void            CodeFuncCallOptionsEnd ( UInt nr )
 **
 **  ...only function expressions inbetween...
 */
-Bag CodeLVars;
+/* TL: Bag CodeLVars; */
 
 void CodeBegin ( void )
 {
@@ -744,7 +750,7 @@ void CodeFuncExprEnd (
 
     /* get the function expression                                         */
     fexp = CURR_FUNC;
-    assert(!LoopNesting);
+    assert(!TLS(LoopNesting));
 
     /* get the body of the function                                        */
     /* push an addition return-void-statement if neccessary                */
@@ -794,6 +800,7 @@ void CodeFuncExprEnd (
     PopLoopNesting();
 
     /* restore the remembered offset                                       */
+    TLS(OffsBody) = BRK_CALL_TO();
     PopOffsBody();
 
     /* if this was inside another function definition, make the expression */
@@ -3380,6 +3387,19 @@ void LoadBody ( Obj body )
 *F * * * * * * * * * * * * * initialize package * * * * * * * * * * * * * * *
 */
 
+void InitCoderState(GlobalState *state)
+{
+    state->OffsBodyCount = 0;
+    state->LoopNesting = 0;
+    state->LoopStackCount = 0;
+    state->StackStat = NewBag( T_BODY, 64*sizeof(Stat) );
+    state->StackExpr = NewBag( T_BODY, 64*sizeof(Expr) );
+}
+
+void DestroyCoderState(GlobalState *state)
+{
+}
+
 /****************************************************************************
 **
 *F  InitKernel( <module> )  . . . . . . . . initialise kernel data structures
@@ -3398,8 +3418,8 @@ static Int InitKernel (
     MakeBagTypePublic(T_BODY);
 
     /* make the result variable known to Gasman                            */
-    InitGlobalBag( &CodeResult, "CodeResult" );
-    
+    InitGlobalBag( &TLS(CodeResult), "CodeResult" );
+
     InitGlobalBag( &FilenameCache, "FilenameCache" );
 
     /* allocate the statements and expressions stacks                      */
@@ -3409,6 +3429,8 @@ static Int InitKernel (
     /* some functions and globals needed for float conversion */
     InitCopyGVar( "EAGER_FLOAT_LITERAL_CACHE", &EAGER_FLOAT_LITERAL_CACHE);
     InitFopyGVar( "CONVERT_FLOAT_LITERAL_EAGER", &CONVERT_FLOAT_LITERAL_EAGER);
+    // InstallTLSHandler(SetupOffsBodyStackAndLoopStack, NULL);
+    SetupOffsBodyStackAndLoopStack();
 
     /* return success                                                      */
     return 0;
@@ -3507,9 +3529,5 @@ StructInitInfo * InitInfoCode ( void )
 
 /****************************************************************************
 **
-
 *E  code.c  . . . . . . . . . . . . . . . . . . . . . . . . . . . . ends here
 */
-
-
-

src/code.h

@@ -35,7 +35,7 @@
 **
 **  'PtrBody' is a pointer to the current body.
 */
-extern  Stat *          PtrBody;
+/* TL: extern  Stat *          PtrBody; */
 
 
 /****************************************************************************

src/compiled.h

@@ -75,6 +75,7 @@ extern "C" {
 
 
 #include        "intrprtr.h"            /* interpreter                     */
+#include        "globalstate.h"    /* */
 
 #include        "compiler.h"            /* compiler                        */
 

src/cyclotom.c

@@ -144,12 +144,16 @@
 **  It is created in 'InitCyc' with room for up to 1000 coefficients  and  is
 **  resized when need arises.
 */
-Obj ResultCyc;
+/* TL: Obj ResultCyc; */
 
 void GrowResultCyc(UInt size) {
     Obj *res;
     UInt i;
-    if ( LEN_PLIST(TLS(ResultCyc)) < size ) {
+    if (TLS(ResultCyc) == 0) {
+        TLS(ResultCyc) = NEW_PLIST( T_PLIST, size );
+        res = &(ELM_PLIST( TLS(ResultCyc), 1 ));
+        for ( i = 0; i < size; i++ ) { res[i] = INTOBJ_INT(0); }
+    } else if ( LEN_PLIST(TLS(ResultCyc)) < size ) {
         GROW_PLIST( TLS(ResultCyc), size );
         SET_LEN_PLIST( TLS(ResultCyc), size );
         res = &(ELM_PLIST( TLS(ResultCyc), 1 ));
@@ -175,8 +179,8 @@ void GrowResultCyc(UInt size) {
 **  is called to compute $e_n^i$ and can then do this easier by just  putting
 **  1 at the <i>th place in 'ResultCyc' and then calling 'Cyclotomic'.
 */
-Obj  LastECyc;
-UInt LastNCyc;
+/* TL: Obj  LastECyc; */
+/* TL: UInt TLS(LastNCyc); */
 
 
 /****************************************************************************
@@ -2150,14 +2154,11 @@ static Int InitKernel (
 
     /* install the marking function                                        */
     InfoBags[ T_CYC ].name = "cyclotomic";
-    InitMarkFuncBags( T_CYC, MarkCycSubBags );
-
     /* create the result buffer                                            */
-    InitGlobalBag( &ResultCyc , "src/cyclotom.c:ResultCyc" );
+    InitGlobalBag( &TLS(ResultCyc) , "src/cyclotom.c:ResultCyc" );
 
     /* tell Gasman about the place were we remember the primitive root     */
-    InitGlobalBag( &LastECyc, "src/cyclotom.c:LastECyc" );
-
+    InitGlobalBag( &TLS(LastECyc), "src/cyclotom.c:LastECyc" );
     /* install the type function                                           */
     ImportGVarFromLibrary( "TYPE_CYC", &TYPE_CYC );
     TypeObjFuncs[ T_CYC ] = TypeCyc;

src/exprs.c

@@ -2145,6 +2145,15 @@ static Int InitLibrary (
     return 0;
 }
 
+void InitExprState(GlobalState *state)
+{
+    state->CurrEvalExprFuncs = EvalExprFuncs;
+}
+
+void DestroyExprState(GlobalState *state)
+{
+}
+
 /****************************************************************************
 **
 *F  InitInfoExprs() . . . . . . . . . . . . . . . . . table of init functions

src/funcs.c

@@ -765,7 +765,7 @@ Obj             EvalFunccallXargs (
 **
 */
 
-Int RecursionDepth;
+/* TL: Int RecursionDepth; */
 static UInt RecursionTrapInterval;
 
 static void RecursionDepthTrap( void )
@@ -1394,7 +1394,7 @@ void             PrintFunccallOpts (
 *F  ExecBegin() . . . . . . . . . . . . . . . . . . . . .  begin an execution
 *F  ExecEnd(<error>)  . . . . . . . . . . . . . . . . . . .  end an execution
 */
-Obj             ExecState;
+/* TL: Obj             ExecState; */
 
 void            ExecBegin ( Obj frame )
 {
@@ -1506,7 +1506,7 @@ static Int InitKernel (
     InitCopyGVar("STEVES_TRACING", &STEVES_TRACING);
 
     /* make the global variable known to Gasman                            */
-    InitGlobalBag( &ExecState, "src/funcs.c:ExecState" );
+    InitGlobalBag( &TLS(ExecState), "src/funcs.c:ExecState" );
 
     /* Register the handler for our exported function                      */
     InitHdlrFuncsFromTable( GVarFuncs );

src/funcs.h

@@ -42,8 +42,7 @@ extern  void            ExecEnd (
             UInt                error );
 
 
-extern Int RecursionDepth;
-
+/* TL: extern Int RecursionDepth; */
 /****************************************************************************
 **
 

src/gap.c

@@ -95,6 +95,9 @@
 #include        "sysfiles.h"            /* file input/output               */
 #include        "weakptr.h"             /* weak pointers                   */
 #include        "profile.h"             /* profiling                       */
+
+#include        "globalstate.h"    /* Global State                    */
+
 #ifdef GAPMPI
 #include        "hpc/gapmpi.h"          /* ParGAP/MPI                      */
 #endif
@@ -746,6 +749,8 @@ int main (
   InstallBacktraceHandlers();
 #endif
 
+  InitMainGlobalState();
+
 #ifdef HAVE_REALPATH
   if (argc >= 3 && !strcmp(argv[1],"--createstartupscript")) {
       return DoCreateStartupScript(argc,argv,0);
@@ -1145,7 +1150,7 @@ Obj  ErrorLVars0;
 Obj  ErrorLVars;
 Int  ErrorLLevel;
 
-extern Obj BottomLVars;
+// extern Obj BottomLVars;
 
 
 void DownEnvInner( Int depth )
@@ -1266,7 +1271,7 @@ Obj FuncPrintExecutingStatement(Obj self, Obj context)
 */
 
 /* syJmp_buf CatchBuffer; */
-Obj ThrownObject = 0;
+/* TL: Obj ThrownObject = 0; */
 
 Obj FuncCALL_WITH_CATCH( Obj self, Obj func, Obj args )
 {
@@ -1320,8 +1325,8 @@ Obj FuncJUMP_TO_CATCH( Obj self, Obj payload)
 }
 
 
-UInt UserHasQuit;
-UInt UserHasQUIT;
+/* TL: UInt UserHasQuit; */
+/* TL: UInt UserHasQUIT; */
 UInt SystemErrorCode;
 
 Obj FuncSetUserHasQuit( Obj Self, Obj value)
@@ -3049,7 +3054,8 @@ static Int InitKernel (
     StructInitInfo *    module )
 {
     /* init the completion function                                        */
-    InitGlobalBag( &ThrownObject,      "src/gap.c:ThrownObject"      );
+    /* InitGlobalBag( &ThrownObject,      "src/gap.c:ThrownObject"      ); */
+    InitGlobalBag( &TLS(ThrownObject),    "src/gap.c:ThrownObject"      );
 
     /* list of exit functions                                              */
     InitGlobalBag( &WindowCmdString, "src/gap.c:WindowCmdString" );
@@ -3334,7 +3340,6 @@ void InitializeGap (
     UInt                i;
     Int                 ret;
 
-
     /* initialize the basic system and gasman                              */
 #ifdef GAPMPI
     /* ParGAP/MPI needs to call MPI_Init() first to remove command line args */
@@ -3349,6 +3354,15 @@ void InitializeGap (
               SyCacheSize, 0, SyAbortBags );
               InitMsgsFuncBags( SyMsgsBags ); 
 
+    TLS(StackNams)    = NEW_PLIST( T_PLIST, 16 );
+    TLS(CountNams)    = 0;
+    TLS(ReadTop)      = 0;
+    TLS(ReadTilde)    = 0;
+    TLS(CurrLHSGVar)  = 0;
+    TLS(IntrCoding)   = 0;
+    TLS(IntrIgnoring) = 0;
+    TLS(NrError)      = 0;
+    TLS(ThrownObject) = 0;
 
     /* get info structures for the build in modules                        */
     NrModules = 0;
@@ -3383,6 +3397,8 @@ void InitializeGap (
         }
     }
 
+    InitGlobalState(MainGlobalState);
+
     InitGlobalBag(&POST_RESTORE, "gap.c: POST_RESTORE");
     InitFopyGVar( "POST_RESTORE", &POST_RESTORE);
 

src/gap.h

@@ -237,8 +237,8 @@ typedef UInt ExecStatus;
 
 
 
-extern UInt UserHasQuit;
-extern UInt UserHasQUIT;
+// TL: extern UInt UserHasQuit;
+// TL: extern UInt UserHasQUIT;
 extern UInt SystemErrorCode;
 
 #if 0