Mon Mar 8 17:58:26 CET 2010 Paolo Molaro <lupus@ximian.com>

[mono.git] / mono / mini / mini-sparc.c

diff --git a/mono/mini/mini-sparc.c b/mono/mini/mini-sparc.c
index b1825eb6c64f61d9a5866b1ac575c2c603da3f31..985ce563c6dc39405e32099a1e72d053b25ef39d 100644 (file)
--- a/mono/mini/mini-sparc.c
+++ b/mono/mini/mini-sparc.c
@@ -571,7 +571,7 @@ get_call_info (MonoCompile *cfg, MonoMethodSignature *sig, gboolean is_pinvoke)
                        add_general (&gr, &stack_size, ainfo, FALSE);
                        break;
                case MONO_TYPE_GENERICINST:
-                       if (!mono_type_generic_inst_is_valuetype (sig->params [i])) {
+                       if (!mono_type_generic_inst_is_valuetype (ptype)) {
                                add_general (&gr, &stack_size, ainfo, FALSE);
                                break;
                        }
@@ -670,7 +670,7 @@ get_call_info (MonoCompile *cfg, MonoMethodSignature *sig, gboolean is_pinvoke)
                cinfo->ret.reg = sparc_f0;
                break;
        case MONO_TYPE_GENERICINST:
-               if (!mono_type_generic_inst_is_valuetype (sig->ret)) {
+               if (!mono_type_generic_inst_is_valuetype (ret_type)) {
                        cinfo->ret.storage = ArgInIReg;
                        cinfo->ret.reg = sparc_i0;
                        if (gr < 1)
@@ -798,7 +798,7 @@ mono_arch_allocate_vars (MonoCompile *cfg)
        int i, offset, size, align, curinst;
        CallInfo *cinfo;
 
-       header = mono_method_get_header (cfg->method);
+       header = cfg->header;
 
        sig = mono_method_signature (cfg->method);
 
@@ -1755,7 +1755,7 @@ mono_arch_peephole_pass_2 (MonoCompile *cfg, MonoBasicBlock *bb)
                         * Only do this if the method is small since BPr only has a 16bit
                         * displacement.
                         */
-                       if (v64 && (mono_method_get_header (cfg->method)->code_size < 10000) && last_ins && 
+                       if (v64 && (cfg->header->code_size < 10000) && last_ins && 
                                (last_ins->opcode == OP_COMPARE_IMM) &&
                                (last_ins->inst_imm == 0)) {
                                switch (ins->opcode) {