Author: zoltan
Date: 2008-02-15 09:49:39 -0500 (Fri, 15 Feb 2008)
New Revision: 95759

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-s390.h
Log:
2008-02-15  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-s390.h (MONO_OUTPUT_VTR): Use cfg instead of s, avoid 
assignments to
        macro arguments.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2008-02-15 14:48:17 UTC (rev 95758)
+++ trunk/mono/mono/mini/ChangeLog      2008-02-15 14:49:39 UTC (rev 95759)
@@ -1,3 +1,8 @@
+2008-02-15  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mini-s390.h (MONO_OUTPUT_VTR): Use cfg instead of s, avoid 
assignments to
+       macro arguments.
+
 2008-02-14  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * mini-ops.h: Get rid of OP_SPARC_LOCALLOC_IMM.

Modified: trunk/mono/mono/mini/mini-s390.h
===================================================================
--- trunk/mono/mono/mini/mini-s390.h    2008-02-15 14:48:17 UTC (rev 95758)
+++ trunk/mono/mono/mini/mini-s390.h    2008-02-15 14:49:39 UTC (rev 95759)
@@ -59,32 +59,31 @@
        switch (size) {                                                         
\
                case 0:                                                         
\
                        MONO_EMIT_NEW_ICONST(cfg, reg, 0);                      
\
-                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); 
\
+                       mono_call_inst_add_outarg_reg(cfg, call, reg, dr, 
FALSE);       \
                break;                                                          
\
                case 1:                                                         
\
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU1_MEMBASE,   
\
                                reg, sr, so);                                   
\
-                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); 
\
+                       mono_call_inst_add_outarg_reg(cfg, call, reg, dr, 
FALSE);       \
                break;                                                          
\
                case 2:                                                         
\
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU2_MEMBASE,   
\
                                reg, sr, so);                                   
\
-                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); 
\
+                       mono_call_inst_add_outarg_reg(cfg, call, reg, dr, 
FALSE);       \
                break;                                                          
\
                case 4:                                                         
\
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOAD_MEMBASE,     
\
                                reg, sr, so);                                   
\
-                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); 
\
+                       mono_call_inst_add_outarg_reg(cfg, call, reg, dr, 
FALSE);       \
                break;                                                          
\
                case 8:                                                         
\
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOAD_MEMBASE,     
\
                                reg, sr, so);                                   
\
-                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); 
\
-                       dr++; so += sizeof(guint32);                            
\
+                       mono_call_inst_add_outarg_reg(cfg, call, reg, dr, 
FALSE);       \
                        reg = mono_regstate_next_int (cfg->rs);                 
\
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOAD_MEMBASE,     
\
-                               reg, sr, so);                                   
\
-                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); 
\
+                               reg, sr, so + sizeof (guint32));                
                        \
+                       mono_call_inst_add_outarg_reg(cfg, call, reg, dr + 1, 
FALSE);   \
                break;                                                          
\
        }                                                                       
\
 } while (0)

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

Reply via email to