[jit] Merge regalloc.c into mini-codegen.c.

diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
index 55abb6ee5e375ceb5e8f55f0cd793f71bfc0c8a3..74947390964043355d4b6c9bb16eeeef3f54516c 100755 (executable)
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -388,7 +388,6 @@ common_sources = \
        mini-arch.h             \
        dominators.c            \
        cfold.c                 \
-       regalloc.c              \
        regalloc.h              \
        helpers.c               \
        liveness.c              \

diff --git a/mono/mini/mini-codegen.c b/mono/mini/mini-codegen.c
index 982055dabd1e2cc19839b9921a6e8cd3e6cda9c4..e1914885b60d9622b911459bfb7dba53d8284e75 100644 (file)
--- a/mono/mini/mini-codegen.c
+++ b/mono/mini/mini-codegen.c
@@ -2773,4 +2773,23 @@ mini_type_is_hfa (MonoType *t, int *out_nfields, int *out_esize)
        return TRUE;
 }
 
+MonoRegState*
+mono_regstate_new (void)
+{
+       MonoRegState* rs = g_new0 (MonoRegState, 1);
+
+       rs->next_vreg = MAX (MONO_MAX_IREGS, MONO_MAX_FREGS);
+#ifdef MONO_ARCH_NEED_SIMD_BANK
+       rs->next_vreg = MAX (rs->next_vreg, MONO_MAX_XREGS);
+#endif
+
+       return rs;
+}
+
+void
+mono_regstate_free (MonoRegState *rs) {
+       g_free (rs->vassign);
+       g_free (rs);
+}
+
 #endif /* DISABLE_JIT */

diff --git a/mono/mini/regalloc.c b/mono/mini/regalloc.c
deleted file mode 100644 (file)
index 4f39872..0000000
--- a/mono/mini/regalloc.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * regalloc.c: register state class
- *
- * Authors:
- *    Paolo Molaro (lupus@ximian.com)
- *
- * (C) 2003 Ximian, Inc.
- */
-#include "mini.h"
-
-MonoRegState*
-mono_regstate_new (void)
-{
-       MonoRegState* rs = g_new0 (MonoRegState, 1);
-
-       rs->next_vreg = MAX (MONO_MAX_IREGS, MONO_MAX_FREGS);
-#ifdef MONO_ARCH_NEED_SIMD_BANK
-       rs->next_vreg = MAX (rs->next_vreg, MONO_MAX_XREGS);
-#endif
-
-       return rs;
-}
-
-void
-mono_regstate_free (MonoRegState *rs) {
-       g_free (rs->vassign);
-       g_free (rs);
-}