Author: lupus
Date: 2006-09-12 07:10:42 -0400 (Tue, 12 Sep 2006)
New Revision: 65295

Added:
   trunk/mono/mono/arch/arm/arm-vfp-codegen.h
   trunk/mono/mono/arch/arm/arm_vfpmacros.h
   trunk/mono/mono/arch/arm/vfp_macros.th
   trunk/mono/mono/arch/arm/vfpm_macros.th
   trunk/mono/mono/arch/arm/vfpops.sh
Modified:
   trunk/mono/mono/arch/ChangeLog
   trunk/mono/mono/arch/arm/Makefile.am
   trunk/mono/mono/arch/arm/fpaops.sh
Log:


Tue Sep 12 13:09:56 CEST 2006 Paolo Molaro <[EMAIL PROTECTED]>

        * arm/*: VFP floating point format code generation support.



Modified: trunk/mono/mono/arch/ChangeLog
===================================================================
--- trunk/mono/mono/arch/ChangeLog      2006-09-12 11:07:39 UTC (rev 65294)
+++ trunk/mono/mono/arch/ChangeLog      2006-09-12 11:10:42 UTC (rev 65295)
@@ -1,3 +1,8 @@
+
+Tue Sep 12 13:09:56 CEST 2006 Paolo Molaro <[EMAIL PROTECTED]>
+
+       * arm/*: VFP floating point format code generation support.
+
 2006-09-12  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * ia64/ia64-codegen.h: Add xmpy_l/u pseudo ops.

Modified: trunk/mono/mono/arch/arm/Makefile.am
===================================================================
--- trunk/mono/mono/arch/arm/Makefile.am        2006-09-12 11:07:39 UTC (rev 
65294)
+++ trunk/mono/mono/arch/arm/Makefile.am        2006-09-12 11:10:42 UTC (rev 
65295)
@@ -3,7 +3,7 @@
 
 noinst_LTLIBRARIES = libmonoarch-arm.la
 
-BUILT_SOURCES = arm_dpimacros.h arm_fpamacros.h
+BUILT_SOURCES = arm_dpimacros.h arm_fpamacros.h arm_vfpmacros.h
 
 
 libmonoarch_arm_la_SOURCES = $(BUILT_SOURCES) \
@@ -21,6 +21,13 @@
        (cd $(srcdir); bash ./fpaops.sh) > [EMAIL PROTECTED]
        mv [EMAIL PROTECTED] $@
 
+arm_vfpmacros.h: vfpops.sh vfpm_macros.th vfp_macros.th
+       (cd $(srcdir); bash ./vfpops.sh) > [EMAIL PROTECTED]
+       mv [EMAIL PROTECTED] $@
+
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = dpiops.sh mov_macros.th dpi_macros.th cmp_macros.th 
fpam_macros.th fpa_macros.th arm-fpa-codegen.h fpaops.sh
+EXTRA_DIST = dpiops.sh mov_macros.th dpi_macros.th cmp_macros.th \
+       fpam_macros.th fpa_macros.th arm-fpa-codegen.h fpaops.sh \
+       vfpm_macros.th vfp_macros.th arm-vfp-codegen.h vfpops.sh
+

Added: trunk/mono/mono/arch/arm/arm-vfp-codegen.h
===================================================================
--- trunk/mono/mono/arch/arm/arm-vfp-codegen.h  2006-09-12 11:07:39 UTC (rev 
65294)
+++ trunk/mono/mono/arch/arm/arm-vfp-codegen.h  2006-09-12 11:10:42 UTC (rev 
65295)
@@ -0,0 +1,183 @@
+#ifndef __MONO_ARM_VFP_CODEGEN_H__
+#define __MONO_ARM_VFP_CODEGEN_H__
+
+#include "arm-codegen.h"
+
+enum {
+       /* FPA registers */
+       ARM_VFP_F0,
+       ARM_VFP_F1,
+       ARM_VFP_F2,
+       ARM_VFP_F3,
+       ARM_VFP_F4,
+       ARM_VFP_F5,
+       ARM_VFP_F6,
+       ARM_VFP_F7,
+       ARM_VFP_F8,
+       ARM_VFP_F9,
+       ARM_VFP_F10,
+       ARM_VFP_F11,
+       ARM_VFP_F12,
+       ARM_VFP_F13,
+       ARM_VFP_F14,
+       ARM_VFP_F15,
+       ARM_VFP_F16,
+       ARM_VFP_F17,
+       ARM_VFP_F18,
+       ARM_VFP_F19,
+       ARM_VFP_F20,
+       ARM_VFP_F21,
+       ARM_VFP_F22,
+       ARM_VFP_F23,
+       ARM_VFP_F24,
+       ARM_VFP_F25,
+       ARM_VFP_F26,
+       ARM_VFP_F27,
+       ARM_VFP_F28,
+       ARM_VFP_F29,
+       ARM_VFP_F30,
+       ARM_VFP_F31,
+
+       ARM_VFP_D0 = ARM_VFP_F0,
+       ARM_VFP_D1 = ARM_VFP_F2,
+       ARM_VFP_D2 = ARM_VFP_F4,
+       ARM_VFP_D3 = ARM_VFP_F6,
+       ARM_VFP_D4 = ARM_VFP_F8,
+       ARM_VFP_D5 = ARM_VFP_F10,
+       ARM_VFP_D6 = ARM_VFP_F12,
+       ARM_VFP_D7 = ARM_VFP_F14,
+       ARM_VFP_D8 = ARM_VFP_F16,
+       ARM_VFP_D9 = ARM_VFP_F18,
+       ARM_VFP_D10 = ARM_VFP_F20,
+       ARM_VFP_D11 = ARM_VFP_F22,
+       ARM_VFP_D12 = ARM_VFP_F24,
+       ARM_VFP_D13 = ARM_VFP_F26,
+       ARM_VFP_D14 = ARM_VFP_F28,
+       ARM_VFP_D15 = ARM_VFP_F30,
+
+       ARM_VFP_COPROC_SINGLE = 10,
+       ARM_VFP_COPROC_DOUBLE = 11,
+
+#define ARM_VFP_OP(p,q,r,s) (((p) << 23) | ((q) << 21) | ((r) << 20) | ((s) << 
6))
+#define ARM_VFP_OP2(Fn,N) (ARM_VFP_OP (1,1,1,1) | ((Fn) << 16) | ((N) << 7))
+
+       ARM_VFP_MUL = ARM_VFP_OP (0,1,0,0),
+       ARM_VFP_NMUL = ARM_VFP_OP (0,1,0,1),
+       ARM_VFP_ADD = ARM_VFP_OP (0,1,1,0),
+       ARM_VFP_SUB = ARM_VFP_OP (0,1,1,1),
+       ARM_VFP_DIV = ARM_VFP_OP (1,0,0,0),
+
+       ARM_VFP_CPY = ARM_VFP_OP2 (0,0),
+       ARM_VFP_ABS = ARM_VFP_OP2 (0,1),
+       ARM_VFP_NEG = ARM_VFP_OP2 (1,0),
+       ARM_VFP_SQRT = ARM_VFP_OP2 (1,1),
+       ARM_VFP_CMP = ARM_VFP_OP2 (4,0),
+       ARM_VFP_CMPE = ARM_VFP_OP2 (4,1),
+       ARM_VFP_CMPZ = ARM_VFP_OP2 (5,0),
+       ARM_VFP_CMPEZ = ARM_VFP_OP2 (5,1),
+       ARM_VFP_CVT = ARM_VFP_OP2 (7,1),
+       ARM_VFP_UITO = ARM_VFP_OP2 (8,0),
+       ARM_VFP_SITO = ARM_VFP_OP2 (8,1),
+       ARM_VFP_TOUI = ARM_VFP_OP2 (12,0),
+       ARM_VFP_TOSI = ARM_VFP_OP2 (13,0),
+       ARM_VFP_TOUIZ = ARM_VFP_OP2 (12,1),
+       ARM_VFP_TOSIZ = ARM_VFP_OP2 (13,1),
+
+       ARM_VFP_SID = 0,
+       ARM_VFP_SCR = 1 << 1,
+       ARM_VFP_EXC = 8 << 1
+};
+
+#define ARM_DEF_VFP_DYADIC(cond,cp,op,Fd,Fn,Fm)        \
+       (14 << 24)                              |       \
+       ((cp) << 8)                             |       \
+       (op)                                    |       \
+       (((Fd) >> 1) << 12)                     |       \
+       (((Fd) & 1) << 22)                      |       \
+       (((Fn) >> 1) << 16)                     |       \
+       (((Fn) & 1) << 7)                       |       \
+       (((Fm) >> 1) << 0)                      |       \
+       (((Fm) & 1) << 5)                       |       \
+       ARM_DEF_COND(cond)
+
+#define ARM_DEF_VFP_MONADIC(cond,cp,op,Fd,Fm)  \
+       (14 << 24)                              |       \
+       ((cp) << 8)                             |       \
+       (op)                                    |       \
+       (((Fd) >> 1) << 12)                     |       \
+       (((Fd) & 1) << 22)                      |       \
+       (((Fm) >> 1) << 0)                      |       \
+       (((Fm) & 1) << 5)                       |       \
+       ARM_DEF_COND(cond)
+
+#define ARM_DEF_VFP_LSF(cond,cp,post,ls,wback,basereg,Fd,offset)       \
+       ((offset) >= 0? (offset)>>2: -(offset)>>2)      |       \
+       ((6 << 25)                                      |       \
+       ((cp) << 8)                                     |       \
+       (((Fd) >> 1) << 12)                             |       \
+       (((Fd) & 1) << 22)                              |       \
+       ((basereg) << 16)                               |       \
+       ((ls) << 20)                                    |       \
+       ((wback) << 21)                                 |       \
+       (((offset) >= 0) << 23)                         |       \
+       ((wback) << 21)                                 |       \
+       ((post) << 24)                                  |       \
+       ARM_DEF_COND(cond)
+
+#define ARM_DEF_VFP_CPT(cond,cp,op,L,Fn,Rd)    \
+       (14 << 24)                              |       \
+       (1 << 4)                                |       \
+       ((cp) << 8)                             |       \
+       ((op) << 21)                            |       \
+       ((L) << 20)                             |       \
+       ((Rd) << 12)                            |       \
+       (((Fn) >> 1) << 16)                     |       \
+       (((Fn) & 1) << 7)                       |       \
+       ARM_DEF_COND(cond)
+
+/* FP load and stores */
+#define ARM_FLDS_COND(p,freg,base,offset,cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_LSF((cond),ARM_VFP_COPROC_SINGLE,1,ARMOP_LDR,0,(base),(freg),(offset)))
+#define ARM_FLDS(p,freg,base,offset)   \
+       ARM_FLDS_COND(p,freg,base,offset,ARMCOND_AL)
+
+#define ARM_FLDD_COND(p,freg,base,offset,cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_LSF((cond),ARM_VFP_COPROC_DOUBLE,1,ARMOP_LDR,0,(base),(freg),(offset)))
+#define ARM_FLDD(p,freg,base,offset)   \
+       ARM_FLDD_COND(p,freg,base,offset,ARMCOND_AL)
+
+#define ARM_FSTS_COND(p,freg,base,offset,cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_LSF((cond),ARM_VFP_COPROC_SINGLE,1,ARMOP_STR,0,(base),(freg),(offset)))
+#define ARM_FSTS(p,freg,base,offset)   \
+       ARM_FSTS_COND(p,freg,base,offset,ARMCOND_AL)
+
+#define ARM_FSTD_COND(p,freg,base,offset,cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_LSF((cond),ARM_VFP_COPROC_DOUBLE,1,ARMOP_STR,0,(base),(freg),(offset)))
+#define ARM_FSTD(p,freg,base,offset)   \
+       ARM_FSTD_COND(p,freg,base,offset,ARMCOND_AL)
+
+#include "arm_vfpmacros.h"
+
+#define ARM_DEF_VFP_CPT(cond,cp,op,L,Fn,Rd)
+/* coprocessor register transfer */
+#define ARM_FMSR(p,freg,reg)   \
+       ARM_EMIT((p), 
ARM_DEF_VFP_CPT(ARMCOND_AL,ARM_VFP_COPROC_SINGLE,0,0,(freg),(reg)))
+#define ARM_FMRS(p,reg,freg)   \
+       ARM_EMIT((p), 
ARM_DEF_VFP_CPT(ARMCOND_AL,ARM_VFP_COPROC_SINGLE,0,1,(freg),(reg)))
+
+#define ARM_FMDLR(p,freg,reg)  \
+       ARM_EMIT((p), 
ARM_DEF_VFP_CPT(ARMCOND_AL,ARM_VFP_COPROC_DOUBLE,0,0,(freg),(reg)))
+#define ARM_FMRDL(p,reg,freg)  \
+       ARM_EMIT((p), 
ARM_DEF_VFP_CPT(ARMCOND_AL,ARM_VFP_COPROC_DOUBLE,0,1,(freg),(reg)))
+#define ARM_FMDHR(p,freg,reg)  \
+       ARM_EMIT((p), 
ARM_DEF_VFP_CPT(ARMCOND_AL,ARM_VFP_COPROC_DOUBLE,1,0,(freg),(reg)))
+#define ARM_FMRDH(p,reg,freg)  \
+       ARM_EMIT((p), 
ARM_DEF_VFP_CPT(ARMCOND_AL,ARM_VFP_COPROC_DOUBLE,1,1,(freg),(reg)))
+
+#define ARM_FMXR(p,freg,reg)   \
+       ARM_EMIT((p), 
ARM_DEF_VFP_CPT(ARMCOND_AL,ARM_VFP_COPROC_SINGLE,7,0,(freg),(reg)))
+#define ARM_FMRX(p,reg,freg)   \
+       ARM_EMIT((p), 
ARM_DEF_VFP_CPT(ARMCOND_AL,ARM_VFP_COPROC_SINGLE,7,1,(freg),(reg)))
+
+#endif /* __MONO_ARM_VFP_CODEGEN_H__ */
+

Added: trunk/mono/mono/arch/arm/arm_vfpmacros.h
===================================================================
--- trunk/mono/mono/arch/arm/arm_vfpmacros.h    2006-09-12 11:07:39 UTC (rev 
65294)
+++ trunk/mono/mono/arch/arm/arm_vfpmacros.h    2006-09-12 11:10:42 UTC (rev 
65295)
@@ -0,0 +1,299 @@
+/* Macros for VFP ops, auto-generated from template */
+
+
+/* dyadic */
+
+/* -- ADD -- */
+
+
+/* Fd := Fn ADD Fm */
+#define ARM_VFP_ADDD_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_DOUBLE,ARM_VFP_ADD,rd,rn,rm))
+#define ARM_VFP_ADDD(p, rd, rn, rm) \
+       ARM_VFP_ADDD_COND(p, rd, rn, rm, ARMCOND_AL)
+
+#define ARM_VFP_ADDS_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_SINGLE,ARM_VFP_ADD,rd,rn,rm))
+#define ARM_VFP_ADDS(p, rd, rn, rm) \
+       ARM_VFP_ADDS_COND(p, rd, rn, rm, ARMCOND_AL)
+
+
+/* -- SUB -- */
+
+
+/* Fd := Fn SUB Fm */
+#define ARM_VFP_SUBD_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_DOUBLE,ARM_VFP_SUB,rd,rn,rm))
+#define ARM_VFP_SUBD(p, rd, rn, rm) \
+       ARM_VFP_SUBD_COND(p, rd, rn, rm, ARMCOND_AL)
+
+#define ARM_VFP_SUBS_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_SINGLE,ARM_VFP_SUB,rd,rn,rm))
+#define ARM_VFP_SUBS(p, rd, rn, rm) \
+       ARM_VFP_SUBS_COND(p, rd, rn, rm, ARMCOND_AL)
+
+
+/* -- MUL -- */
+
+
+/* Fd := Fn MUL Fm */
+#define ARM_VFP_MULD_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_DOUBLE,ARM_VFP_MUL,rd,rn,rm))
+#define ARM_VFP_MULD(p, rd, rn, rm) \
+       ARM_VFP_MULD_COND(p, rd, rn, rm, ARMCOND_AL)
+
+#define ARM_VFP_MULS_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_SINGLE,ARM_VFP_MUL,rd,rn,rm))
+#define ARM_VFP_MULS(p, rd, rn, rm) \
+       ARM_VFP_MULS_COND(p, rd, rn, rm, ARMCOND_AL)
+
+
+/* -- NMUL -- */
+
+
+/* Fd := Fn NMUL Fm */
+#define ARM_VFP_NMULD_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_DOUBLE,ARM_VFP_NMUL,rd,rn,rm))
+#define ARM_VFP_NMULD(p, rd, rn, rm) \
+       ARM_VFP_NMULD_COND(p, rd, rn, rm, ARMCOND_AL)
+
+#define ARM_VFP_NMULS_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_SINGLE,ARM_VFP_NMUL,rd,rn,rm))
+#define ARM_VFP_NMULS(p, rd, rn, rm) \
+       ARM_VFP_NMULS_COND(p, rd, rn, rm, ARMCOND_AL)
+
+
+/* -- DIV -- */
+
+
+/* Fd := Fn DIV Fm */
+#define ARM_VFP_DIVD_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_DOUBLE,ARM_VFP_DIV,rd,rn,rm))
+#define ARM_VFP_DIVD(p, rd, rn, rm) \
+       ARM_VFP_DIVD_COND(p, rd, rn, rm, ARMCOND_AL)
+
+#define ARM_VFP_DIVS_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_SINGLE,ARM_VFP_DIV,rd,rn,rm))
+#define ARM_VFP_DIVS(p, rd, rn, rm) \
+       ARM_VFP_DIVS_COND(p, rd, rn, rm, ARMCOND_AL)
+
+
+
+/* monadic */
+
+/* -- CPY -- */
+
+
+/* Fd := CPY Fm */
+
+#define ARM_CPYD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_CPY,(dreg),(sreg)))
+#define ARM_CPYD(p,dreg,sreg)      ARM_CPYD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_CPYS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_CPY,(dreg),(sreg)))
+#define ARM_CPYS(p,dreg,sreg)      ARM_CPYS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- ABS -- */
+
+
+/* Fd := ABS Fm */
+
+#define ARM_ABSD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_ABS,(dreg),(sreg)))
+#define ARM_ABSD(p,dreg,sreg)      ARM_ABSD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_ABSS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_ABS,(dreg),(sreg)))
+#define ARM_ABSS(p,dreg,sreg)      ARM_ABSS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- NEG -- */
+
+
+/* Fd := NEG Fm */
+
+#define ARM_NEGD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_NEG,(dreg),(sreg)))
+#define ARM_NEGD(p,dreg,sreg)      ARM_NEGD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_NEGS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_NEG,(dreg),(sreg)))
+#define ARM_NEGS(p,dreg,sreg)      ARM_NEGS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- SQRT -- */
+
+
+/* Fd := SQRT Fm */
+
+#define ARM_SQRTD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_SQRT,(dreg),(sreg)))
+#define ARM_SQRTD(p,dreg,sreg)      ARM_SQRTD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_SQRTS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_SQRT,(dreg),(sreg)))
+#define ARM_SQRTS(p,dreg,sreg)      ARM_SQRTS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- CMP -- */
+
+
+/* Fd := CMP Fm */
+
+#define ARM_CMPD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_CMP,(dreg),(sreg)))
+#define ARM_CMPD(p,dreg,sreg)      ARM_CMPD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_CMPS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_CMP,(dreg),(sreg)))
+#define ARM_CMPS(p,dreg,sreg)      ARM_CMPS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- CMPE -- */
+
+
+/* Fd := CMPE Fm */
+
+#define ARM_CMPED_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_CMPE,(dreg),(sreg)))
+#define ARM_CMPED(p,dreg,sreg)      ARM_CMPED_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_CMPES_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_CMPE,(dreg),(sreg)))
+#define ARM_CMPES(p,dreg,sreg)      ARM_CMPES_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- CMPZ -- */
+
+
+/* Fd := CMPZ Fm */
+
+#define ARM_CMPZD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_CMPZ,(dreg),(sreg)))
+#define ARM_CMPZD(p,dreg,sreg)      ARM_CMPZD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_CMPZS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_CMPZ,(dreg),(sreg)))
+#define ARM_CMPZS(p,dreg,sreg)      ARM_CMPZS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- CMPEZ -- */
+
+
+/* Fd := CMPEZ Fm */
+
+#define ARM_CMPEZD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_CMPEZ,(dreg),(sreg)))
+#define ARM_CMPEZD(p,dreg,sreg)      ARM_CMPEZD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_CMPEZS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_CMPEZ,(dreg),(sreg)))
+#define ARM_CMPEZS(p,dreg,sreg)      ARM_CMPEZS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- CVT -- */
+
+
+/* Fd := CVT Fm */
+
+#define ARM_CVTD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_CVT,(dreg),(sreg)))
+#define ARM_CVTD(p,dreg,sreg)      ARM_CVTD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_CVTS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_CVT,(dreg),(sreg)))
+#define ARM_CVTS(p,dreg,sreg)      ARM_CVTS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- UITO -- */
+
+
+/* Fd := UITO Fm */
+
+#define ARM_UITOD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_UITO,(dreg),(sreg)))
+#define ARM_UITOD(p,dreg,sreg)      ARM_UITOD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_UITOS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_UITO,(dreg),(sreg)))
+#define ARM_UITOS(p,dreg,sreg)      ARM_UITOS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- SITO -- */
+
+
+/* Fd := SITO Fm */
+
+#define ARM_SITOD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_SITO,(dreg),(sreg)))
+#define ARM_SITOD(p,dreg,sreg)      ARM_SITOD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_SITOS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_SITO,(dreg),(sreg)))
+#define ARM_SITOS(p,dreg,sreg)      ARM_SITOS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- TOUI -- */
+
+
+/* Fd := TOUI Fm */
+
+#define ARM_TOUID_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_TOUI,(dreg),(sreg)))
+#define ARM_TOUID(p,dreg,sreg)      ARM_TOUID_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_TOUIS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_TOUI,(dreg),(sreg)))
+#define ARM_TOUIS(p,dreg,sreg)      ARM_TOUIS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- TOSI -- */
+
+
+/* Fd := TOSI Fm */
+
+#define ARM_TOSID_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_TOSI,(dreg),(sreg)))
+#define ARM_TOSID(p,dreg,sreg)      ARM_TOSID_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_TOSIS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_TOSI,(dreg),(sreg)))
+#define ARM_TOSIS(p,dreg,sreg)      ARM_TOSIS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- TOUIZ -- */
+
+
+/* Fd := TOUIZ Fm */
+
+#define ARM_TOUIZD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_TOUIZ,(dreg),(sreg)))
+#define ARM_TOUIZD(p,dreg,sreg)      ARM_TOUIZD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_TOUIZS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_TOUIZ,(dreg),(sreg)))
+#define ARM_TOUIZS(p,dreg,sreg)      ARM_TOUIZS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+/* -- TOSIZ -- */
+
+
+/* Fd := TOSIZ Fm */
+
+#define ARM_TOSIZD_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_TOSIZ,(dreg),(sreg)))
+#define ARM_TOSIZD(p,dreg,sreg)      ARM_TOSIZD_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_TOSIZS_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_TOSIZ,(dreg),(sreg)))
+#define ARM_TOSIZS(p,dreg,sreg)      ARM_TOSIZS_COND(p,dreg,sreg,ARMCOND_AL)
+
+
+
+
+
+
+/* end generated */
+

Modified: trunk/mono/mono/arch/arm/fpaops.sh
===================================================================
--- trunk/mono/mono/arch/arm/fpaops.sh  2006-09-12 11:07:39 UTC (rev 65294)
+++ trunk/mono/mono/arch/arm/fpaops.sh  2006-09-12 11:10:42 UTC (rev 65295)
@@ -19,6 +19,6 @@
 echo -e "\n/* monadic */\n"
 gen "$MONADIC" fpam_macros
 
-echo -e "\n\n" >> $OUTFILE
+echo -e "\n\n"
 
 echo -e "\n/* end generated */\n"

Added: trunk/mono/mono/arch/arm/vfp_macros.th
===================================================================
--- trunk/mono/mono/arch/arm/vfp_macros.th      2006-09-12 11:07:39 UTC (rev 
65294)
+++ trunk/mono/mono/arch/arm/vfp_macros.th      2006-09-12 11:10:42 UTC (rev 
65295)
@@ -0,0 +1,15 @@
+/* -- <Op> -- */
+
+
+/* Fd := Fn <Op> Fm */
+#define ARM_VFP_<Op>D_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_DOUBLE,ARM_VFP_<Op>,rd,rn,rm))
+#define ARM_VFP_<Op>D(p, rd, rn, rm) \
+       ARM_VFP_<Op>D_COND(p, rd, rn, rm, ARMCOND_AL)
+
+#define ARM_VFP_<Op>S_COND(p, rd, rn, rm, cond) \
+       ARM_EMIT((p), 
ARM_DEF_VFP_DYADIC(cond,ARM_VFP_COPROC_SINGLE,ARM_VFP_<Op>,rd,rn,rm))
+#define ARM_VFP_<Op>S(p, rd, rn, rm) \
+       ARM_VFP_<Op>S_COND(p, rd, rn, rm, ARMCOND_AL)
+
+

Added: trunk/mono/mono/arch/arm/vfpm_macros.th
===================================================================
--- trunk/mono/mono/arch/arm/vfpm_macros.th     2006-09-12 11:07:39 UTC (rev 
65294)
+++ trunk/mono/mono/arch/arm/vfpm_macros.th     2006-09-12 11:10:42 UTC (rev 
65295)
@@ -0,0 +1,14 @@
+/* -- <Op> -- */
+
+
+/* Fd := <Op> Fm */
+
+#define ARM_<Op>D_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_DOUBLE,ARM_VFP_<Op>,(dreg),(sreg)))
+#define ARM_<Op>D(p,dreg,sreg)      ARM_<Op>D_COND(p,dreg,sreg,ARMCOND_AL)
+
+#define ARM_<Op>S_COND(p,dreg,sreg,cond) \
+        ARM_EMIT((p), 
ARM_DEF_VFP_MONADIC((cond),ARM_VFP_COPROC_SINGLE,ARM_VFP_<Op>,(dreg),(sreg)))
+#define ARM_<Op>S(p,dreg,sreg)      ARM_<Op>S_COND(p,dreg,sreg,ARMCOND_AL)
+
+

Added: trunk/mono/mono/arch/arm/vfpops.sh
===================================================================
--- trunk/mono/mono/arch/arm/vfpops.sh  2006-09-12 11:07:39 UTC (rev 65294)
+++ trunk/mono/mono/arch/arm/vfpops.sh  2006-09-12 11:10:42 UTC (rev 65295)
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+DYADIC="ADD SUB MUL NMUL DIV"
+MONADIC="CPY ABS NEG SQRT CMP CMPE CMPZ CMPEZ CVT UITO SITO TOUI TOSI TOUIZ 
TOSIZ"
+
+# $1: opcode list
+# $2: template
+function gen() {
+       for i in $1; do
+               sed "s/<Op>/$i/g" $2.th
+       done
+}
+
+echo -e "/* Macros for VFP ops, auto-generated from template */\n"
+
+echo -e "\n/* dyadic */\n"
+gen "$DYADIC" vfp_macros
+
+echo -e "\n/* monadic */\n"
+gen "$MONADIC" vfpm_macros
+
+echo -e "\n\n"
+
+echo -e "\n/* end generated */\n"


Property changes on: trunk/mono/mono/arch/arm/vfpops.sh
___________________________________________________________________
Name: svn:executable
   + *

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

Reply via email to