Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2822

Modified Files:
        mal_instruction.mx 
Log Message:
Moved to a larger address space for variables


Index: mal_instruction.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_instruction.mx,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- mal_instruction.mx  19 Mar 2008 08:29:26 -0000      1.319
+++ mal_instruction.mx  19 Mar 2008 19:57:02 -0000      1.320
@@ -371,8 +371,8 @@
 @h
        str modname;            /* module context */
        str fcnname;            /* function name */
-       short argc, retc, maxarg;       /* total and result argument count */
-       short argv[];           /* at least a few entries */
+       int argc, retc, maxarg; /* total and result argument count */
+       int argv[];             /* at least a few entries */
 } *InstrPtr, InstrRecord;
 
 @-
@@ -1019,7 +1019,7 @@
 clrInstruction(InstrPtr p)
 {
        clrFunction(p);
-       memset((char *) p, 0, sizeof(InstrRecord) + p->maxarg * sizeof(short));
+       memset((char *) p, 0, sizeof(InstrRecord) + p->maxarg * 
sizeof(p->argv[0]));
 }
 
 void
@@ -1038,7 +1038,7 @@
 {
        int space;
 
-       space = sizeof(InstrRecord) + p->maxarg * sizeof(short);
+       space = sizeof(InstrRecord) + p->maxarg * sizeof(p->argv[0]);
        memcpy((char *) new, (char *) p, space);
        setFunctionId(new, getFunctionId(p));
        setModuleId(new, getModuleId(p));
@@ -1947,7 +1947,7 @@
        if (p->argc == p->maxarg) {
                InstrPtr pn;
                int pc = 0,pclimit;
-               int space = p->maxarg * sizeof(short) + sizeof(InstrRecord);
+               int space = p->maxarg * sizeof(p->argv[0]) + 
sizeof(InstrRecord);
                pn = GDKmalloc(space + MAXARG * sizeof(p->maxarg));
                memcpy((char *) pn, (char *) p, space);
                pn->maxarg += MAXARG;


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to