2005-12-12 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/mini/regalloc.c b/mono/mini/regalloc.c
index 336353901868f1dc9c2a384f4053c71a40d9a19b..3a0676407a1d725ec9630a44b4d6f06aef393bfd 100644 (file)
--- a/mono/mini/regalloc.c
+++ b/mono/mini/regalloc.c
@@ -21,6 +21,7 @@ mono_regstate_new (void)
 void
 mono_regstate_free (MonoRegState *rs) {
        g_free (rs->iassign);
+       g_free (rs->fassign);
        g_free (rs);
 }
 
@@ -33,8 +34,9 @@ mono_regstate_reset (MonoRegState *rs) {
 void
 mono_regstate_assign (MonoRegState *rs) {
        int i;
+       rs->max_ireg = -1;
        g_free (rs->iassign);
-       rs->iassign = g_malloc (MAX (MONO_MAX_IREGS, rs->next_vireg));
+       rs->iassign = g_malloc (MAX (MONO_MAX_IREGS, rs->next_vireg) * sizeof (int));
        for (i = 0; i < MONO_MAX_IREGS; ++i) {
                rs->iassign [i] = i;
                rs->isymbolic [i] = 0;
@@ -42,7 +44,8 @@ mono_regstate_assign (MonoRegState *rs) {
        for (; i < rs->next_vireg; ++i)
                rs->iassign [i] = -1;
 
-       rs->fassign = g_malloc (MAX (MONO_MAX_FREGS, rs->next_vfreg));
+       g_free (rs->fassign);
+       rs->fassign = g_malloc (MAX (MONO_MAX_FREGS, rs->next_vfreg) * sizeof (int));
        for (i = 0; i < MONO_MAX_FREGS; ++i) {
                rs->fassign [i] = i;
                rs->fsymbolic [i] = 0;
@@ -57,8 +60,9 @@ mono_regstate_alloc_int (MonoRegState *rs, regmask_t allow)
        int i;
        regmask_t mask = allow & rs->ifree_mask;
        for (i = 0; i < MONO_MAX_IREGS; ++i) {
-               if (mask & (1 << i)) {
-                       rs->ifree_mask &= ~ (1 << i);
+               if (mask & ((regmask_t)1 << i)) {
+                       rs->ifree_mask &= ~ ((regmask_t)1 << i);
+                       rs->max_ireg = MAX (rs->max_ireg, i);
                        return i;
                }
        }
@@ -69,7 +73,7 @@ void
 mono_regstate_free_int (MonoRegState *rs, int reg)
 {
        if (reg >= 0) {
-               rs->ifree_mask |= 1 << reg;
+               rs->ifree_mask |= (regmask_t)1 << reg;
                rs->isymbolic [reg] = 0;
        }
 }
@@ -80,8 +84,8 @@ mono_regstate_alloc_float (MonoRegState *rs, regmask_t allow)
        int i;
        regmask_t mask = allow & rs->ffree_mask;
        for (i = 0; i < MONO_MAX_FREGS; ++i) {
-               if (mask & (1 << i)) {
-                       rs->ffree_mask &= ~ (1 << i);
+               if (mask & ((regmask_t)1 << i)) {
+                       rs->ffree_mask &= ~ ((regmask_t)1 << i);
                        return i;
                }
        }
@@ -92,7 +96,7 @@ void
 mono_regstate_free_float (MonoRegState *rs, int reg)
 {
        if (reg >= 0) {
-               rs->ffree_mask |= 1 << reg;
+               rs->ffree_mask |= (regmask_t)1 << reg;
                rs->fsymbolic [reg] = 0;
        }
 }