rharray fixes

diff --git a/arch/linux/x86_64/rtypes.h b/arch/linux/x86_64/rtypes.h
index 214a056..d509170 100644 (file)
--- a/arch/linux/x86_64/rtypes.h
+++ b/arch/linux/x86_64/rtypes.h
@@ -65,7 +65,7 @@ typedef struct {ruint32 p1; ruint32 p2;} rpair_t;
 
 
 #define R_DEBUG_BRAKE __asm__ ("int $3")
-#define ASSERT(__a__) do {if (!(__a__)) R_DEBUG_BRAKE; } while (0)
+#define R_ASSERT(__a__) do {if (!(__a__)) R_DEBUG_BRAKE; } while (0)
 #define R_SIZE_ALIGN(s, n) ((((s) + (n) - 1) / (n)) * (n))
 #define R_MIN(a, b) ((a) < (b) ? (a): (b))
 #define R_MAX(a, b) ((a) > (b) ? (a): (b))

diff --git a/rlib/rharray.c b/rlib/rharray.c
index fb0aeec..7c56496 100644 (file)
--- a/rlib/rharray.c
+++ b/rlib/rharray.c
@@ -117,11 +117,17 @@ void r_harray_cleanup(robject_t *obj)
 rlong r_harray_add(rharray_t *harray, const rchar *name, ruint namesize, rconstpointer pval)
 {
        rstr_t *membrName;
-       rlong index;
+       rlong index, nameindex;
 
        membrName = r_rstrdup(name, namesize);
        index = r_carray_add(harray->members, pval);
-       r_array_add(harray->names, &membrName);
+       nameindex = r_array_add(harray->names, &membrName);
+       /*
+        * Lets try to keep the name index and the data index in sync,
+        * if they are not, that might be a problem - we will have to
+        * think of some sort reverse lookup mechanism.
+        */
+       R_ASSERT(index == nameindex);
        r_hash_insert_indexval(harray->hash, (rconstpointer)membrName, index);
        return index;
 }

diff --git a/rpa1/rpamnode.c b/rpa1/rpamnode.c
index f2c04ad..4c8da65 100644 (file)
--- a/rpa1/rpamnode.c
+++ b/rpa1/rpamnode.c
@@ -697,7 +697,7 @@ int rpa_mnode_p_callback_plain(rpa_mnode_t *mnode, rpa_stat_t *stat, const char
                                 * If the callbacks are not disabled we can also set the cache for the cases when they are disabled.
                                 */
                                if (!stat->cbmod) {
-                                       ASSERT(&stat->mcache[RPA_MCACHEHASH(match, input, 1)] != mcache);
+                                       R_ASSERT(&stat->mcache[RPA_MCACHEHASH(match, input, 1)] != mcache);
                                        RPA_MCACHE_SET(&stat->mcache[RPA_MCACHEHASH(match, input, 1)], match, input, ret, 1);
                                }
                        } else {

diff --git a/rvm/rvmcpu.h b/rvm/rvmcpu.h
index 3b75557..f9155bf 100644 (file)
--- a/rvm/rvmcpu.h
+++ b/rvm/rvmcpu.h
@@ -235,7 +235,7 @@ do { \
 
 
 #define RVM_STACK_CHUNK 256
-#define RVM_ABORT(__cpu__, __e__) do { __cpu__->error = (__e__); (__cpu__)->abort = 1; ASSERT(0); return; } while (0)
+#define RVM_ABORT(__cpu__, __e__) do { __cpu__->error = (__e__); (__cpu__)->abort = 1; R_ASSERT(0); return; } while (0)
 #define BIT(__shiftby__) (1 << (__shiftby__))
 #define BITR(__f__, __l__, __r__) (((__r__) >= (__f__) && (__r__) <= (__l__)) ? BIT(__r__) : 0)
 #define BITS(__f__, __l__)  (BITR(__f__, __l__, R0)) | (BITR(__f__, __l__, R1)) | (BITR(__f__, __l__, R2)) | (BITR(__f__, __l__, R3)) | \

diff --git a/tests/rpagen-test.c b/tests/rpagen-test.c
index 928288d..09754c2 100644 (file)
--- a/tests/rpagen-test.c
+++ b/tests/rpagen-test.c
@@ -1068,7 +1068,7 @@ int codegen_newexpressioncallop_callback(rpa_stat_handle stat, const char *name,
                 * We should never get here
                 */
                r_array_removelast(co->funcall);
-               ASSERT(0);
+               R_ASSERT(0);
        }
 
 
@@ -1124,7 +1124,7 @@ int codegen_funcallexpression_callback(rpa_stat_handle stat, const char *name, v
                 * We should never get here
                 */
                r_array_removelast(co->funcall);
-               ASSERT(0);
+               R_ASSERT(0);
        }
        codegen_print_callback(stat, name, userdata, input, size, reason);
        codegen_dump_code(rvm_codegen_getcode(co->cg, off), rvm_codegen_getcodesize(co->cg) - off);