Author: zoltan
Date: 2005-10-17 07:43:25 -0400 (Mon, 17 Oct 2005)
New Revision: 51798

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-codegen.c
Log:
2005-10-17  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-codegen.c (get_register_spilling): Fix some warnings.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2005-10-17 11:42:23 UTC (rev 51797)
+++ trunk/mono/mono/mini/ChangeLog      2005-10-17 11:43:25 UTC (rev 51798)
@@ -1,3 +1,7 @@
+2005-10-17  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mini-codegen.c (get_register_spilling): Fix some warnings.
+
 2005-10-16  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * mini-amd64.h mini-amd64.c exceptions-amd64.c: Add support for fp

Modified: trunk/mono/mono/mini/mini-codegen.c
===================================================================
--- trunk/mono/mono/mini/mini-codegen.c 2005-10-17 11:42:23 UTC (rev 51797)
+++ trunk/mono/mono/mini/mini-codegen.c 2005-10-17 11:43:25 UTC (rev 51798)
@@ -357,6 +357,11 @@
        return sel;
 }
 
+/* This isn't defined on older glib versions and on some platforms */
+#ifndef G_GUINT64_FORMAT
+#define G_GUINT64_FORMAT "ul"
+#endif
+
 static int
 get_register_spilling (MonoCompile *cfg, InstList *item, MonoInst *ins, 
regmask_t regmask, int reg, gboolean fp)
 {
@@ -373,7 +378,7 @@
                symbolic = cfg->rs->isymbolic;
        }
 
-       DEBUG (g_print ("\tstart regmask to assign R%d: 0x%08lx (R%d <- R%d 
R%d)\n", reg, (guint64)regmask, ins->dreg, ins->sreg1, ins->sreg2));
+       DEBUG (g_print ("\tstart regmask to assign R%d: 0x%08" G_GUINT64_FORMAT 
" (R%d <- R%d R%d)\n", reg, (guint64)regmask, ins->dreg, ins->sreg1, 
ins->sreg2));
        /* exclude the registers in the current instruction */
        if ((sreg1_is_fp (ins) == fp) && (reg != ins->sreg1) && 
(reg_is_freeable (ins->sreg1, fp) || (is_soft_reg (ins->sreg1, fp) && rassign 
(cfg, ins->sreg1, fp) >= 0))) {
                if (is_soft_reg (ins->sreg1, fp))
@@ -394,7 +399,7 @@
                DEBUG (g_print ("\t\texcluding dreg %s\n", mono_regname_full 
(ins->dreg, fp)));
        }
 
-       DEBUG (g_print ("\t\tavailable regmask: 0x%08lx\n", (guint64)regmask));
+       DEBUG (g_print ("\t\tavailable regmask: 0x%08" G_GUINT64_FORMAT "\n", 
(guint64)regmask));
        g_assert (regmask); /* need at least a register we can free */
        sel = -1;
        /* we should track prev_use and spill the register that's farther */

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to