Author: zoltan
Date: 2006-07-19 14:08:36 -0400 (Wed, 19 Jul 2006)
New Revision: 62762
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini-x86.c
Log:
2006-07-19 Zoltan Varga <[EMAIL PROTECTED]>
* mini-x86.c (mono_arch_get_argument_info): Fix a warning.
(mono_arch_call_opcode): Ditto.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2006-07-19 18:06:41 UTC (rev 62761)
+++ trunk/mono/mono/mini/ChangeLog 2006-07-19 18:08:36 UTC (rev 62762)
@@ -1,5 +1,8 @@
2006-07-19 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini-x86.c (mono_arch_get_argument_info): Fix a warning.
+ (mono_arch_call_opcode): Ditto.
+
* mini.c (mono_method_to_ir): Clear ins_flag at the end of CEE_CALL.
Fixes
#78826.
Modified: trunk/mono/mono/mini/mini-x86.c
===================================================================
--- trunk/mono/mono/mini/mini-x86.c 2006-07-19 18:06:41 UTC (rev 62761)
+++ trunk/mono/mono/mini/mini-x86.c 2006-07-19 18:08:36 UTC (rev 62762)
@@ -427,7 +427,8 @@
mono_arch_get_argument_info (MonoMethodSignature *csig, int param_count,
MonoJitArgumentInfo *arg_info)
{
int k, frame_size = 0;
- int size, align, pad;
+ int size, pad;
+ guint32 align;
int offset = 8;
CallInfo *cinfo;
@@ -451,8 +452,11 @@
if (csig->pinvoke)
size = mono_type_native_stack_size (csig->params [k],
&align);
- else
- size = mono_type_stack_size (csig->params [k], &align);
+ else {
+ int ialign;
+ size = mono_type_stack_size (csig->params [k], &ialign);
+ align = ialign;
+ }
/* ignore alignment for now */
align = 1;
@@ -963,8 +967,7 @@
call->out_args = arg;
if ((i >= sig->hasthis) && (MONO_TYPE_ISSTRUCT(t))) {
- gint align;
- guint32 size;
+ guint32 size, align;
if (t->type == MONO_TYPE_TYPEDBYREF) {
size = sizeof (MonoTypedRef);
@@ -973,8 +976,11 @@
else
if (sig->pinvoke)
size =
mono_type_native_stack_size (&in->klass->byval_arg, &align);
- else
- size = mono_type_stack_size
(&in->klass->byval_arg, &align);
+ else {
+ int ialign;
+ size = mono_type_stack_size
(&in->klass->byval_arg, &ialign);
+ align = ialign;
+ }
arg->opcode = OP_OUTARG_VT;
arg->klass = in->klass;
arg->unused = sig->pinvoke;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
