fixed build warnings for windows.

diff --git a/arch/windows/i386/rtypes.h b/arch/windows/i386/rtypes.h
index 2c3b11c..2a76f98 100644 (file)
--- a/arch/windows/i386/rtypes.h
+++ b/arch/windows/i386/rtypes.h
@@ -14,7 +14,7 @@ typedef signed int rint32;
 typedef unsigned int ruint32;
 typedef signed long long rint64;
 typedef unsigned long long ruint64;
-typedef unsigned long ratomic_t;
+typedef long ratomic_t;
 typedef unsigned long rword;
 typedef long rsword;
 

diff --git a/rgrep/win32/main.c b/rgrep/win32/main.c
index b2aec84..786c9de 100644 (file)
--- a/rgrep/win32/main.c
+++ b/rgrep/win32/main.c
@@ -67,9 +67,9 @@ int usage(int argc, const wchar_t *argv[])
 int wmain(int argc, const wchar_t* argv[])
 {
        unsigned long sckb;
-       int ret, scanned = 0, i;
+       int ret, scanned = 0;
+       long i;
        rpa_grep_t *pGrep = NULL;
-       DWORD eticks, bticks = GetTickCount();
        rarray_t *buffers;
 
        buffers = r_array_create(sizeof(rpa_buffer_t *));
@@ -156,7 +156,9 @@ int wmain(int argc, const wchar_t* argv[])
                if (wcscmp(argv[i], L"--dump-code") == 0) {
                        if (rpa_dbex_compile(pGrep->hDbex) == 0) {
                                if (++i < argc) {
-                                       rpa_dbex_dumpcode(pGrep->hDbex, rpa_dbex_lookup_s(pGrep->hDbex, argv[i]));
+                                       rpa_buffer_t *code = rpa_buffer_from_wchar(argv[i]);
+                                       rpa_dbex_dumpcode(pGrep->hDbex, rpa_dbex_lookup_s(pGrep->hDbex, code->s));
+                                       rpa_buffer_destroy(code);
                                }
                        }
                        goto end;
@@ -301,7 +303,7 @@ int wmain(int argc, const wchar_t* argv[])
        }
 
 end:
-       for (i = 0; i < r_array_length(buffers); i++) {
+       for (i = 0; i < (long)r_array_length(buffers); i++) {
                rpa_buffer_destroy(r_array_index(buffers, i, rpa_buffer_t*));
        }
        r_object_destroy((robject_t*)buffers);
@@ -314,7 +316,7 @@ end:
        if (pGrep->showtime) {
                unsigned long milsec;
                unsigned long minutes;
-               float sec;
+               double sec;
                milsec = pGrep->scanmilisec;
                if (milsec == 0)
                        milsec = 1;

diff --git a/rjs/rjs.c b/rjs/rjs.c
index 25101ed..e57b1b7 100644 (file)
--- a/rjs/rjs.c
+++ b/rjs/rjs.c
@@ -71,7 +71,7 @@ error:
 
 void rjs_engine_destroy(rjs_engine_t *jse)
 {
-       long i;
+       rsize_t i;
        if (jse) {
                if (jse->cgs) {
                        for (i = 0; i < r_array_length(jse->cgs); i++) {

diff --git a/rjs/rjsexec.c b/rjs/rjsexec.c
index 26daa0b..d85caa1 100644 (file)
--- a/rjs/rjsexec.c
+++ b/rjs/rjsexec.c
@@ -223,7 +223,7 @@ long jrs_offset2line(const char *script, long offset)
 
 void rjs_display_errors(rjs_engine_t *jse, rstr_t *script)
 {
-       long i;
+       rsize_t i;
        rjs_error_t *err;
 
        for (i = 0; i < r_array_length(jse->errors); i++) {

diff --git a/rjs/windows/rjsfile.c b/rjs/windows/rjsfile.c
index a481504..18caa9c 100644 (file)
--- a/rjs/windows/rjsfile.c
+++ b/rjs/windows/rjsfile.c
@@ -36,10 +36,10 @@ rstr_t *rjs_file_map(const char *filename)
        if (NULL == pMappedView)
                goto error;
        buf->size = (rsize_t)fileSize;
-       buf->str = (char*)r_zmalloc(fileSize + 1);
+       buf->str = (char*)r_zmalloc((rsize_t)fileSize + 1);
        if (!buf->str)
                goto error;
-       r_memcpy(buf->str, pMappedView, fileSize);
+       r_memcpy(buf->str, pMappedView, (rsize_t)fileSize);
        if (hMapping)
                CloseHandle(hMapping);
        if (hFile != INVALID_HANDLE_VALUE)

diff --git a/rlib/rarray.c b/rlib/rarray.c
index b7c2a30..fb48fe0 100644 (file)
--- a/rlib/rarray.c
+++ b/rlib/rarray.c
@@ -180,9 +180,9 @@ void *r_array_slot_expand(rarray_t *array, rsize_t index)
 }
 
 
-int r_array_move(rarray_t *array, long dest, long src, long size)
+int r_array_move(rarray_t *array, rsize_t dest, rsize_t src, rsize_t size)
 {
-       long i;
+       rsize_t i;
        if (src == dest)
                return 0;
        if (r_array_length(array) <= src || size <= 0)

diff --git a/rlib/rarray.h b/rlib/rarray.h
index de9c727..872f839 100644 (file)
--- a/rlib/rarray.h
+++ b/rlib/rarray.h
@@ -62,7 +62,7 @@ robject_t *r_array_init(robject_t *obj, ruint32 type, r_object_cleanupfun cleanu
 rarray_t *r_array_create(rsize_t elt_size);
 void r_array_destroy(rarray_t *array);
 rsize_t r_array_add(rarray_t *array, rconstpointer data);
-int r_array_move(rarray_t *array, long dest, long src, long size);
+int r_array_move(rarray_t *array, rsize_t dest, rsize_t src, rsize_t size);
 rsize_t r_array_removelast(rarray_t *array);
 rsize_t r_array_insert(rarray_t *array, rsize_t index, rconstpointer data);
 rsize_t r_array_replace(rarray_t *array, rsize_t index, rconstpointer data);

diff --git a/rlib/rcarray.c b/rlib/rcarray.c
index b829f1c..926f03f 100644 (file)
--- a/rlib/rcarray.c
+++ b/rlib/rcarray.c
@@ -49,7 +49,7 @@ static void r_carray_add_chunks(rcarray_t *carray, rsize_t nchunks)
 
 void r_carray_cleanup(robject_t *obj)
 {
-       int i;
+       rsize_t i;
        rcarray_t *carray = (rcarray_t *)obj;
        if (carray->oncleanup)
                carray->oncleanup(carray);

diff --git a/rlib/rharray.c b/rlib/rharray.c
index e882af2..c812e7b 100644 (file)
--- a/rlib/rharray.c
+++ b/rlib/rharray.c
@@ -113,7 +113,7 @@ void r_harray_destroy(rharray_t *array)
 robject_t *r_harray_copy(const robject_t *obj)
 {
        rharray_t *harray;
-       int i;
+       unsigned long i;
        rstr_t *n;
        const rharray_t *src = (const rharray_t *)obj;
 

diff --git a/rlib/rhash.c b/rlib/rhash.c
index 35b9de1..62c00be 100644 (file)
--- a/rlib/rhash.c
+++ b/rlib/rhash.c
@@ -204,7 +204,7 @@ void r_hash_remove(rhash_t* hash, rconstpointer key)
 
 void r_hash_removeall(rhash_t* hash)
 {
-       unsigned int nbucket;
+       rsize_t nbucket;
        rhead_t *head;
        rhash_node_t *node;
 

diff --git a/rlib/rhash.h b/rlib/rhash.h
index 7d0cc0f..0e0ba7d 100644 (file)
--- a/rlib/rhash.h
+++ b/rlib/rhash.h
@@ -47,7 +47,7 @@ struct rhash_s {
 
 #define R_HASH_INVALID_INDEXVAL ((unsigned long)-1)
 
-#define r_hash_size(__h__) (1 << (__h__)->nbits)
+#define r_hash_size(__h__) (((rsize_t)1) << (__h__)->nbits)
 #define r_hash_mask(__h__) (r_hash_size(__h__) - 1)
 rhash_t *r_hash_create(unsigned int nbits, r_hash_equalfunc eqfunc, r_hash_hashfun hfunc);
 void r_hash_destroy(rhash_t* hash);

diff --git a/rpa/rpadbex.c b/rpa/rpadbex.c
index 9cd72a8..b3b03b2 100644 (file)
--- a/rpa/rpadbex.c
+++ b/rpa/rpadbex.c
@@ -326,7 +326,7 @@ static int rpa_dbex_rh_noemit(rpadbex_t *dbex, long rec)
 
 static int rpa_dbex_setemit(rpadbex_t *dbex, rboolean emit)
 {
-       long i;
+       rsize_t i;
        rpa_ruleinfo_t *info;
 
        for (i = 0; i < r_array_length(dbex->rules->names); i++) {
@@ -1009,7 +1009,7 @@ rpadbex_t *rpa_dbex_create(void)
 
 void rpa_dbex_destroy(rpadbex_t *dbex)
 {
-       int i;
+       rsize_t i;
        if (dbex) {
                for (i = 0; i < r_array_length(dbex->text); i++)
                        r_free(r_array_index(dbex->text, i, char*));
@@ -1037,7 +1037,7 @@ static int rpa_parseinfo_loopdetect_do(rpadbex_t *dbex, long parent, long loopto
 
        if (parent == loopto && inderction > 0)
                return 1;
-       for (i = 0; i < r_array_length(dbex->recstack); i++) {
+       for (i = 0; i < (long)r_array_length(dbex->recstack); i++) {
                if (parent == r_array_index(dbex->recstack, i, long))
                        return 0;
        }
@@ -1157,9 +1157,9 @@ static void rpa_dbex_buildruleinfo(rpadbex_t *dbex)
        rparecord_t *rec;
        rpa_ruleinfo_t info;
        unsigned int nrecords;
-       long i;
        const char *name = NULL;
        rsize_t namesize = 0;
+       rsize_t i;
 
        if (dbex->rules) {
                r_object_destroy((robject_t *)dbex->rules);
@@ -1270,15 +1270,9 @@ static void rpa_dbex_copyrecords(rpadbex_t *dbex)
 
 static rparecord_t *rpa_dbex_record(rpadbex_t *dbex, long rec)
 {
-       rparecord_t *prec;
-
        if (!dbex || !dbex->rules)
                return NULL;
-       if (rec < 0 || rec >= r_array_length(dbex->records))
-               return NULL;
-       prec = (rparecord_t *)r_array_slot(dbex->records, rec);
-       return prec;
-
+       return rpa_record_get(dbex->records, rec);
 }
 
 
@@ -1294,7 +1288,7 @@ static rparecord_t *rpa_dbex_rulerecord(rpadbex_t *dbex, rparule_t rid)
        if (!info)
                return NULL;
        rec = info->startrec + info->sizerecs - 1;
-       if (rec < 0 || rec >= r_array_length(dbex->records))
+       if (rec < 0 || rec >= (rparule_t)r_array_length(dbex->records))
                return NULL;
        prec = (rparecord_t *)r_array_slot(dbex->records, rec);
        return prec;
@@ -1419,7 +1413,7 @@ static long rpa_dbex_firstinlined(rpadbex_t *dbex)
 
 static int rpa_dbex_findinlined(rpadbex_t *dbex, long startrec)
 {
-       long i;
+       rsize_t i;
        for (i = 0; i < r_array_length(dbex->inlinestack); i++) {
                if (r_array_index(dbex->inlinestack, i, long) == startrec)
                        return 1;
@@ -1528,7 +1522,7 @@ int rpa_dbex_dumpproductions(rpadbex_t *dbex)
 
 int rpa_dbex_dumprecords(rpadbex_t *dbex)
 {
-       long i;
+       rsize_t i;
 
        if (!dbex)
                return -1;
@@ -1545,7 +1539,7 @@ int rpa_dbex_dumprecords(rpadbex_t *dbex)
 
 int rpa_dbex_dumpinfo(rpadbex_t *dbex)
 {
-       long i;
+       rsize_t i;
        rpa_ruleinfo_t *info;
 
        if (!dbex)
@@ -1579,7 +1573,7 @@ int rpa_dbex_dumpinfo(rpadbex_t *dbex)
 
 int rpa_dbex_dumpuids(rpadbex_t *dbex)
 {
-       long i;
+       rsize_t i;
        long rec;
        rpa_ruleinfo_t *info;
        char *buffer = r_zmalloc(32 * sizeof(char));
@@ -1685,7 +1679,7 @@ const char *rpa_dbex_name(rpadbex_t *dbex, rparule_t rid)
                RPA_DBEX_SETERRINFO_CODE(dbex, RPA_E_NOTCLOSED);
                return NULL;
        }
-       if (rid >= r_array_length(dbex->rules->members))
+       if (rid >= (rparule_t)r_array_length(dbex->rules->members))
                return NULL;
        name = r_array_index(dbex->rules->names, rid, rstr_t*);
        return name->str;
@@ -1762,7 +1756,7 @@ rparule_t rpa_dbex_next(rpadbex_t *dbex, rparule_t rid)
        }
 
        ++rid;
-       if (rid < r_array_length(dbex->rules->members))
+       if (rid < (rparule_t)r_array_length(dbex->rules->members))
                return rid;
        return -1;
 }

diff --git a/rpa/rparecord.c b/rpa/rparecord.c
index 43381a8..c222254 100644 (file)
--- a/rpa/rparecord.c
+++ b/rpa/rparecord.c
@@ -30,7 +30,7 @@ rparecord_t *rpa_record_get(rarray_t *records, long rec)
 
        if (!records)
                return NULL;
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long) r_array_length(records))
                return NULL;
        prec = (rparecord_t *)r_array_slot(records, rec);
        return prec;
@@ -44,13 +44,13 @@ long rpa_recordtree_get(rarray_t *records, long rec, unsigned long type)
        unsigned int startrec = (type & RPA_RECORD_START) ? 1 : 0;
        rparecord_t *prec;
 
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        if ((prec->type & RPA_RECORD_START)) {
                if (startrec)
                        return rec;
-               for (s = 0, i = rec; i < r_array_length(records); i++) {
+               for (s = 0, i = rec; i < (long)r_array_length(records); i++) {
                        prec = (rparecord_t *)r_array_slot(records, i);
                        if (prec->type & RPA_RECORD_START)
                                ++s;
@@ -83,14 +83,14 @@ long rpa_recordtree_firstchild(rarray_t *records, long rec, unsigned long type)
 {
        rparecord_t *prec;
 
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        if (prec->type & RPA_RECORD_END) {
                if ((rec = rpa_recordtree_get(records, rec, RPA_RECORD_START)) < 0)
                        return -1;
        }
-       if (++rec >= r_array_length(records))
+       if (++rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        if (prec->type & RPA_RECORD_START)
@@ -103,7 +103,7 @@ long rpa_recordtree_lastchild(rarray_t *records, long rec, unsigned long type)
 {
        rparecord_t *prec;
 
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        if (prec->type & RPA_RECORD_START) {
@@ -123,14 +123,14 @@ long rpa_recordtree_next(rarray_t *records, long rec, unsigned long type)
 {
        rparecord_t *prec;
 
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        if (prec->type & RPA_RECORD_START) {
                if ((rec = rpa_recordtree_get(records, rec, RPA_RECORD_END)) < 0)
                        return -1;
        }
-       if (++rec >= r_array_length(records))
+       if (++rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        if (prec->type & RPA_RECORD_START)
@@ -143,7 +143,7 @@ long rpa_recordtree_prev(rarray_t *records, long rec, unsigned long type)
 {
        rparecord_t *prec;
 
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        if (prec->type & RPA_RECORD_END) {
@@ -163,13 +163,13 @@ long rpa_recordtree_parent(rarray_t *records, long rec, unsigned long type)
 {
        long last = -1, parent = -1;
 
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long)r_array_length(records))
                return -1;
        for ( ;rec >= 0; rec = rpa_recordtree_next(records, last, RPA_RECORD_END)) {
                last = rpa_recordtree_get(records, rec, RPA_RECORD_END);
        }
        parent = last + 1;
-       if (parent >= r_array_length(records))
+       if (parent >= (long)r_array_length(records))
                return -1;
        return rpa_recordtree_get(records, parent, type);
 }
@@ -245,7 +245,7 @@ long rpa_record_getruleuid(rarray_t *records, long rec)
        if (rec < 0)
                return -1;
        rec = rpa_recordtree_get(records, rec, RPA_RECORD_START);
-       if (rec >= r_array_length(records))
+       if (rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        return prec->ruleuid;
@@ -259,12 +259,12 @@ void rpa_record_setusertype(rarray_t *records, long rec, ruint32 usertype, rvals
        if (rec < 0)
                return;
        rec = rpa_recordtree_get(records, rec, RPA_RECORD_START);
-       if (rec >= r_array_length(records))
+       if (rec >= (long)r_array_length(records))
                return;
        prec = (rparecord_t *)r_array_slot(records, rec);
        rpa_recordptr_setusertype(prec, usertype, op);
        rec = rpa_recordtree_get(records, rec, RPA_RECORD_END);
-       if (rec >= r_array_length(records))
+       if (rec >= (long)r_array_length(records))
                return;
        prec = (rparecord_t *)r_array_slot(records, rec);
        rpa_recordptr_setusertype(prec, usertype, op);
@@ -278,7 +278,7 @@ long rpa_record_getusertype(rarray_t *records, long rec)
        if (rec < 0)
                return -1;
        rec = rpa_recordtree_get(records, rec, RPA_RECORD_START);
-       if (rec >= r_array_length(records))
+       if (rec >= (long)r_array_length(records))
                return -1;
        prec = (rparecord_t *)r_array_slot(records, rec);
        return prec->usertype;
@@ -330,7 +330,7 @@ void rpa_record_dump(rarray_t *records, long rec)
        int n = 0, size;
        char optc = ' ';
 
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long)r_array_length(records))
                return;
        prec = (rparecord_t *)r_array_slot(records, rec);
        if (prec->type & RPA_RECORD_END) {
@@ -392,7 +392,7 @@ void rpa_record_dumpindented(rarray_t *records, long rec, int level)
        rparecord_t *prec;
        int i, size;
 
-       if (rec < 0 || rec >= r_array_length(records))
+       if (rec < 0 || rec >= (long)r_array_length(records))
                return;
        r_memset(buffer, 0, sizeof(buffer));
        prec = (rparecord_t *)r_array_slot(records, rec);
@@ -431,13 +431,13 @@ void rpa_records_destroy(rarray_t *records)
 
 long rpa_records_length(rarray_t *records)
 {
-       return r_array_length(records);
+       return (long)r_array_length(records);
 }
 
 
 rparecord_t *rpa_records_slot(rarray_t *records, long index)
 {
-       if (index < 0 || index >= r_array_length(records))
+       if (index < 0 || index >= (long)r_array_length(records))
                return NULL;
        return (rparecord_t *)r_array_slot(records, index);
 }

diff --git a/rpa/rpavm.c b/rpa/rpavm.c
index 498cc1b..08dabd0 100644 (file)
--- a/rpa/rpavm.c
+++ b/rpa/rpavm.c
@@ -424,7 +424,7 @@ static void rpavm_swi_checkcache(rvmcpu_t *cpu, rvm_asmins_t *ins)
 
                if (r0 > 0) {
                        if (entry->recsize) {
-                               long i;
+                               rsize_t i;
                                if (stat->records) {
                                        r_array_setlength(stat->records, RVM_CPUREG_GETL(cpu, R_REC) + 1);
                                        for (i = 0; i < r_array_length(entry->records); i++) {

diff --git a/rvm/rvmcodemap.c b/rvm/rvmcodemap.c
index 9250f3b..b133efa 100644 (file)
--- a/rvm/rvmcodemap.c
+++ b/rvm/rvmcodemap.c
@@ -55,7 +55,7 @@ void rvm_codemap_destroy(rvm_codemap_t *codemap)
 
 void rvm_codemap_clear(rvm_codemap_t *codemap)
 {
-       long i;
+       rsize_t i;
        rvm_codelabel_t *label;
 
        for (i = 0; i < r_array_length(codemap->labels); i++) {
@@ -69,7 +69,7 @@ void rvm_codemap_clear(rvm_codemap_t *codemap)
 
 rvm_codelabel_t *rvm_codemap_label(rvm_codemap_t *codemap, long index)
 {
-       if (index < 0 || index >= r_array_length(codemap->labels))
+       if (index < 0 || index >= (long)r_array_length(codemap->labels))
                return NULL;
        return (rvm_codelabel_t*)r_array_slot(codemap->labels, index);
 }
@@ -247,7 +247,7 @@ rword rvm_codemap_resolve(rvm_codemap_t *codemap, long index, rvm_codelabel_t **
 
 void rvm_codemap_dump(rvm_codemap_t *codemap)
 {
-       int i = 0;
+       rsize_t i = 0;
 
        for (i = 0; i < r_array_length(codemap->labels); i++) {
                rvm_codelabel_t *label = rvm_codemap_label(codemap, i);

diff --git a/rvm/rvmcpu.c b/rvm/rvmcpu.c
index 388eb4d..a5a99cd 100644 (file)
--- a/rvm/rvmcpu.c
+++ b/rvm/rvmcpu.c
@@ -1079,7 +1079,7 @@ static int rvm_printf(const char *format, ...)
 }
 
 
-int rvm_asm_dump_reg_to_str(unsigned char reg, char *str, unsigned int size)
+int rvm_asm_dump_reg_to_str(unsigned int reg, char *str, unsigned int size)
 {
        int ret = 0;
 
@@ -2056,7 +2056,7 @@ int rvm_cpu_global_swilookup(rvmcpu_t *cpu, const char *swiname, rsize_t size)
 {
        int nswi;
        rvm_switable_t *swientry;
-       long ntable;
+       rsize_t ntable;
 
        for (ntable = 0; ntable < r_harray_length(cpu->switables); ntable++) {
                swientry = r_harray_index(cpu->switables, ntable, rvm_switable_t*);
@@ -2128,7 +2128,7 @@ rvm_asmins_t rvm_cond_asma(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setstrptr(&a.data, data, size);
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
                a.da = 1;
@@ -2152,7 +2152,7 @@ rvm_asmins_t rvm_cond_asmp(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setpointer(&a.data, data);
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
                a.da = 1;
@@ -2176,7 +2176,7 @@ rvm_asmins_t rvm_cond_asms(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setunsigned(&a.data, data);
        RVM_REG_SETTYPE(&a.data, RVM_DTYPE_SWIID)
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
@@ -2201,7 +2201,7 @@ rvm_asmins_t rvm_cond_asmf(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setunsigned(&a.data, data);
        RVM_REG_SETTYPE(&a.data, RVM_DTYPE_FUNCTION)
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
@@ -2225,7 +2225,7 @@ rvm_asmins_t rvm_cond_asm(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setunsigned(&a.data, data);
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
                a.da = 1;
@@ -2250,7 +2250,7 @@ rvm_asmins_t rvm_cond_asml(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setlong(&a.data, data);
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
                a.da = 1;
@@ -2274,7 +2274,7 @@ rvm_asmins_t rvm_cond_asmb(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setboolean(&a.data, data);
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
                a.da = 1;
@@ -2298,7 +2298,7 @@ rvm_asmins_t rvm_cond_asmd(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setdouble(&a.data, data);
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
                a.da = 1;
@@ -2321,7 +2321,7 @@ rvm_asmins_t rvm_cond_asm2(rword cond, rword opcode, rword op1, rword op2, rword
        a.op1 = (ruint8)op1;
        a.op2 = (ruint8)op2;
        a.op3 = (ruint8)op3;
-       a.cond = cond;
+       a.cond = (ruint8)cond;
        rvm_reg_setpair(&a.data, p1, p2);
        if ((ruint8)op1 == DA || (ruint8)op2 == DA || (ruint8)op3 == DA)
                a.da = 1;

diff --git a/rvm/rvmoperator.c b/rvm/rvmoperator.c
index acf8e7d..7ac4903 100644 (file)
--- a/rvm/rvmoperator.c
+++ b/rvm/rvmoperator.c
@@ -37,10 +37,9 @@ rvm_opmap_t *rvm_opmap_create()
 
 void rvm_opmap_destroy(rvm_opmap_t *opmap)
 {
-       int i;
+       rsize_t i;
        rvm_opinfo_t *opinfo;
 
-
        if (!opmap)
                return;
        for (i = 0; i < r_array_length(opmap->operators); i++) {

diff --git a/rvm/rvmoperatorand.c b/rvm/rvmoperatorand.c
index 7f55fd9..53e8895 100644 (file)
--- a/rvm/rvmoperatorand.c
+++ b/rvm/rvmoperatorand.c
@@ -48,5 +48,5 @@ void rvm_op_and_long(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, long op1
 
 void rvm_op_and_double(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, double op1, double op2)
 {
-       rvm_op_and_long(cpu, opid, res, op1, op2);
+       rvm_op_and_long(cpu, opid, res, (long)op1, (long)op2);
 }

diff --git a/rvm/rvmoperatorlsl.c b/rvm/rvmoperatorlsl.c
index 145c612..f2a54bb 100644 (file)
--- a/rvm/rvmoperatorlsl.c
+++ b/rvm/rvmoperatorlsl.c
@@ -48,6 +48,6 @@ void rvm_op_lsl_long(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, long op1
 
 void rvm_op_lsl_double(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, double op1, double op2)
 {
-       rvm_op_lsl_long(cpu, opid, res, op1, op2);
+       rvm_op_lsl_long(cpu, opid, res, (long)op1, (long)op2);
 }
 

diff --git a/rvm/rvmoperatorlsr.c b/rvm/rvmoperatorlsr.c
index d9af9c6..d2f092b 100644 (file)
--- a/rvm/rvmoperatorlsr.c
+++ b/rvm/rvmoperatorlsr.c
@@ -48,6 +48,6 @@ void rvm_op_lsr_long(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, long op1
 
 void rvm_op_lsr_double(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, double op1, double op2)
 {
-       rvm_op_lsr_long(cpu, opid, res, op1, op2);
+       rvm_op_lsr_long(cpu, opid, res, (long)op1, (long)op2);
 }
 

diff --git a/rvm/rvmoperatorlsru.c b/rvm/rvmoperatorlsru.c
index 992d7fc..1261fb1 100644 (file)
--- a/rvm/rvmoperatorlsru.c
+++ b/rvm/rvmoperatorlsru.c
@@ -42,6 +42,6 @@ void rvm_op_lsru_long(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, long op
 
 void rvm_op_lsru_double(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, double op1, double op2)
 {
-       rvm_op_lsru_unsigned(cpu, opid, res, op1, op2);
+       rvm_op_lsru_unsigned(cpu, opid, res, (rword)((long)op1), (rword)((long)op2));
 }
 

diff --git a/rvm/rvmoperatoror.c b/rvm/rvmoperatoror.c
index 7f04a94..10eeba6 100644 (file)
--- a/rvm/rvmoperatoror.c
+++ b/rvm/rvmoperatoror.c
@@ -48,5 +48,5 @@ void rvm_op_or_long(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, long op1,
 
 void rvm_op_or_double(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, double op1, double op2)
 {
-       rvm_op_or_long(cpu, opid, res, op1, op2);
+       rvm_op_or_long(cpu, opid, res, (long)op1, (long)op2);
 }

diff --git a/rvm/rvmoperatorxor.c b/rvm/rvmoperatorxor.c
index d7cf71b..07f3805 100644 (file)
--- a/rvm/rvmoperatorxor.c
+++ b/rvm/rvmoperatorxor.c
@@ -48,5 +48,5 @@ void rvm_op_xor_long(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, long op1
 
 void rvm_op_xor_double(rvmcpu_t *cpu, unsigned short opid, rvmreg_t *res, double op1, double op2)
 {
-       rvm_op_xor_long(cpu, opid, res, op1, op2);
+       rvm_op_xor_long(cpu, opid, res, (long)op1, (long)op2);
 }

diff --git a/rvm/rvmreg.c b/rvm/rvmreg.c
index e6be73c..fe24ffc 100644 (file)
--- a/rvm/rvmreg.c
+++ b/rvm/rvmreg.c
@@ -86,8 +86,7 @@ static void rvm_reg_carray_oncleanup(rcarray_t *array)
  */
 void rvm_reg_array_unref_gcdata(robject_t *obj)
 {
-       unsigned int size;
-       int i;
+       rsize_t i, size;
        rvmreg_t *r;
 
        if (obj->type == R_OBJECT_ARRAY) {

diff --git a/rvm/rvmrelocmap.c b/rvm/rvmrelocmap.c
index f539d20..1e0859d 100644 (file)
--- a/rvm/rvmrelocmap.c
+++ b/rvm/rvmrelocmap.c
@@ -74,7 +74,7 @@ unsigned long rvm_relocmap_length(rvm_relocmap_t *relocmap)
 
 int rvm_relocmap_relocate(rvm_relocmap_t *relocmap, rvm_codemap_t *codemap, rvm_asmins_t *code, rvm_codelabel_t **err)
 {
-       long index;
+       rsize_t index;
        rvm_relocrecord_t *reloc;
        rword value;