Update of /cvsroot/monetdb/MonetDB5/src/optimizer
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13013/optimizer
Modified Files:
opt_recycler.mx opt_replicator.mx
Log Message:
Moveing code around to please Windows
Index: opt_replicator.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_replicator.mx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- opt_replicator.mx 6 Mar 2008 08:36:36 -0000 1.35
+++ opt_replicator.mx 6 Mar 2008 20:26:44 -0000 1.36
@@ -530,33 +530,6 @@
return k;
}
-/* compare values in ValRecords, return 0 on equal */
-int
-VALcmp(ValPtr p, ValPtr q)
-{
-
- int (*cmp) (ptr, ptr);
- int tpe;
- ptr nilptr, pp, pq;
-
- if( p ==0 || q == 0 ) return -1;
- if( (tpe = p ->vtype) != q->vtype ) return -1;
-
- cmp = BATatoms[tpe].atomCmp;
- nilptr = ATOMnilptr(tpe);
- pp = VALget(p);
- pq = VALget(q);
- if(((*cmp)(pp, nilptr)==0) && ((*cmp)(pq, nilptr)==0)) return 0; /* eq
nil val */
- if(((*cmp)(pp, nilptr)==0) || ((*cmp)(pq, nilptr)==0)) return -1;
-
-/* if( tpe == TYPE_flt || tpe == TYPE_dbl)
- return (*pp - *pq)<1E-10? 0 : ((*cmp)(pp, pq));
-*/
-
- return ((*cmp)(pp, pq));
-
-}
-
/* check for replica of instruction p in repl table */
int
findReplica(MalStkPtr s,InstrPtr p)
Index: opt_recycler.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_recycler.mx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- opt_recycler.mx 4 Mar 2008 14:51:34 -0000 1.4
+++ opt_recycler.mx 6 Mar 2008 20:26:44 -0000 1.5
@@ -20,9 +20,9 @@
@{
@mal
pattern optimizer.recycle():str
-address OPTrecycler;
+address OPTrecycle;
pattern optimizer.recycle(mod:str, fcn:str):str
-address OPTrecycler
+address OPTrecycle
comment "Replicator code injection";
@-
@@ -33,7 +33,7 @@
#include "opt_prelude.h"
#include "opt_support.h"
-#define DEBUG_OPT_RECYCLER
+/* #define DEBUG_OPT_RECYCLER */
@-
The variables are all checked for being eligible as a variable
subject to recycling control. A variable my only be assigned
@@ -45,7 +45,7 @@
#include "mal_instruction.h"
static int
-OPTrecyclerImplementation(MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
+OPTrecycleImplementation(MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
int i, j, cnt, actions=0;
Lifespan span= newLifespan(mb);
@@ -95,8 +95,8 @@
}
@include optimizerWrapper.mx
@h
-@:exportOptimizer(recycler)@
+@:exportOptimizer(recycle)@
#endif
@c
#include "opt_statistics.h"
-@:wrapOptimizer(recycler,OPT_CHECK_ALL)@
+@:wrapOptimizer(recycle,OPT_CHECK_ALL)@
-------------------------------------------------------------------------
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
