Author: zoltan
Date: 2006-09-12 06:24:33 -0400 (Tue, 12 Sep 2006)
New Revision: 65290

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-ia64.c
   trunk/mono/mono/mini/mini-ia64.h
   trunk/mono/mono/mini/mini.c
Log:
2006-09-12  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini.c (mini_get_ldelema_ins): Allow ldelema2d optimization if 
        MONO_ARCH_NO_EMULATE_MUL is defined.

        * mini-ia64.h (MONO_ARCH_CALLEE_FREGS): Reserve f33 for use by 
instructions.

        * mini-ia64.h: Define MONO_ARCH_NO_EMULATE_MUL.

        * mini-ia64.c: Implement CEE_MUL based on gcc emitted code.

        * mini-ia64.c (mono_arch_lowering_pass): Optimize store_membase_imm 
with offset==0.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2006-09-12 10:05:29 UTC (rev 65289)
+++ trunk/mono/mono/mini/ChangeLog      2006-09-12 10:24:33 UTC (rev 65290)
@@ -1,3 +1,16 @@
+2006-09-12  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mini.c (mini_get_ldelema_ins): Allow ldelema2d optimization if 
+       MONO_ARCH_NO_EMULATE_MUL is defined.
+
+       * mini-ia64.h (MONO_ARCH_CALLEE_FREGS): Reserve f33 for use by 
instructions.
+
+       * mini-ia64.h: Define MONO_ARCH_NO_EMULATE_MUL.
+
+       * mini-ia64.c: Implement CEE_MUL based on gcc emitted code.
+
+       * mini-ia64.c (mono_arch_lowering_pass): Optimize store_membase_imm 
with offset==0.
+       
 2006-09-11  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * mini-sparc.c (mono_arch_setup_jit_tls_data): Remove the duplicate 
altstack

Modified: trunk/mono/mono/mini/mini-ia64.c
===================================================================
--- trunk/mono/mono/mini/mini-ia64.c    2006-09-12 10:05:29 UTC (rev 65289)
+++ trunk/mono/mono/mini/mini-ia64.c    2006-09-12 10:24:33 UTC (rev 65290)
@@ -59,6 +59,7 @@
 #define GP_SCRATCH_REG 31
 #define GP_SCRATCH_REG2 30
 #define FP_SCRATCH_REG 32
+#define FP_SCRATCH_REG2 33
 
 #define LOOP_ALIGNMENT 8
 #define bb_is_loop_start(bb) ((bb)->loop_body_start && (bb)->nesting)
@@ -1040,7 +1041,6 @@
  * instructions to properly call the function in call.
  * This includes pushing, moving arguments to the right register
  * etc.
- * Issue: who does the spilling if needed, and when?
  */
 MonoCallInst*
 mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb, MonoCallInst 
*call, int is_virtual)
@@ -1526,7 +1526,9 @@
                case OP_STOREI8_MEMBASE_IMM:
                case OP_STORE_MEMBASE_IMM:
                        /* There are no store_membase instructions on ia64 */
-                       if (ia64_is_imm14 (ins->inst_offset)) {
+                       if (ins->inst_offset == 0) {
+                               temp2 = NULL;
+                       } else if (ia64_is_imm14 (ins->inst_offset)) {
                                NEW_INS (cfg, temp2, OP_ADD_IMM);
                                temp2->sreg1 = ins->inst_destbasereg;
                                temp2->inst_imm = ins->inst_offset;
@@ -1570,7 +1572,8 @@
                        }
 
                        ins->inst_offset = 0;
-                       ins->inst_destbasereg = temp2->dreg;
+                       if (temp2)
+                               ins->inst_destbasereg = temp2->dreg;
                        break;
                case OP_STOREI1_MEMBASE_REG:
                case OP_STOREI2_MEMBASE_REG:
@@ -2502,6 +2505,13 @@
                case OP_LSHR_UN_IMM:
                        ia64_shr_u_imm (code, ins->dreg, ins->sreg1, 
ins->inst_imm);
                        break;
+               case CEE_MUL:
+                       /* Based on gcc code */
+                       ia64_setf_sig (code, FP_SCRATCH_REG, ins->sreg1);
+                       ia64_setf_sig (code, FP_SCRATCH_REG2, ins->sreg2);
+                       ia64_xmpy_l (code, FP_SCRATCH_REG, FP_SCRATCH_REG, 
FP_SCRATCH_REG2);
+                       ia64_getf_sig (code, ins->dreg, FP_SCRATCH_REG);
+                       break;
 
                case OP_STOREI1_MEMBASE_REG:
                        ia64_st1_hint (code, ins->inst_destbasereg, ins->sreg1, 
0);

Modified: trunk/mono/mono/mini/mini-ia64.h
===================================================================
--- trunk/mono/mono/mini/mini-ia64.h    2006-09-12 10:05:29 UTC (rev 65289)
+++ trunk/mono/mono/mini/mini-ia64.h    2006-09-12 10:24:33 UTC (rev 65290)
@@ -17,9 +17,9 @@
 /* r8..r11, r14..r29 */
 #define MONO_ARCH_CALLEE_REGS ((regmask_t)(0x700UL) | 
(regmask_t)(0x3fffc000UL))
 
-/* f6..f15, f33..f127 */
+/* f6..f15, f34..f127 */
 /* FIXME: Use the upper 64 bits as well */
-#define MONO_ARCH_CALLEE_FREGS ((regmask_t)(0xfffffffe00000000UL) | 
((regmask_t)(0x3ffUL) << 6))
+#define MONO_ARCH_CALLEE_FREGS ((regmask_t)(0xfffffffc00000000UL) | 
((regmask_t)(0x3ffUL) << 6))
 
 #define MONO_ARCH_CALLEE_SAVED_REGS ~(MONO_ARCH_CALLEE_REGS)
 
@@ -164,6 +164,7 @@
 
 #define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS 1
 #define MONO_ARCH_NO_EMULATE_MUL_IMM 1
+#define MONO_ARCH_NO_EMULATE_MUL     1
 
 #define MONO_ARCH_EMULATE_CONV_R8_UN     1
 #define MONO_ARCH_EMULATE_LCONV_TO_R8_UN 1

Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2006-09-12 10:05:29 UTC (rev 65289)
+++ trunk/mono/mono/mini/mini.c 2006-09-12 10:24:33 UTC (rev 65290)
@@ -3042,7 +3042,7 @@
        }
 
        if (rank == 2 && (cfg->opt & MONO_OPT_INTRINS)) {
-#ifdef MONO_ARCH_EMULATE_MUL_DIV
+#if defined(MONO_ARCH_EMULATE_MUL_DIV) && !defined(MONO_ARCH_NO_EMULATE_MUL)
                /* OP_LDELEMA2D depends on OP_LMUL */
 #else
                MonoInst *indexes;

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

Reply via email to