Changeset: 010a386d37f9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=010a386d37f9
Modified Files:
Branch: default
Log Message:
merge from Oct2010
diffs (truncated from 448 to 300 lines):
diff -r ba48d5742de6 -r 010a386d37f9 MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx Wed Sep 15 15:37:13 2010 +0200
+++ b/MonetDB5/src/mal/mal_interpreter.mx Wed Sep 15 18:30:21 2010 +0200
@@ -271,7 +271,6 @@
pci= pcicaller;
} else {
newStack(stk,mb->vsize);
- memset((char *) stk, 0, stackSize(mb->vsize));
stk->stktop= mb->vtop;
stk->stksize= mb->vsize;
stk->blk= mb;
@@ -344,6 +343,8 @@
if ( !stk->keepAlive && garbageControl(getInstrPtr(mb,0)) )
garbageCollector(cntxt, mb,stk, env != stk);
@:endProfile(stk)@
+ if (stk && stk != env)
+ GDKfree(stk);
return ret;
}
@-
diff -r ba48d5742de6 -r 010a386d37f9 MonetDB5/src/mal/mal_stack.mx
--- a/MonetDB5/src/mal/mal_stack.mx Wed Sep 15 15:37:13 2010 +0200
+++ b/MonetDB5/src/mal/mal_stack.mx Wed Sep 15 18:30:21 2010 +0200
@@ -104,7 +104,7 @@
} MalStack, *MalStkPtr;
#define stackSize(CNT) (sizeof(ValRecord)*(CNT) + sizeof(MalStack))
-#define newStack(S,CNT) S= (MalStkPtr) alloca(stackSize(CNT));\
+#define newStack(S,CNT) S= (MalStkPtr) GDKzalloc(stackSize(CNT));\
(S)->stksize=CNT;
diff -r ba48d5742de6 -r 010a386d37f9 MonetDB5/src/modules/kernel/batcalc.mx
--- a/MonetDB5/src/modules/kernel/batcalc.mx Wed Sep 15 15:37:13 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batcalc.mx Wed Sep 15 18:30:21 2010 +0200
@@ -1741,10 +1741,10 @@
@:baselineCode(&&,AND,bit)@
@:baselineCode(||,OR,bit)@
-@:operatorCstImpl(>=,GE,LT)@
-@:operatorCstImpl(<,LT,GE)@
-@:operatorCstImpl(>,GT,LE)@
-@:operatorCstImpl(<=,LE,GT)@
+@:operatorCstImpl(>=,GE,LE)@
+@:operatorCstImpl(<,LT,GT)@
+@:operatorCstImpl(>,GT,LT)@
+@:operatorCstImpl(<=,LE,GE)@
@:operatorCstImpl(==,EQ,EQ)@
@:operatorCstImpl(!=,NEQ,NEQ)@
@:baselineCstCode(&&,AND,bit,AND)@
diff -r ba48d5742de6 -r 010a386d37f9 buildtools/Makefile.msc
--- a/buildtools/Makefile.msc Wed Sep 15 15:37:13 2010 +0200
+++ b/buildtools/Makefile.msc Wed Sep 15 18:30:21 2010 +0200
@@ -20,21 +20,22 @@
# Meta-Makefile.msc for buildtools
prefix = $(MAKEDIR)\NT
+srcdir = .
all:
- cd autogen && setup.py build
- cd Mx && $(MAKE) /nologo /f Makefile.msc
- cd mel && $(MAKE) /nologo /f Makefile.msc
- cd burg && $(MAKE) /nologo /f Makefile.msc
+ cd $(srcdir)\autogen && setup.py build
+ cd Mx && $(MAKE) /nologo /f ..\$(srcdir)\Mx\Makefile.msc
srcdir=..\$(srcdir)\Mx
+ cd mel && $(MAKE) /nologo /f ..\$(srcdir)\mel\Makefile.msc
srcdir=..\$(srcdir)\mel
+ cd burg && $(MAKE) /nologo /f ..\$(srcdir)\burg\Makefile.msc
srcdir=..\$(srcdir)\burg
install:
- cd autogen && setup.py install "--prefix=$(prefix)"
- cd Mx && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
- cd mel && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
- cd burg && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
+ cd $(srcdir)\autogen && setup.py install "--prefix=$(prefix)"
+ cd Mx && $(MAKE) /nologo /f ..\$(srcdir)\Mx\Makefile.msc
srcdir=..\$(srcdir)\Mx "prefix=$(prefix)" install
+ cd mel && $(MAKE) /nologo /f ..\$(srcdir)\mel\Makefile.msc
srcdir=..\$(srcdir)\mel "prefix=$(prefix)" install
+ cd burg && $(MAKE) /nologo /f ..\$(srcdir)\burg\Makefile.msc
srcdir=..\$(srcdir)\burg "prefix=$(prefix)" install
clean:
- cd autogen && del /q build
- cd Mx && $(MAKE) /nologo /f Makefile.msc clean
- cd mel && $(MAKE) /nologo /f Makefile.msc clean
- cd burg && $(MAKE) /nologo /f Makefile.msc clean
+ cd $(srcdir)\autogen && del /q build
+ cd Mx && $(MAKE) /nologo /f ..\$(srcdir)\Mx\Makefile
srcdir=..\$(srcdir)\Mx.msc clean
+ cd mel && $(MAKE) /nologo /f ..\$(srcdir)\mel\Makefile.msc
srcdir=..\$(srcdir)\mel clean
+ cd burg && $(MAKE) /nologo /f ..\$(srcdir)\burg\Makefile.msc
srcdir=..\$(srcdir)\burg clean
diff -r ba48d5742de6 -r 010a386d37f9 buildtools/Mx/Makefile.msc
--- a/buildtools/Mx/Makefile.msc Wed Sep 15 15:37:13 2010 +0200
+++ b/buildtools/Mx/Makefile.msc Wed Sep 15 18:30:21 2010 +0200
@@ -19,17 +19,21 @@
prefix = ..\NT
bindir = $(prefix)\bin
+srcdir = .
!IFDEF DEBUG
-CFLAGS = -I. -GF -W3 -MDd -nologo -Zi -Od -D_DEBUG -RTC1
+CFLAGS = -I$(srcdir) -I. -GF -W3 -MDd -nologo -Zi -Od -D_DEBUG -RTC1
!ELSE
-CFLAGS = -I. -GF -W3 -MD -nologo
+CFLAGS = -I$(srcdir) -I. -GF -W3 -MD -nologo
!ENDIF
COPY=copy
MKDIR=mkdir
MT=mt -nologo
+{$(srcdir)\}.c{}.obj::
+ $(CC) $(CFLAGS) /Fd.\ /c $<
+
all: Mx.exe
install: all
@@ -41,11 +45,12 @@
MX_OBJS = Mx.obj Def.obj Form.obj Tok.obj Code.obj Display.obj \
Print.obj Io.obj Sys.obj disclaimer.obj getopt.obj
+
Mx.exe: $(MX_OBJS)
$(CC) $(CFLAGS) /FeMx.exe $(MX_OBJS) /link /subsystem:console
/NODEFAULTLIB:LIBC
if exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;1
$(MX_OBJS): mx_config.h
-mx_config.h: winconfig.h
- $(COPY) winconfig.h mx_config.h
+mx_config.h: $(srcdir)\winconfig.h
+ $(COPY) $(srcdir)\winconfig.h mx_config.h
diff -r ba48d5742de6 -r 010a386d37f9 buildtools/burg/Makefile.msc
--- a/buildtools/burg/Makefile.msc Wed Sep 15 15:37:13 2010 +0200
+++ b/buildtools/burg/Makefile.msc Wed Sep 15 18:30:21 2010 +0200
@@ -19,11 +19,12 @@
prefix = ..\NT
bindir = $(prefix)\bin
+srcdir = .
!IFDEF DEBUG
-CFLAGS = -I. -GF -W3 -MDd -nologo -Zi -Od -D_DEBUG -RTC1
+CFLAGS = -I$(srcdir) -I. -GF -W3 -MDd -nologo -Zi -Od -D_DEBUG -RTC1
!ELSE
-CFLAGS = -I. -GF -W3 -MD -nologo
+CFLAGS = -I$(srcdir) -I. -GF -W3 -MD -nologo
!ENDIF
MV=copy
@@ -36,6 +37,9 @@
YACC=bison -b y -y
YFLAGS=-d
+{$(srcdir)\}.c{}.obj::
+ $(CC) $(CFLAGS) /Fd.\ /c $<
+
all: burg.exe
install: all
@@ -54,18 +58,18 @@
$(CC) $(CFLAGS) /Feburg.exe $(BURG_OBJS) /link /subsystem:console
if exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;1
-burg_config.h: winconfig.h
- copy winconfig.h burg_config.h
+burg_config.h: $(srcdir)\winconfig.h
+ copy $(srcdir)\winconfig.h burg_config.h
$(BURG_OBJS): burg_config.h
gram.obj: gram.c gram.h
-gram.h: gram.y
- $(YACC) $(YFLAGS) gram.y
+gram.h: $(srcdir)\gram.y
+ $(YACC) $(YFLAGS) $(srcdir)\gram.y
$(DEL) y.tab.c
$(MV) y.tab.h gram.h
-gram.c: gram.y
- $(YACC) $(YFLAGS) gram.y
+gram.c: $(srcdir)\gram.y
+ $(YACC) $(YFLAGS) $(srcdir)\gram.y
$(FILTER) $(FILTERPREF)" ;" y.tab.c > gram.c
diff -r ba48d5742de6 -r 010a386d37f9 buildtools/mel/Makefile.msc
--- a/buildtools/mel/Makefile.msc Wed Sep 15 15:37:13 2010 +0200
+++ b/buildtools/mel/Makefile.msc Wed Sep 15 18:30:21 2010 +0200
@@ -19,6 +19,7 @@
prefix = ..\NT
bindir = $(prefix)\bin
+srcdir = .
MX = ..\Mx\Mx.exe
!IFDEF DEBUG
@@ -65,10 +66,10 @@
$(CC) $(CFLAGS) /Femel.exe $(MEL_OBJS) /link /subsystem:console
/NODEFAULTLIB:LIBC
if exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;1
-mel_config.h: winconfig.h
- copy winconfig.h mel_config.h
+mel_config.h: $(srcdir)\winconfig.h
+ copy $(srcdir)\winconfig.h mel_config.h
-unistd.h: Makefile.msc
+unistd.h: $(srcdir)\Makefile.msc
$(ECHO) #ifndef UNISTD_H > unistd.h
$(ECHO) #define UNISTD_H >> unistd.h
$(ECHO) #include "io.h" >> unistd.h
@@ -77,86 +78,86 @@
.SUFFIXES: .mx .cxx
-.mx.h:
+{$(srcdir)}.mx{}.h:
$(MX) $(MXFLAGS) -x h $<
-.mx.c:
+{$(srcdir)}.mx{}.c:
$(MX) $(MXFLAGS) -x c $<
-.mx.cxx:
+{$(srcdir)}.mx{}.cxx:
$(MX) $(MXFLAGS) -x C $<
-.mx.y:
+{$(srcdir)}.mx{}.y:
$(MX) $(MXFLAGS) -x y $<
-.mx.l:
+{$(srcdir)}.mx{}.l:
$(MX) $(MXFLAGS) -x l $<
-.mx.yy:
+{$(srcdir)}.mx{}.yy:
$(MX) $(MXFLAGS) -x Y $<
-.mx.ll:
+{$(srcdir)}.mx{}.ll:
$(MX) $(MXFLAGS) -x L $<
.cxx.obj:
$(CXX) $(CXXFLAGS) $(INCLUDES) -c $<
-any_arg.cxx: any_arg.mx
-any_arg.h: any_arg.mx
+any_arg.cxx: $(srcdir)\any_arg.mx
+any_arg.h: $(srcdir)\any_arg.mx
any_arg.obj: any_arg.cxx any_arg.h symbol.h list.h ListIterator.h type_arg.h
language.h symtable.h module.h dependency.h atom.h ops.h atomops.h command.h
mel.h FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h atom_arg.h
var_arg.h bat_arg.h prelude.h epilogue.h mel_config.h
-atom_arg.cxx: atom_arg.mx
-atom_arg.h: atom_arg.mx
+atom_arg.cxx: $(srcdir)\atom_arg.mx
+atom_arg.h: $(srcdir)\atom_arg.mx
atom_arg.obj: atom_arg.cxx atom_arg.h symbol.h list.h ListIterator.h atom.h
ops.h type_arg.h language.h symtable.h module.h dependency.h atomops.h
command.h mel.h FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h
var_arg.h bat_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-atom.cxx: atom.mx
-atom.h: atom.mx
+atom.cxx: $(srcdir)\atom.mx
+atom.h: $(srcdir)\atom.mx
atom.obj: atom.cxx atom.h ops.h symbol.h list.h ListIterator.h type_arg.h
language.h symtable.h module.h dependency.h atomops.h command.h mel.h
FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h atom_arg.h
var_arg.h bat_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-atomops.cxx: atomops.mx
-atomops.h: atomops.mx
+atomops.cxx: $(srcdir)\atomops.mx
+atomops.h: $(srcdir)\atomops.mx
atomops.obj: atomops.cxx atomops.h ops.h symbol.h list.h ListIterator.h
language.h symtable.h module.h dependency.h atom.h type_arg.h command.h mel.h
FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h atom_arg.h
var_arg.h bat_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-bat_arg.cxx: bat_arg.mx
-bat_arg.h: bat_arg.mx
+bat_arg.cxx: $(srcdir)\bat_arg.mx
+bat_arg.h: $(srcdir)\bat_arg.mx
bat_arg.obj: bat_arg.cxx bat_arg.h symbol.h list.h ListIterator.h type_arg.h
language.h symtable.h module.h dependency.h atom.h ops.h atomops.h command.h
mel.h FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h atom_arg.h
var_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-builtin.cxx: builtin.mx
-builtin.h: builtin.mx
+builtin.cxx: $(srcdir)\builtin.mx
+builtin.h: $(srcdir)\builtin.mx
builtin.obj: builtin.cxx builtin.h symbol.h list.h ListIterator.h language.h
symtable.h module.h dependency.h atom.h ops.h type_arg.h atomops.h command.h
mel.h FileInfo.h mel.tab.h operator.h iterator.h object.h atom_arg.h var_arg.h
bat_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-command.cxx: command.mx
-command.h: command.mx
+command.cxx: $(srcdir)\command.mx
+command.h: $(srcdir)\command.mx
command.obj: command.cxx command.h symbol.h list.h ListIterator.h mel.h
symtable.h FileInfo.h ops.h atomops.h type_arg.h mel.tab.h language.h module.h
dependency.h atom.h operator.h builtin.h iterator.h object.h atom_arg.h
var_arg.h bat_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-debug.cxx: debug.mx
-debug.h: debug.mx
+debug.cxx: $(srcdir)\debug.mx
+debug.h: $(srcdir)\debug.mx
debug.obj: debug.cxx debug.h language.h symbol.h list.h ListIterator.h
symtable.h module.h dependency.h atom.h ops.h type_arg.h atomops.h command.h
mel.h FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h atom_arg.h
var_arg.h bat_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-depend.cxx: depend.mx
-dependency.cxx: dependency.mx
-dependency.h: dependency.mx
+depend.cxx: $(srcdir)\depend.mx
+dependency.cxx: $(srcdir)\dependency.mx
+dependency.h: $(srcdir)\dependency.mx
dependency.obj: dependency.cxx dependency.h symbol.h list.h ListIterator.h
language.h symtable.h module.h atom.h ops.h type_arg.h atomops.h command.h
mel.h FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h atom_arg.h
var_arg.h bat_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-depend.h: depend.mx
+depend.h: $(srcdir)\depend.mx
depend.obj: depend.cxx depend.h language.h symbol.h list.h ListIterator.h
symtable.h module.h dependency.h atom.h ops.h type_arg.h atomops.h command.h
mel.h FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h atom_arg.h
var_arg.h bat_arg.h any_arg.h prelude.h epilogue.h mel_config.h
-epilogue.cxx: epilogue.mx
-epilogue.h: epilogue.mx
+epilogue.cxx: $(srcdir)\epilogue.mx
+epilogue.h: $(srcdir)\epilogue.mx
epilogue.obj: epilogue.cxx epilogue.h symbol.h list.h ListIterator.h
language.h symtable.h module.h dependency.h atom.h ops.h type_arg.h atomops.h
command.h mel.h FileInfo.h mel.tab.h operator.h builtin.h iterator.h object.h
atom_arg.h var_arg.h bat_arg.h any_arg.h prelude.h mel_config.h
-FileInfo.cxx: FileInfo.mx
-FileInfo.h: FileInfo.mx
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
