From: Paolo Molaro Date: Wed, 13 Jun 2007 18:42:34 +0000 (-0000) Subject: 2007-06-13 Randolph Chung X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=a7726823d1a63b51ddeb9ecaff76eb4571d3c74f;p=mono.git 2007-06-13 Randolph Chung * mini-ops.h: Reorder branch ops so that they match the order of the corresponding CEE_* ops. The code expects them this way. Add new ops for HPPA target. Contributed under the X11 license (http://bugzilla.ximian.com/show_bug.cgi?id=81866). svn path=/trunk/mono/; revision=79476 --- diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 614cbfa5a47..98d2c59ca0d 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,11 +1,17 @@ +2007-06-13 Randolph Chung + + * mini-ops.h: Reorder branch ops so that they match the order of the + corresponding CEE_* ops. The code expects them this way. + Add new ops for HPPA target. + Contributed under the X11 license (http://bugzilla.ximian.com/show_bug.cgi?id=81866). + 2007-06-13 Randolph Chung * mini-exceptions.c: Handle cases where the stack grows towards larger addresses. Contributed under the X11 license (http://bugzilla.ximian.com/show_bug.cgi?id=81866). - Wed Jun 13 19:13:23 CEST 2007 Paolo Molaro * jit-icalls.c, mini.h, mini.c: added virtual generic invoke diff --git a/mono/mini/mini-ops.h b/mono/mini/mini-ops.h index 8a3e7a11d7e..0a4b69a27f9 100644 --- a/mono/mini/mini-ops.h +++ b/mono/mini/mini-ops.h @@ -242,15 +242,15 @@ MINI_OP(OP_LSUB_IMM, "long_sub_imm") MINI_OP(OP_LMUL_IMM, "long_mul_imm") MINI_OP(OP_LBEQ, "long_beq") -MINI_OP(OP_LBNE_UN, "long_bne_un") -MINI_OP(OP_LBLT, "long_blt") -MINI_OP(OP_LBLT_UN, "long_blt_un") -MINI_OP(OP_LBGT, "long_bgt") -MINI_OP(OP_LBGT_UN, "long_btg_un") MINI_OP(OP_LBGE, "long_bge") -MINI_OP(OP_LBGE_UN, "long_bge_un") +MINI_OP(OP_LBGT, "long_bgt") MINI_OP(OP_LBLE, "long_ble") +MINI_OP(OP_LBLT, "long_blt") +MINI_OP(OP_LBNE_UN, "long_bne_un") +MINI_OP(OP_LBGE_UN, "long_bge_un") +MINI_OP(OP_LBGT_UN, "long_btg_un") MINI_OP(OP_LBLE_UN, "long_ble_un") +MINI_OP(OP_LBLT_UN, "long_blt_un") MINI_OP(OP_LONG_SHRUN_32, "long_shr_un_32") @@ -344,26 +344,26 @@ MINI_OP(OP_ICLT, "int_clt") MINI_OP(OP_ICLT_UN,"int_clt_un") MINI_OP(OP_IBEQ, "int_beq") -MINI_OP(OP_IBNE_UN, "int_bne_un") -MINI_OP(OP_IBLT, "int_blt") -MINI_OP(OP_IBLT_UN, "int_blt_un") -MINI_OP(OP_IBGT, "int_bgt") -MINI_OP(OP_IBGT_UN, "int_bgt_un") MINI_OP(OP_IBGE, "int_bge") -MINI_OP(OP_IBGE_UN, "int_bge_un") +MINI_OP(OP_IBGT, "int_bgt") MINI_OP(OP_IBLE, "int_ble") +MINI_OP(OP_IBLT, "int_blt") +MINI_OP(OP_IBNE_UN, "int_bne_un") +MINI_OP(OP_IBGE_UN, "int_bge_un") +MINI_OP(OP_IBGT_UN, "int_bgt_un") MINI_OP(OP_IBLE_UN, "int_ble_un") +MINI_OP(OP_IBLT_UN, "int_blt_un") MINI_OP(OP_FBEQ, "float_beq") -MINI_OP(OP_FBNE_UN,"float_bne_un") -MINI_OP(OP_FBLT, "float_blt") -MINI_OP(OP_FBLT_UN,"float_blt_un") -MINI_OP(OP_FBGT, "float_bgt") -MINI_OP(OP_FBGT_UN,"float_btg_un") MINI_OP(OP_FBGE, "float_bge") -MINI_OP(OP_FBGE_UN,"float_bge_un") +MINI_OP(OP_FBGT, "float_bgt") MINI_OP(OP_FBLE, "float_ble") +MINI_OP(OP_FBLT, "float_blt") +MINI_OP(OP_FBNE_UN,"float_bne_un") +MINI_OP(OP_FBGE_UN,"float_bge_un") +MINI_OP(OP_FBGT_UN,"float_btg_un") MINI_OP(OP_FBLE_UN,"float_ble_un") +MINI_OP(OP_FBLT_UN,"float_blt_un") /* float opcodes: must be in the same order as the matching CEE_ opcodes: binops_op_map */ MINI_OP(OP_FADD, "float_add") @@ -814,3 +814,59 @@ MINI_OP(OP_MIPS_COND_EXC_IC, "mips_cond_exc_ic") MINI_OP(OP_MIPS_COND_EXC_INC, "mips_cond_exc_inc") #endif + +#if defined(__hppa) +MINI_OP(OP_HPPA_BEQ, "hppa_beq") +MINI_OP(OP_HPPA_BGE, "hppa_bge") +MINI_OP(OP_HPPA_BGT, "hppa_bgt") +MINI_OP(OP_HPPA_BLE, "hppa_ble") +MINI_OP(OP_HPPA_BLT, "hppa_blt") +MINI_OP(OP_HPPA_BNE, "hppa_bne") +MINI_OP(OP_HPPA_BGE_UN, "hppa_bge_un") +MINI_OP(OP_HPPA_BGT_UN, "hppa_bgt_un") +MINI_OP(OP_HPPA_BLE_UN, "hppa_ble_un") +MINI_OP(OP_HPPA_BLT_UN, "hppa_blt_un") + +MINI_OP(OP_HPPA_CEQ, "hppa_ceq") +MINI_OP(OP_HPPA_CGT, "hppa_cgt") +MINI_OP(OP_HPPA_CGT_UN, "hppa_cgt_un") +MINI_OP(OP_HPPA_CLT, "hppa_clt") +MINI_OP(OP_HPPA_CLT_UN, "hppa_clt_un") + +MINI_OP(OP_HPPA_CEQ_IMM, "hppa_ceq_imm") +MINI_OP(OP_HPPA_CGT_IMM, "hppa_cgt_imm") +MINI_OP(OP_HPPA_CGT_UN_IMM, "hppa_cgt_un_imm") +MINI_OP(OP_HPPA_CLT_IMM, "hppa_clt_imm") +MINI_OP(OP_HPPA_CLT_UN_IMM, "hppa_clt_un_imm") + +MINI_OP(OP_HPPA_COND_EXC_EQ, "hppa_cond_exc_eq") +MINI_OP(OP_HPPA_COND_EXC_GE, "hppa_cond_exc_ge") +MINI_OP(OP_HPPA_COND_EXC_GT, "hppa_cond_exc_gt") +MINI_OP(OP_HPPA_COND_EXC_LE, "hppa_cond_exc_le") +MINI_OP(OP_HPPA_COND_EXC_LT, "hppa_cond_exc_lt") +MINI_OP(OP_HPPA_COND_EXC_NE_UN, "hppa_cond_exc_ne_un") +MINI_OP(OP_HPPA_COND_EXC_GE_UN, "hppa_cond_exc_ge_un") +MINI_OP(OP_HPPA_COND_EXC_GT_UN, "hppa_cond_exc_gt_un") +MINI_OP(OP_HPPA_COND_EXC_LE_UN, "hppa_cond_exc_le_un") +MINI_OP(OP_HPPA_COND_EXC_LT_UN, "hppa_cond_exc_lt_un") +MINI_OP(OP_HPPA_COND_EXC_OV, "hppa_cond_exc_ov") +MINI_OP(OP_HPPA_COND_EXC_NO, "hppa_cond_exc_no") +MINI_OP(OP_HPPA_COND_EXC_C, "hppa_cond_exc_c") +MINI_OP(OP_HPPA_COND_EXC_NC, "hppa_cond_exc_nc") + +MINI_OP(OP_HPPA_XMPYU, "hppa_xmpyu") +MINI_OP(OP_HPPA_ADD_OVF, "hppa_add_ovf") +MINI_OP(OP_HPPA_SUB_OVF, "hppa_sub_ovf") +MINI_OP(OP_HPPA_ADDC_OVF, "hppa_addc_ovf") +MINI_OP(OP_HPPA_SUBB_OVF, "hppa_subb_ovf") + +MINI_OP(OP_HPPA_OUTARG_R4CONST, "hppa_outarg_r4const") +MINI_OP(OP_HPPA_OUTARG_REGOFFSET, "hppa_outarg_regoffset") + +MINI_OP(OP_HPPA_LOADR4_LEFT, "hppa_loadr4_left") +MINI_OP(OP_HPPA_LOADR4_RIGHT, "hppa_loadr4_right") +MINI_OP(OP_HPPA_STORER4_LEFT, "hppa_storer4_left") +MINI_OP(OP_HPPA_STORER4_RIGHT, "hppa_storer4_right") + +MINI_OP(OP_HPPA_SETF4REG, "hppa_setf4reg") +#endif