[Dotgnu-pnet-commits] CVS: pnet/codegen cg_gen.c,1.43,1.44 cg_gen.h,1.33,1.34 cg_nodemap.c,1.2,1.3 cg_nodemap.h,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/codegen
In directory subversions:/tmp/cvs-serv14316/codegen

Modified Files:
        cg_gen.c cg_gen.h cg_nodemap.c cg_nodemap.h 
Log Message:


Reset the state of "overflowInsns" to the global value when jumping to
another class to perform semantic analysis on a member, as the state at the
jump point may not match the required state at the destination.


Index: cg_gen.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_gen.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** cg_gen.c    5 Nov 2002 00:25:20 -0000       1.43
--- cg_gen.c    28 Nov 2002 01:51:43 -0000      1.44
***************
*** 97,100 ****
--- 97,101 ----
        info->nextLabel = 1;
        info->overflowInsns = 1;
+       info->overflowGlobal = 1;
        info->pedanticArith = 0;
        info->clsCompliant = 0;

Index: cg_gen.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_gen.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** cg_gen.h    27 Nov 2002 11:13:32 -0000      1.33
--- cg_gen.h    28 Nov 2002 01:51:43 -0000      1.34
***************
*** 98,101 ****
--- 98,102 ----
        ILLabel                 nextLabel;                      /* Next 
temporary label to allocate */
        int                             overflowInsns : 1;      /* Use overflow 
instructions */
+       int                             overflowGlobal : 1;     /* Global 
versino of "overflowInsns" */
        int                             pedanticArith : 1;      /* Make 
arithmetic always accurate */
        int                             clsCompliant : 1;       /* Use strict 
CLS library only */

Index: cg_nodemap.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_nodemap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cg_nodemap.c        23 Jun 2002 03:26:38 -0000      1.2
--- cg_nodemap.c        28 Nov 2002 01:51:43 -0000      1.3
***************
*** 193,196 ****
--- 193,197 ----
        context->currentClass = info->currentClass;
        context->currentNamespace = info->currentNamespace;
+       context->overflowInsns = info->overflowInsns;
  
        /* Bail out if we don't have a node for the program item */
***************
*** 240,243 ****
--- 241,245 ----
                info->currentScope = globalScope;
        }
+       info->overflowInsns = info->overflowGlobal;
  
        /* Ready to go */
***************
*** 250,253 ****
--- 252,256 ----
        info->currentClass = context->currentClass;
        info->currentNamespace = context->currentNamespace;
+       info->overflowInsns = context->overflowInsns;
  }
  

Index: cg_nodemap.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_nodemap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** cg_nodemap.h        23 Jun 2002 01:55:43 -0000      1.1
--- cg_nodemap.h        28 Nov 2002 01:51:43 -0000      1.2
***************
*** 34,37 ****
--- 34,38 ----
        ILNode  *currentClass;
        ILNode  *currentNamespace;
+       int              overflowInsns;
  
  } ILGenItemContext;