used types cleaned up... -4

diff --git a/arch/linux/x86_64/rpatypes.h b/arch/linux/x86_64/rpatypes.h
index 533b880..325adce 100644 (file)
--- a/arch/linux/x86_64/rpatypes.h
+++ b/arch/linux/x86_64/rpatypes.h
@@ -26,12 +26,12 @@ typedef unsigned long rpa_word_t;
 typedef long rpa_sword_t;
 typedef unsigned short rpa_wchar_t;
 
-#ifndef NULL\r
-#ifdef __cplusplus\r
-#define NULL 0\r
-#else\r
-#define NULL ((void *)0)\r
-#endif\r
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL 0
+#else
+#define NULL ((void *)0)
+#endif
 #endif
 
 #endif

diff --git a/rjs/windows/resource.h b/rjs/windows/resource.h
index 815a36e..0923294 100644 (file)
--- a/rjs/windows/resource.h
+++ b/rjs/windows/resource.h
@@ -1,17 +1,17 @@
-//{{NO_DEPENDENCIES}}\r
-// Microsoft Visual C++ generated include file.\r
-// Used by rjs.rc\r
-\r
-// Next default values for new objects\r
-// \r
-#ifdef APSTUDIO_INVOKED\r
-#ifndef APSTUDIO_READONLY_SYMBOLS\r
-#define _APS_NEXT_RESOURCE_VALUE        101\r
-#define _APS_NEXT_COMMAND_VALUE         40001\r
-#define _APS_NEXT_CONTROL_VALUE         1001\r
-#define _APS_NEXT_SYMED_VALUE           101\r
-#endif\r
-#endif\r
-\r
-#define TEXTFILE                                               256\r
-#define IDR_ECMA262                                            7000\r
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by rjs.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
+
+#define TEXTFILE                                               256
+#define IDR_ECMA262                                            7000

diff --git a/rlib/rharray.c b/rlib/rharray.c
index c812e7b..bca7bae 100644 (file)
--- a/rlib/rharray.c
+++ b/rlib/rharray.c
@@ -140,7 +140,7 @@ void r_harray_cleanup(robject_t *obj)
 }
 
 
-long r_harray_add(rharray_t *harray, const char *name, rsize_t namesize, rconstpointer pval)
+long r_harray_add(rharray_t *harray, const char *name, unsigned int namesize, rconstpointer pval)
 {
        rstr_t *membrName;
        long index, nameindex;
@@ -165,7 +165,7 @@ long r_harray_add_s(rharray_t *harray, const char *name, rconstpointer pval)
 }
 
 
-long r_harray_replace(rharray_t *harray, const char *name, rsize_t namesize, rconstpointer pval)
+long r_harray_replace(rharray_t *harray, const char *name, unsigned int namesize, rconstpointer pval)
 {
        long index = r_harray_lookup(harray, name, namesize);
 
@@ -181,7 +181,7 @@ long r_harray_replace_s(rharray_t *harray, const char *name, rconstpointer pval)
 }
 
 
-long r_harray_lookup(rharray_t *harray, const char *name, rsize_t namesize)
+long r_harray_lookup(rharray_t *harray, const char *name, unsigned int namesize)
 {
        rsize_t found;
 
@@ -199,7 +199,7 @@ long r_harray_lookup_s(rharray_t *harray, const char *name)
 }
 
 
-long r_harray_taillookup(rharray_t *harray, const char *name, rsize_t namesize)
+long r_harray_taillookup(rharray_t *harray, const char *name, unsigned int namesize)
 {
        rsize_t found;
 
@@ -218,7 +218,7 @@ long r_harray_taillookup_s(rharray_t *harray, const char *name)
 
 
 
-rhash_node_t* r_harray_nodelookup(rharray_t *harray, rhash_node_t *cur, const char *name, rsize_t namesize)
+rhash_node_t* r_harray_nodelookup(rharray_t *harray, rhash_node_t *cur, const char *name, unsigned int namesize)
 {
        rstr_t lookupstr = {(char*)name, namesize};
        return r_hash_nodelookup(harray->hash, cur, &lookupstr);
@@ -231,7 +231,7 @@ rhash_node_t* r_harray_nodelookup_s(rharray_t *harray, rhash_node_t *cur, const
 }
 
 
-rhash_node_t* r_harray_nodetaillookup(rharray_t *harray, rhash_node_t *cur, const char *name, rsize_t namesize)
+rhash_node_t* r_harray_nodetaillookup(rharray_t *harray, rhash_node_t *cur, const char *name, unsigned int namesize)
 {
        rstr_t lookupstr = {(char*)name, namesize};
        return r_hash_nodetaillookup(harray->hash, cur, &lookupstr);

diff --git a/rlib/rharray.h b/rlib/rharray.h
index c514509..f9d7d2c 100644 (file)
--- a/rlib/rharray.h
+++ b/rlib/rharray.h
@@ -49,17 +49,17 @@ typedef struct rharray_s {
 rharray_t *r_harray_create(unsigned int elt_size);
 void r_harray_destroy(rharray_t *array);
 robject_t *r_harray_init(robject_t *obj, ruint32 type, r_object_cleanupfun cleanup, r_object_copyfun copy, unsigned int elt_size);
-long r_harray_add(rharray_t *harray, const char *name, rsize_t namesize, rconstpointer pval);
+long r_harray_add(rharray_t *harray, const char *name, unsigned int namesize, rconstpointer pval);
 long r_harray_add_s(rharray_t *harray, const char *name, rconstpointer pval);
-long r_harray_replace(rharray_t *harray, const char *name, rsize_t namesize, rconstpointer pval);
+long r_harray_replace(rharray_t *harray, const char *name, unsigned int namesize, rconstpointer pval);
 long r_harray_replace_s(rharray_t *harray, const char *name, rconstpointer pval);
-long r_harray_lookup(rharray_t *harray, const char *name, rsize_t namesize);
+long r_harray_lookup(rharray_t *harray, const char *name, unsigned int namesize);
 long r_harray_lookup_s(rharray_t *harray, const char *name);
-long r_harray_taillookup(rharray_t *harray, const char *name, rsize_t namesize);
+long r_harray_taillookup(rharray_t *harray, const char *name, unsigned int namesize);
 long r_harray_taillookup_s(rharray_t *harray, const char *name);
-rhash_node_t* r_harray_nodelookup(rharray_t *harray, rhash_node_t *cur, const char *name, rsize_t namesize);
+rhash_node_t* r_harray_nodelookup(rharray_t *harray, rhash_node_t *cur, const char *name, unsigned int namesize);
 rhash_node_t* r_harray_nodelookup_s(rharray_t *harray, rhash_node_t *cur, const char *name);
-rhash_node_t* r_harray_nodetaillookup(rharray_t *harray, rhash_node_t *cur, const char *name, rsize_t namesize);
+rhash_node_t* r_harray_nodetaillookup(rharray_t *harray, rhash_node_t *cur, const char *name, unsigned int namesize);
 rhash_node_t* r_harray_nodetaillookup_s(rharray_t *harray, rhash_node_t *cur, const char *name);
 rpointer r_harray_get(rharray_t *harray, rsize_t index);
 int r_harray_set(rharray_t *harray, long index, rconstpointer pval);

diff --git a/rlib/rmap.c b/rlib/rmap.c
index 90eb406..791f01a 100644 (file)
--- a/rlib/rmap.c
+++ b/rlib/rmap.c
@@ -154,7 +154,7 @@ void r_map_destroy(rmap_t *map)
 }
 
 
-long r_map_gckey_add(rmap_t *map, rgc_t* gc, const char *name, rsize_t namesize, rconstpointer pval)
+long r_map_gckey_add(rmap_t *map, rgc_t* gc, const char *name, unsigned int namesize, rconstpointer pval)
 {
        r_mapnode_t *node;
 
@@ -194,7 +194,7 @@ long r_map_gckey_add_l(rmap_t *map, rgc_t* gc, long name, rconstpointer pval)
 }
 
 
-long r_map_add(rmap_t *map, const char *name, rsize_t namesize, rconstpointer pval)
+long r_map_add(rmap_t *map, const char *name, unsigned int namesize, rconstpointer pval)
 {
        return r_map_gckey_add(map, NULL, name, namesize, pval);
 }
@@ -274,7 +274,7 @@ int r_map_delete(rmap_t *map, unsigned long index)
 }
 
 
-long r_map_lookup(rmap_t *map, long current, const char *name, rsize_t namesize)
+long r_map_lookup(rmap_t *map, long current, const char *name, unsigned int namesize)
 {
        long found = -1;
        r_mapnode_t *node;
@@ -331,7 +331,7 @@ long r_map_lookup_d(rmap_t *map, long current, double name)
 }
 
 
-long r_map_taillookup(rmap_t *map, long current, const char *name, rsize_t namesize)
+long r_map_taillookup(rmap_t *map, long current, const char *name, unsigned int namesize)
 {
        long found = -1;
        r_mapnode_t *node;

diff --git a/rlib/rmap.h b/rlib/rmap.h
index f1f3b74..29b5051 100644 (file)
--- a/rlib/rmap.h
+++ b/rlib/rmap.h
@@ -49,13 +49,13 @@ typedef struct rmap_s {
 
 rmap_t *r_map_create(unsigned int elt_size, unsigned int nbits);
 void r_map_destroy(rmap_t *array);
-long r_map_lookup(rmap_t *map, long current, const char *name, rsize_t namesize);
+long r_map_lookup(rmap_t *map, long current, const char *name, unsigned int namesize);
 long r_map_lookup_s(rmap_t *map, long current, const char *name);
-long r_map_taillookup(rmap_t *map, long current, const char *name, rsize_t namesize);
+long r_map_taillookup(rmap_t *map, long current, const char *name, unsigned int namesize);
 long r_map_taillookup_s(rmap_t *map, long current, const char *name);
 long r_map_lookup_d(rmap_t *map, long current, double name);
 long r_map_lookup_l(rmap_t *map, long current, long name);
-long r_map_add(rmap_t *map, const char *name, rsize_t namesize, rconstpointer pval);
+long r_map_add(rmap_t *map, const char *name, unsigned int namesize, rconstpointer pval);
 long r_map_add_s(rmap_t *map, const char *name, rconstpointer pval);
 long r_map_add_d(rmap_t *map, double name, rconstpointer pval);
 long r_map_add_l(rmap_t *map, long name, rconstpointer pval);
@@ -67,7 +67,7 @@ long r_map_add_l(rmap_t *map, long name, rconstpointer pval);
  * GC memory management. Another possibility would be to get the key as a rstrit_t* and
  * make rmap_t completely get out of the memory management business.
  */
-long r_map_gckey_add(rmap_t *map, rgc_t* gc, const char *name, rsize_t namesize, rconstpointer pval);
+long r_map_gckey_add(rmap_t *map, rgc_t* gc, const char *name, unsigned int namesize, rconstpointer pval);
 long r_map_gckey_add_s(rmap_t *map, rgc_t* gc, const char *name, rconstpointer pval);
 long r_map_gckey_add_d(rmap_t *map, rgc_t* gc, double name, rconstpointer pval);
 long r_map_gckey_add_l(rmap_t *map, rgc_t* gc, long name, rconstpointer pval);

diff --git a/rpa/rpacompiler.c b/rpa/rpacompiler.c
index a2469d8..14f185d 100644 (file)
--- a/rpa/rpacompiler.c
+++ b/rpa/rpacompiler.c
@@ -65,7 +65,7 @@ void rpa_compiler_index_reference_nan(rpa_compiler_t *co, unsigned long index)
 }
 
 
-void rpa_compiler_reference_nan(rpa_compiler_t *co, const char *name, rsize_t namesize)
+void rpa_compiler_reference_nan(rpa_compiler_t *co, const char *name, unsigned int namesize)
 {
        rpa_compiler_index_reference_nan(co, rvm_codemap_lookupadd(co->cg->codemap, name, namesize));
 }
@@ -86,7 +86,7 @@ void rpa_compiler_index_reference_opt(rpa_compiler_t *co, unsigned long index)
 }
 
 
-void rpa_compiler_reference_opt(rpa_compiler_t *co, const char *name, rsize_t namesize)
+void rpa_compiler_reference_opt(rpa_compiler_t *co, const char *name, unsigned int namesize)
 {
        rpa_compiler_index_reference_opt(co, rvm_codemap_lookupadd(co->cg->codemap, name, namesize));
 }
@@ -111,7 +111,7 @@ void rpa_compiler_index_reference_mul(rpa_compiler_t *co, unsigned long index)
 }
 
 
-void rpa_compiler_reference_mul(rpa_compiler_t *co, const char *name, rsize_t namesize)
+void rpa_compiler_reference_mul(rpa_compiler_t *co, const char *name, unsigned int namesize)
 {
        rpa_compiler_index_reference_mul(co, rvm_codemap_lookupadd(co->cg->codemap, name, namesize));
 
@@ -137,7 +137,7 @@ void rpa_compiler_index_reference_mop(rpa_compiler_t *co, unsigned long index)
 }
 
 
-void rpa_compiler_reference_mop(rpa_compiler_t *co, const char *name, rsize_t namesize)
+void rpa_compiler_reference_mop(rpa_compiler_t *co, const char *name, unsigned int namesize)
 {
        rpa_compiler_index_reference_mop(co, rvm_codemap_lookupadd(co->cg->codemap, name, namesize));
 }
@@ -163,7 +163,7 @@ void rpa_compiler_index_reference(rpa_compiler_t *co, unsigned long index, unsig
 }
 
 
-void rpa_compiler_reference(rpa_compiler_t *co, const char *name, rsize_t namesize, unsigned int qflag)
+void rpa_compiler_reference(rpa_compiler_t *co, const char *name, unsigned int namesize, unsigned int qflag)
 {
        rpa_compiler_index_reference(co, rvm_codemap_lookupadd(co->cg->codemap, name, namesize), qflag);
 }

diff --git a/rpa/rpacompiler.h b/rpa/rpacompiler.h
index 4a93625..10cccc2 100644 (file)
--- a/rpa/rpacompiler.h
+++ b/rpa/rpacompiler.h
@@ -116,11 +116,11 @@ void rpa_compiler_index_reference_nan(rpa_compiler_t *co, unsigned long index);
 void rpa_compiler_index_reference_opt(rpa_compiler_t *co, unsigned long index);
 void rpa_compiler_index_reference_mul(rpa_compiler_t *co, unsigned long index);
 void rpa_compiler_index_reference_mop(rpa_compiler_t *co, unsigned long index);
-void rpa_compiler_reference(rpa_compiler_t *co, const char *name, rsize_t namesize, unsigned int qflag);
-void rpa_compiler_reference_nan(rpa_compiler_t *co, const char *name, rsize_t namesize);
-void rpa_compiler_reference_opt(rpa_compiler_t *co, const char *name, rsize_t namesize);
-void rpa_compiler_reference_mul(rpa_compiler_t *co, const char *name, rsize_t namesize);
-void rpa_compiler_reference_mop(rpa_compiler_t *co, const char *name, rsize_t namesize);
+void rpa_compiler_reference(rpa_compiler_t *co, const char *name, unsigned int namesize, unsigned int qflag);
+void rpa_compiler_reference_nan(rpa_compiler_t *co, const char *name, unsigned int namesize);
+void rpa_compiler_reference_opt(rpa_compiler_t *co, const char *name, unsigned int namesize);
+void rpa_compiler_reference_mul(rpa_compiler_t *co, const char *name, unsigned int namesize);
+void rpa_compiler_reference_mop(rpa_compiler_t *co, const char *name, unsigned int namesize);
 void rpa_compiler_reference_s(rpa_compiler_t *co, const char *name, unsigned int qflag);
 void rpa_compiler_reference_nan_s(rpa_compiler_t *co, const char *name);
 void rpa_compiler_reference_opt_s(rpa_compiler_t *co, const char *name);

diff --git a/rpa/rpadbex.c b/rpa/rpadbex.c
index 0bd28d7..b870c3a 100644 (file)
--- a/rpa/rpadbex.c
+++ b/rpa/rpadbex.c
@@ -1112,7 +1112,7 @@ static void rpa_parseinfo_marklooppath(rpadbex_t *dbex, long parent)
 }
 
 
-static int rpa_parseinfo_rule_checkforloop(rpadbex_t *dbex, const char *name, rsize_t namesize, long loopto)
+static int rpa_parseinfo_rule_checkforloop(rpadbex_t *dbex, const char *name, unsigned int namesize, long loopto)
 {
        rpa_ruleinfo_t *info = info = (rpa_ruleinfo_t *)r_harray_get(dbex->rules, rpa_dbex_lookup(dbex, name, namesize));
 
@@ -1721,7 +1721,7 @@ rparule_t rpa_dbex_last(rpadbex_t *dbex)
 }
 
 
-rparule_t rpa_dbex_lookup(rpadbex_t *dbex, const char *name, rsize_t namesize)
+rparule_t rpa_dbex_lookup(rpadbex_t *dbex, const char *name, unsigned int namesize)
 {
        rparule_t ret;
 

diff --git a/rpa/rpadbex.h b/rpa/rpadbex.h
index a117e52..6fb33bb 100644 (file)
--- a/rpa/rpadbex.h
+++ b/rpa/rpadbex.h
@@ -230,7 +230,7 @@ long rpa_dbex_executableoffset(rpadbex_t *dbex, rparule_t rid);
  * @param namesize The size of the buffer to be used.
  * @return Unique ID for the specified production name.
  */
-rparule_t rpa_dbex_lookup(rpadbex_t *dbex, const char *name, rsize_t namesize);
+rparule_t rpa_dbex_lookup(rpadbex_t *dbex, const char *name, unsigned int namesize);
 
 
 /**

diff --git a/rvm/rvmcpu.c b/rvm/rvmcpu.c
index 7300c23..c3aabeb 100644 (file)
--- a/rvm/rvmcpu.c
+++ b/rvm/rvmcpu.c
@@ -921,7 +921,7 @@ static void rvm_op_pushm(rvmcpu_t *cpu, rvm_asmins_t *ins)
        if (!(bits & ((1<<(RVM_REGS_NUM / 2)) - 1)))
                i = RVM_REGS_NUM / 2;
        for (;bits && i < RLST; i++) {
-               n = 1 << i;
+               n = ((ruword)1) << i;
                if (n & bits) {
                        sp += 1;
                        RVM_STACK_WRITE(cpu->stack, sp, &RVM_CPUREG_GET(cpu, i));