Merge pull request #899 from UCIS/patch-4

[mono.git] / mono / mini / mini-arm.h

diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h
index 44282055df6cf9b48b05ec3f5a842fcd00b75062..b57b77b5350fc91a1711867c726f318fcb541e94 100644 (file)
--- a/mono/mini/mini-arm.h
+++ b/mono/mini/mini-arm.h
@@ -52,7 +52,6 @@
 #endif
 
 #define MONO_MAX_IREGS 16
-#define MONO_MAX_FREGS 32
 
 #define MONO_SAVED_GREGS 10 /* r4-r11, ip, lr */
 
@@ -77,6 +76,8 @@
 
 #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.
@@ -84,7 +85,9 @@
 #define MONO_ARCH_CALLEE_FREGS 0x00005555
 #define MONO_ARCH_CALLEE_SAVED_FREGS 0x55550000
 #else
-#define MONO_SAVED_FREGS 0
+#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.
@@ -254,7 +257,6 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_HAVE_GENERAL_RGCTX_LAZY_FETCH_TRAMPOLINE 1
 #define MONO_ARCH_HAVE_OPCODE_NEEDS_EMULATION 1
 #define MONO_ARCH_HAVE_OBJC_GET_SELECTOR 1
-#define MONO_ARCH_HAVE_CARD_TABLE_WBARRIER_IN_AOT 1
 
 #if defined(__native_client__)
 #undef MONO_ARCH_SOFT_DEBUG_SUPPORTED