[dotgnu-pnet-commits] pnet/engine jitc.c jitc_stack.c

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      06/10/05 19:06:27

Modified files:
        engine         : jitc.c jitc_stack.c 

Log message:
        Move ALLOC_STACK from jitc.c to jitc_stack.c and fix a minor issue 
introduced
        with my previous commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/engine/jitc.c?cvsroot=dotgnu-pnet&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/pnet/engine/jitc_stack.c?cvsroot=dotgnu-pnet&r1=1.6&r2=1.7

Patches:
Index: jitc.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/jitc.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- jitc.c      5 Oct 2006 17:20:50 -0000       1.53
+++ jitc.c      5 Oct 2006 19:06:27 -0000       1.54
@@ -467,25 +467,6 @@
        }
 
 /*
- * Allocate enough space for "n" values on the stack.
- */
-#define        ALLOC_STACK(coder, n)   \
-                       do { \
-                               if((n) > (coder)->stackSize) \
-                               { \
-                                       ILJitValue *newStack = \
-                                               (ILJitValue 
*)ILRealloc((coder)->jitStack, \
-                                                                               
          (n) * sizeof(ILJitValue)); \
-                                       if(!newStack) \
-                                       { \
-                                               return 0; \
-                                       } \
-                                       (coder)->jitStack = newStack; \
-                                       (coder)->stackSize = (n); \
-                               } \
-                       } while (0)
-
-/*
  * Acquire and release the metadata lock during layouting a class.
  */
 #define        METADATA_WRLOCK(thread) \

Index: jitc_stack.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/jitc_stack.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- jitc_stack.c        5 Oct 2006 17:20:50 -0000       1.6
+++ jitc_stack.c        5 Oct 2006 19:06:27 -0000       1.7
@@ -20,13 +20,27 @@
 
 #ifdef IL_JITC_DECLARATIONS
 
-typedef struct _tagILJitStackItem ILJitStachItem;
+#ifdef _IL_JIT_OPTIMIZE_LOCALS
+
+typedef struct _tagILJitStackItem ILJitStackItem;
 struct _tagILJitStackItem
 {
+       ILInt32                 flags;
        ILJitValue      value;
+       ILJitLocalSlot *refValue;
 };
 
-#endif
+#define ILJitStackItemNew(name) ILJitStackItem name
+
+#else
+
+typedef ILJitValue ILJitStackItem;
+
+#define ILJitStackItemNew(name) ILJitStackItem name = 0
+
+#endif /* _IL_JIT_OPTIMIZE_LOCALS */
+
+#endif /* IL_JITC_DECLARATIONS */
 
 #ifdef IL_JITC_CODER_INSTANCE
 
@@ -58,15 +72,34 @@
 
 #ifdef IL_JITC_FUNCTIONS
 
+/*
+ * Allocate enough space for "n" values on the stack.
+ */
+#define        ALLOC_STACK(coder, n)   \
+       do { \
+               if((n) > (coder)->stackSize) \
+               { \
+                       ILJitValue *newStack = \
+                               (ILJitValue *)ILRealloc((coder)->jitStack, \
+                                                                         (n) * 
sizeof(ILJitValue)); \
+                       if(!newStack) \
+                       { \
+                               return 0; \
+                       } \
+                       (coder)->jitStack = newStack; \
+                       (coder)->stackSize = (n); \
+               } \
+       } while (0)
+
 #define _JITC_ADJUST(coder, num) \
        do { \
                (coder)->stackTop += (num); \
        } while(0)
 
-#endif
-
 #define JITC_ADJUST(coder, num) _JITC_ADJUST((coder), (num))
 
+#endif
+
 #ifdef IL_JITC_CODE
 
 /*