diff options
Diffstat (limited to 'mono/mini/mini-arm.h')
| -rw-r--r-- | mono/mini/mini-arm.h | 45 |
1 files changed, 37 insertions, 8 deletions
diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h index 93a256b563..9fcd6545d2 100644 --- a/mono/mini/mini-arm.h +++ b/mono/mini/mini-arm.h @@ -19,10 +19,6 @@ #define MONO_ARCH_SOFT_FLOAT_FALLBACK 1 #endif -#ifdef ARM_FPU_VFP_HARD -#error "hardfp-abi not yet supported." -#endif - #if defined(__ARM_EABI__) #if G_BYTE_ORDER == G_LITTLE_ENDIAN #define ARM_ARCHITECTURE "armel" @@ -56,10 +52,8 @@ #endif #define MONO_MAX_IREGS 16 -#define MONO_MAX_FREGS 16 #define MONO_SAVED_GREGS 10 /* r4-r11, ip, lr */ -#define MONO_SAVED_FREGS 8 /* r4-r11, ip, lr: registers saved in the LMF */ #define MONO_ARM_REGSAVE_MASK 0x5ff0 @@ -71,9 +65,36 @@ #define MONO_ARCH_CALLEE_REGS ((1<<ARMREG_R0) | (1<<ARMREG_R1) | (1<<ARMREG_R2) | (1<<ARMREG_R3) | (1<<ARMREG_IP)) #define MONO_ARCH_CALLEE_SAVED_REGS ((1<<ARMREG_V1) | (1<<ARMREG_V2) | (1<<ARMREG_V3) | (1<<ARMREG_V4) | (1<<ARMREG_V5) | (1<<ARMREG_V6) | (1<<ARMREG_V7)) -/* Every double precision vfp register, d0/d1 is reserved for a scratch reg */ +/* + * TODO: Make use of VFP v3 registers d16-d31. + */ + +/* + * TODO: We can't use registers d8-d15 in hard float mode because the + * register allocator doesn't allocate floating point registers globally. + */ + +#if defined(ARM_FPU_VFP_HARD) +#define MONO_SAVED_FREGS 16 +#define MONO_MAX_FREGS 32 + +/* + * d8-d15 must be preserved across function calls. We use d14-d15 as + * scratch registers in the JIT. The rest have no meaning tied to them. + */ +#define MONO_ARCH_CALLEE_FREGS 0x00005555 +#define MONO_ARCH_CALLEE_SAVED_FREGS 0x55550000 +#else +#define MONO_SAVED_FREGS 8 +#define MONO_MAX_FREGS 16 + +/* + * No registers need to be preserved across function calls. We use d0-d1 + * as scratch registers in the JIT. The rest have no meaning tied to them. + */ #define MONO_ARCH_CALLEE_FREGS 0x55555550 -#define MONO_ARCH_CALLEE_SAVED_FREGS 0 +#define MONO_ARCH_CALLEE_SAVED_FREGS 0x00000000 +#endif #define MONO_ARCH_USE_FPSTACK FALSE #define MONO_ARCH_FPSTACK_SIZE 0 @@ -164,6 +185,10 @@ struct MonoLMF { mgreg_t sp; mgreg_t ip; mgreg_t fp; + /* Currently only used in trampolines on armhf to hold d0-d15. We don't really + * need to put d0-d7 in the LMF, but it simplifies the trampoline code. + */ + double fregs [16]; /* all but sp and pc: matches the PUSH instruction layout in the trampolines * 0-4 should be considered undefined (execpt in the magic tramp) * sp is saved at IP. @@ -177,6 +202,7 @@ typedef struct MonoCompileArch { gpointer seq_point_bp_method_var; gboolean omit_fp, omit_fp_computed; gpointer cinfo; + gpointer *vfp_scratch_slots [2]; } MonoCompileArch; #define MONO_ARCH_EMULATE_FCONV_TO_I8 1 @@ -291,4 +317,7 @@ guint8* mono_arm_load_jumptable_entry (guint8 *code, gpointer *jte, ARMReg reg) MONO_INTERNAL; #endif +gboolean +mono_arm_is_hard_float (void) MONO_INTERNAL; + #endif /* __MONO_MINI_ARM_H__ */ |