MonetDB: int128 - added int128 / "hge" support in monetdb5/modul...

[Stefan Manegold]

Changeset: 2de484e362a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2de484e362a8
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/modules/mal/batcalc.c
Branch: int128
Log Message:

added int128 / "hge" support in monetdb5/modules/mal/batcalc.c


diffs (77 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1255,6 +1255,7 @@ str CMDconvert_bit(Client cntxt, MalBlkP
 str CMDconvert_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CMDconvert_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CMDconvert_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CMDconvert_hge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CMDconvert_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CMDconvert_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CMDconvert_oid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1265,6 +1266,7 @@ str CMDconvertsignal_bit(Client cntxt, M
 str CMDconvertsignal_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 str CMDconvertsignal_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 str CMDconvertsignal_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
+str CMDconvertsignal_hge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 str CMDconvertsignal_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 str CMDconvertsignal_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 str CMDconvertsignal_oid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
diff --git a/monetdb5/modules/mal/batcalc.c b/monetdb5/modules/mal/batcalc.c
--- a/monetdb5/modules/mal/batcalc.c
+++ b/monetdb5/modules/mal/batcalc.c
@@ -255,6 +255,10 @@ calctype(int tp1, int tp2)
                return TYPE_dbl;
        if (tp1s == TYPE_flt || tp2s == TYPE_flt)
                return TYPE_flt;
+#ifdef HAVE_HGE
+       if (tp1s == TYPE_hge || tp2s == TYPE_hge)
+               return TYPE_hge;
+#endif
        return TYPE_lng;
 }
 
@@ -272,6 +276,13 @@ calctypeenlarge(int tp1, int tp2)
        case TYPE_wrd:
 #endif
                return TYPE_lng;
+#ifdef HAVE_HGE
+#if SIZEOF_WRD == SIZEOF_LNG
+       case TYPE_wrd:
+#endif
+       case TYPE_lng:
+               return TYPE_hge;
+#endif
        case TYPE_flt:
                return TYPE_dbl;
        default:
@@ -1309,6 +1320,29 @@ CMDconvertsignal_lng(Client cntxt, MalBl
        return CMDconvertbat(stk, pci, TYPE_lng, 1);
 }
 
+#ifdef HAVE_HGE
+batcalc_export str CMDconvert_hge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+batcalc_export str CMDconvertsignal_hge(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
+
+str
+CMDconvert_hge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+       (void) cntxt;
+       (void) mb;
+
+       return CMDconvertbat(stk, pci, TYPE_hge, 0);
+}
+
+str
+CMDconvertsignal_hge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+       (void) cntxt;
+       (void) mb;
+
+       return CMDconvertbat(stk, pci, TYPE_hge, 1);
+}
+#endif
+
 batcalc_export str CMDconvert_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 batcalc_export str CMDconvertsignal_flt(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list