add int objects for use in iscc

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

diff --git a/include/isl/obj.h b/include/isl/obj.h
index 66ef37b..6106724 100644 (file)
--- a/include/isl/obj.h
+++ b/include/isl/obj.h
@@ -21,6 +21,8 @@ struct isl_obj_vtable {
 typedef struct isl_obj_vtable *isl_obj_type;
 extern struct isl_obj_vtable isl_obj_none_vtable;
 #define isl_obj_none           (&isl_obj_none_vtable)
+extern struct isl_obj_vtable isl_obj_int_vtable;
+#define isl_obj_int            (&isl_obj_int_vtable)
 extern struct isl_obj_vtable isl_obj_set_vtable;
 #define isl_obj_set            (&isl_obj_set_vtable)
 extern struct isl_obj_vtable isl_obj_union_set_vtable;
@@ -42,6 +44,18 @@ struct isl_obj {
        void            *v;
 };
 
+struct isl_int_obj;
+typedef struct isl_int_obj isl_int_obj;
+
+__isl_give isl_int_obj *isl_int_obj_alloc(isl_ctx *ctx, isl_int v);
+__isl_give isl_int_obj *isl_int_obj_add(__isl_take isl_int_obj *i1,
+       __isl_take isl_int_obj *i2);
+__isl_give isl_int_obj *isl_int_obj_sub(__isl_take isl_int_obj *i1,
+       __isl_take isl_int_obj *i2);
+__isl_give isl_int_obj *isl_int_obj_mul(__isl_take isl_int_obj *i1,
+       __isl_take isl_int_obj *i2);
+void isl_int_obj_get_int(__isl_keep isl_int_obj *i, isl_int *v);
+
 #if defined(__cplusplus)
 }
 #endif

diff --git a/isl_obj.c b/isl_obj.c
index 625a76e..fb9fe97 100644 (file)
--- a/isl_obj.c
+++ b/isl_obj.c
@@ -10,6 +10,157 @@
 
 #include <isl/obj.h>
 
+struct isl_int_obj {
+       int ref;
+       isl_ctx *ctx;
+       isl_int v;
+};
+
+__isl_give isl_int_obj *isl_int_obj_alloc(isl_ctx *ctx, isl_int v)
+{
+       isl_int_obj *i;
+
+       i = isl_alloc_type(ctx, isl_int_obj);
+       if (!i)
+               return NULL;
+       
+       i->ctx = ctx;
+       isl_ctx_ref(ctx);
+       i->ref = 1;
+       isl_int_init(i->v);
+       isl_int_set(i->v, v);
+
+       return i;
+}
+
+__isl_give isl_int_obj *isl_int_obj_copy(__isl_keep isl_int_obj *i)
+{
+       if (!i)
+               return NULL;
+
+       i->ref++;
+       return i;
+}
+
+__isl_give isl_int_obj *isl_int_obj_dup(__isl_keep isl_int_obj *i)
+{
+       if (!i)
+               return NULL;
+
+       return isl_int_obj_alloc(i->ctx, i->v);
+}
+
+__isl_give isl_int_obj *isl_int_obj_cow(__isl_take isl_int_obj *i)
+{
+       if (!i)
+               return NULL;
+
+       if (i->ref == 1)
+               return i;
+       i->ref--;
+       return isl_int_obj_dup(i);
+}
+
+void isl_int_obj_free(__isl_take isl_int_obj *i)
+{
+       if (!i)
+               return;
+
+       if (--i->ref > 0)
+               return;
+
+       isl_ctx_deref(i->ctx);
+       isl_int_clear(i->v);
+       free(i);
+}
+
+__isl_give isl_int_obj *isl_int_obj_add(__isl_take isl_int_obj *i1,
+       __isl_take isl_int_obj *i2)
+{
+       i1 = isl_int_obj_cow(i1);
+       if (!i1 || !i2)
+               goto error;
+       
+       isl_int_add(i1->v, i1->v, i2->v);
+
+       isl_int_obj_free(i2);
+       return i1;
+error:
+       isl_int_obj_free(i1);
+       isl_int_obj_free(i2);
+       return NULL;
+}
+
+__isl_give isl_int_obj *isl_int_obj_sub(__isl_take isl_int_obj *i1,
+       __isl_take isl_int_obj *i2)
+{
+       i1 = isl_int_obj_cow(i1);
+       if (!i1 || !i2)
+               goto error;
+       
+       isl_int_sub(i1->v, i1->v, i2->v);
+
+       isl_int_obj_free(i2);
+       return i1;
+error:
+       isl_int_obj_free(i1);
+       isl_int_obj_free(i2);
+       return NULL;
+}
+
+__isl_give isl_int_obj *isl_int_obj_mul(__isl_take isl_int_obj *i1,
+       __isl_take isl_int_obj *i2)
+{
+       i1 = isl_int_obj_cow(i1);
+       if (!i1 || !i2)
+               goto error;
+       
+       isl_int_mul(i1->v, i1->v, i2->v);
+
+       isl_int_obj_free(i2);
+       return i1;
+error:
+       isl_int_obj_free(i1);
+       isl_int_obj_free(i2);
+       return NULL;
+}
+
+void isl_int_obj_get_int(__isl_keep isl_int_obj *i, isl_int *v)
+{
+       if (!i)
+               return;
+       isl_int_set(*v, i->v);
+}
+
+static void *isl_obj_int_copy(void *v)
+{
+       return isl_int_obj_copy((isl_int_obj *)v);
+}
+
+static void isl_obj_int_free(void *v)
+{
+       isl_int_obj_free((isl_int_obj *)v);
+}
+
+static __isl_give isl_printer *isl_obj_int_print(__isl_take isl_printer *p,
+       void *v)
+{
+       isl_int_obj *i = v;
+       return isl_printer_print_isl_int(p, i->v);
+}
+
+static void *isl_obj_int_add(void *v1, void *v2)
+{
+       return isl_int_obj_add((isl_int_obj *)v1, (isl_int_obj *)v2);
+}
+
+struct isl_obj_vtable isl_obj_int_vtable = {
+       isl_obj_int_copy,
+       isl_obj_int_add,
+       isl_obj_int_print,
+       isl_obj_int_free
+};
+
 static void *isl_obj_map_copy(void *v)
 {
        return isl_map_copy((struct isl_map *)v);