@@ -188,7 +188,7 @@ static modinfo check_mod(Relation &R, int o, bool tightmod) return badm; if (tcodegen_debug && (*gi).get_const() < m.modbase-1) { - fprintf(DebugFile, "%s%s%d%s%d\n", debug_mark_cp, + fprintf(DebugFile, "%s%s"coef_fmt"%s%d\n", debug_mark_cp, "found \"tight\" mod constraint output < ", (*gi).get_const(), " rather than output < ", code_gen/src/mmap-sub.c @@ -22,11 +22,10 @@ extern int maxGEQs; extern int maxEQs; #if !defined LONG_LONG_COEF -#define LONG_LONG_COEF 0 +#define LONG_LONG_COEF 1 #endif #if LONG_LONG_COEF -#error "using long long coefficients currently causes assertion failures" #if defined BOGUS_LONG_DOUBLE_COEF typedef long double coef_t; // type of coefficients @@ -79,10 +78,10 @@ typedef int EqnKey; class eqn { public: EqnKey key; - coef_t touched; // see oc_simple.c int color; int essential; int varCount; + coef_t touched; // see oc_simple.c coef_t coef[maxVars + 1]; }; @@ -98,9 +97,9 @@ extern char wildName[200][20]; extern FILE *outputFile; /* printProblem writes its output to this file */ #define doTrace (trace && TRACE) #define isRed(e) (desiredResult == SIMPLIFY && (e)->color) -#define eqnncpy(e1,e2,s) {int *p00,*q00,*r00; p00 = (int *)(e1); q00 = (int *)(e2); r00 = &p00[headerWords+1+s]; while(p00 < r00) *p00++ = *q00++; } +#define eqnncpy(e1,e2,s) { if (e1 != e2) memcpy(e1, e2, sizeof(int) * headerWords + sizeof(coef_t) * (1 + s)); } #define eqncpy(e1,e2) eqnncpy(e1,e2,nVars) -#define eqnnzero(e,s) {int *p00,*r00; p00 = (int *)(e); r00 = &p00[headerWords+1+(s)]; while(p00 < r00) *p00++ = 0;} +#define eqnnzero(e,s) { memset(e, 0, sizeof(int) * headerWords + sizeof(coef_t) * (1 + s)); } #define eqnzero(e) eqnnzero(e,nVars) extern int mayBeRed; omega_lib/include/omega/omega_core/oc.h @@ -1150,7 +1150,7 @@ dir_and_diff_info *d_info, unknowns * /*u_info*/) for (int l = level; l<=(int)d_info->nest; l++) { - int lb, ub; + coef_t lb, ub; bool guaranteed; dddirection signs = 0; this_part.query_difference(output_var(l), input_var(l), petit/src/Zima.c @@ -137,7 +137,7 @@ dir_list *dir_list_union(dir_list *d1, dir_list *d2) static dir_list *split_levels(int stmt1, Relation &R, int level, dir_list *nn, int nest) { - int lb, ub; + coef_t lb, ub; bool guaranteed; ddudirection signs = 0; dir_list *big_list; uniform/src/depend_dir.c c356556fc7ca33d62d6a1d881c71342889dd9bc4 Sven Verdoolaege skimo@kotnet.org http://github.com/davewathaverford/the-omega-project/commit/3d4c875bf621205054c63321c0bf4951c0a96d25 3d4c875bf621205054c63321c0bf4951c0a96d25 2008-07-16T06:39:49-07:00 2003-08-21T09:46:39-07:00 support (force) LONG_LONG_COEF 643b0f1174dfb7dd23a4dce5633e3a6ff943f627 Sven Verdoolaege sven@cs.kuleuven.be