2008-12-17 Mark Mason <mmason@upwardaccess.com>

        * mini-mips.c (mono_arch_output_basic_block): OP_JUMP_TABLE stores patch type in inst_c1, not inst_i1.

Contributed under the MIT X11 license.

svn path=/trunk/mono/; revision=121688

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 7b80a59b758d4d5900668b65952c2001638e953e..0f57abaa1a46db4b54518f2350f9b103809b24af 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-17  Mark Mason <mmason@upwardaccess.com>
+       
+       * mini-mips.c (mono_arch_output_basic_block): OP_JUMP_TABLE stores patch type in inst_c1, not inst_i1.
+       
 2008-12-16  Rodrigo Kumpera  <rkumpera@novell.com>
 
        * branch-opts.c (remove_block_if_useless): Even if BB0 falls through, don't add a br to the

diff --git a/mono/mini/mini-mips.c b/mono/mini/mini-mips.c
index 63672dc6084d61a9d82134622e7c630830830acf..c54093bcc43d18852e7a1dccf6421b5f3429be97 100644 (file)
--- a/mono/mini/mini-mips.c
+++ b/mono/mini/mini-mips.c
@@ -4231,7 +4231,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        break;
                }
                case OP_JUMP_TABLE:
-                       mono_add_patch_info (cfg, offset, (MonoJumpInfoType)ins->inst_i1, ins->inst_p0);
+                       mono_add_patch_info (cfg, offset, (MonoJumpInfoType)ins->inst_c1, ins->inst_p0);
                        mips_load (code, ins->dreg, 0x0f0f0f0f);
                        break;