Merge pull request #986 from ninjarobot/patch-1

[mono.git] / mono / mini / unwind.c

diff --git a/mono/mini/unwind.c b/mono/mini/unwind.c
index e1b7e21855d1fc5bec53bb43d1513febe9d300b0..018ad903e40307776f205a93c9962bc66d260e4b 100644 (file)
--- a/mono/mini/unwind.c
+++ b/mono/mini/unwind.c
@@ -31,7 +31,7 @@ typedef struct {
        guint8 info [MONO_ZERO_LEN_ARRAY];
 } MonoUnwindInfo;
 
-#define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
+#define ALIGN_TO(val,align) ((((size_t)val) + ((align) - 1)) & ~((align) - 1))
 
 static CRITICAL_SECTION unwind_mutex;
 
@@ -761,7 +761,7 @@ decode_lsda (guint8 *lsda, guint8 *code, MonoJitExceptionInfo **ex_info, guint32
                *this_offset = -1;
        }
        ncall_sites = decode_uleb128 (p, &p);
-       p = (guint8*)ALIGN_TO ((guint64)p, 4);
+       p = (guint8*)ALIGN_TO ((mgreg_t)p, 4);
 
        if (ex_info) {
                *ex_info = g_malloc0 (ncall_sites * sizeof (MonoJitExceptionInfo));
@@ -784,7 +784,7 @@ decode_lsda (guint8 *lsda, guint8 *code, MonoJitExceptionInfo **ex_info, guint32
                p += sizeof (gint32);
 
                g_assert (landing_pad);
-               g_assert (((guint64)tinfo % 4) == 0);
+               g_assert (((size_t)tinfo % 4) == 0);
                //printf ("X: %p %d\n", landing_pad, *(int*)tinfo);
 
                if (ex_info) {