Skip to content
Browse files

2006-10-12 Zoltan Varga <vargaz@gmail.com>

       * mini.c trace.c mini-x86.c: Revert these too.

svn path=/trunk/mono/; revision=66616
  • Loading branch information...
1 parent 901f161 commit f9ab45aa273562f0608bfefc57119b1a791d8758 @vargaz vargaz committed Oct 12, 2006
Showing with 17 additions and 8 deletions.
  1. +4 −2 mono/mini/ChangeLog
  2. +6 −2 mono/mini/mini-x86.c
  3. +6 −3 mono/mini/mini.c
  4. +1 −1 mono/mini/trace.c
View
6 mono/mini/ChangeLog
@@ -1,7 +1,9 @@
2006-10-12 Zoltan Varga <vargaz@gmail.com>
- * mini.c trace.c mini-x86.c: Remove warning workarounds after the mono_type_size ()
- signature change.
+ * mini.c trace.c mini-x86.c: Revert these too.
+
+ * mini.c trace.c mini-x86.c: Remove warning workarounds after the mono_type_size ()
+ signature change.
Tue Oct 10 11:35:20 CEST 2006 Paolo Molaro <lupus@ximian.com>
View
8 mono/mini/mini-x86.c
@@ -453,7 +453,9 @@ mono_arch_get_argument_info (MonoMethodSignature *csig, int param_count, MonoJit
if (csig->pinvoke)
size = mono_type_native_stack_size (csig->params [k], &align);
else {
- size = mono_type_stack_size (csig->params [k], &align);
+ int ialign;
+ size = mono_type_stack_size (csig->params [k], &ialign);
+ align = ialign;
}
/* ignore alignment for now */
@@ -982,7 +984,9 @@ mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst *call,
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);
+ int ialign;
+ size = mono_type_stack_size (&in->klass->byval_arg, &ialign);
+ align = ialign;
}
arg->opcode = OP_OUTARG_VT;
arg->klass = in->klass;
View
9 mono/mini/mini.c
@@ -3743,7 +3743,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
MonoGenericContainer *generic_container = NULL;
MonoType **param_types;
GList *bb_recheck = NULL, *tmp;
- int i, n, start_new_bblock;
+ int i, n, start_new_bblock, ialign;
int num_calls = 0, inline_costs = 0;
int breakpoint_id = 0;
guint32 align;
@@ -7310,7 +7310,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
/* FIXXME: handle generics. */
if (mono_metadata_token_table (token) == MONO_TABLE_TYPESPEC) {
MonoType *type = mono_type_create_from_typespec (image, token);
- token = mono_type_size (type, &align);
+ token = mono_type_size (type, &ialign);
} else {
MonoClass *klass = mono_class_get_full (image, token, generic_context);
if (!klass)
@@ -7980,7 +7980,10 @@ mono_allocate_stack_slots_full (MonoCompile *m, gboolean backward, guint32 *stac
if (inst->backend.is_pinvoke && MONO_TYPE_ISSTRUCT (inst->inst_vtype) && inst->inst_vtype->type != MONO_TYPE_TYPEDBYREF)
size = mono_class_native_size (inst->inst_vtype->data.klass, &align);
else {
- size = mono_type_size (inst->inst_vtype, &align);
+ int ialign;
+
+ size = mono_type_size (inst->inst_vtype, &ialign);
+ align = ialign;
}
t = mono_type_get_underlying_type (inst->inst_vtype);
View
2 mono/mini/trace.c
@@ -550,7 +550,7 @@ mono_trace_leave_method (MonoMethod *method, ...)
goto handle_enum;
} else {
guint8 *p = va_arg (ap, gpointer);
- guint32 j, size, align;
+ int j, size, align;
size = mono_type_size (type, &align);
printf ("[");
for (j = 0; p && j < size; j++)

0 comments on commit f9ab45a

Please sign in to comment.
Something went wrong with that request. Please try again.