2006-08-02 Zoltan Varga <vargaz@gmail.com>

	* mini-arch.h Makefile.am mini-ops.h mini-codegen.c: More alpha updates.

svn path=/trunk/mono/; revision=63260

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index caaa11ff0e9f9162d33e4d32602bc3986b4b26e7..007ae5fbd83a54d639e69fa56b8febbbb306ab45 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-02  Zoltan Varga  <vargaz@gmail.com>
+
+       * mini-arch.h Makefile.am mini-ops.h mini-codegen.c: More alpha updates.
+
 2006-08-01  Zoltan Varga  <vargaz@gmail.com>
 
        * cpu-alpha.md inssel-alpha.brg mini-alpha.h mini-alpha.c exceptions-alpha.c tramp-alpha.c: More alpha port work from Sergey Tikhonov <tsv@solvo.ru>.

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 2693d64a2858da563b369207af55415bd096e38b..413313ae8aaa6c8ff480c42c88450138e66e0567 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -167,6 +167,14 @@ ia64_sources = \
        mini-codegen.c          \
        mini-trampolines.c
 
+alpha_sources = \
+       mini-alpha.c    \
+       mini-alpha.h    \
+       exceptions-alpha.c      \
+       tramp-alpha.c   \
+       mini-codegen.c  \
+       mini-trampolines.c
+
 common_sources = \
        mini.c          \
        mini.h          \
@@ -302,6 +310,14 @@ arch_BURGSRC = $(srcdir)/inssel-long.brg $(srcdir)/inssel-ia64.brg
 arch_built = cpu-ia64.h
 endif
 
+if ALPHA
+arch_sources = \
+       $(alpha_sources)
+
+arch_BURGSRC = $(srcdir)/inssel-long.brg $(srcdir)/inssel-alpha.brg
+arch_built = cpu-alpha.h
+endif
+
 libmono_la_SOURCES = $(common_sources) $(arch_sources)
 
 nodist_libmono_la_SOURCES = inssel.c inssel.h
@@ -345,6 +361,7 @@ cpu-sparc.h: cpu-sparc.md
 cpu-s390.h: cpu-s390.md
 cpu-s390x.h: cpu-s390x.md
 cpu-ia64.h: cpu-ia64.md
+cpu-alpha.h: cpu-alpha.md
 
 ## Gross hack.  Making 'genmdesc' a host binary takes more effort
 $(arch_built):
@@ -377,6 +394,9 @@ cpu-s390x.h: cpu-s390x.md genmdesc$(EXEEXT)
 cpu-ia64.h: cpu-ia64.md genmdesc$(EXEEXT)
        ./genmdesc $(srcdir)/cpu-ia64.md cpu-ia64.h ia64_desc
 
+cpu-alpha.h: cpu-alpha.md genmdesc$(EXEEXT)
+       ./genmdesc $(srcdir)/cpu-alpha.md cpu-alpha.h alpha_desc
+
 endif !CROSS_COMPILING
 
 inssel.c inssel.h: $(BURGSRC)
@@ -446,4 +466,5 @@ EXTRA_DIST = $(common_BURGSRC) cprop.c TestDriver.cs ldscript ldscript.mono \
        $(sparc_sources) inssel-sparc.brg cpu-sparc.md \
        $(s390_sources) inssel-s390.brg cpu-s390.md \
        $(s390x_sources) inssel-s390x.brg cpu-s390x.md \
-       $(ia64_sources) inssel-ia64.brg cpu-ia64.md
+       $(ia64_sources) inssel-ia64.brg cpu-ia64.md \
+       $(alpha_sources) inssel-alpha.brg cpu-alpha.md

diff --git a/mono/mini/mini-arch.h b/mono/mini/mini-arch.h
index 1cae428f6c1151c4ef45953b352457d08720265a..ad200b02fd0a2b78003eaf29fba25061dd486370 100644 (file)
--- a/mono/mini/mini-arch.h
+++ b/mono/mini/mini-arch.h
@@ -19,6 +19,8 @@
 #include "mini-ia64.h"
 #elif defined(__arm__)
 #include "mini-arm.h"
+#elif defined(__alpha__)
+#include "mini-alpha.h"
 #else
 #error add arch specific include file in mini-arch.h
 #endif

diff --git a/mono/mini/mini-codegen.c b/mono/mini/mini-codegen.c
index 42fef6132de82c84b74a43e34ce0129c7ed12d92..39575b6959783b33eceb181c0c8c13a046261d32 100644 (file)
--- a/mono/mini/mini-codegen.c
+++ b/mono/mini/mini-codegen.c
@@ -42,6 +42,9 @@ static const char*const * ins_spec = s390x_cpu_desc;
 #elif defined(__s390__)
 const char * const s390_cpu_desc [OP_LAST];
 static const char*const * ins_spec = s390_cpu_desc;
+#elif defined(__alpha__)
+const char * const alpha_desc [OP_LAST];
+static const char*const * ins_spec = alpha_desc;
 #else
 #error "Not implemented"
 #endif

diff --git a/mono/mini/mini-ops.h b/mono/mini/mini-ops.h
index d08400b8173f2fafb9a4721dcdd2e31ed4b79b5b..0bf3f4591907ce733f203fe2e00341f91352bb63 100644 (file)
--- a/mono/mini/mini-ops.h
+++ b/mono/mini/mini-ops.h
@@ -720,3 +720,19 @@ MINI_OP(OP_IA64_LOADR8_MEMBASE_INC,"ia64_loadr8_membase_inc")
 MINI_OP(OP_IA64_FETCHADD4_IMM,   "ia64_fetchadd4_imm")
 MINI_OP(OP_IA64_FETCHADD8_IMM,   "ia64_fetchadd8_imm")
 #endif
+
+#if defined(__alpha__)
+MINI_OP(OP_ALPHA_CMP_EQ, "alpha_cmp_eq")
+MINI_OP(OP_ALPHA_CMP_IMM_EQ, "alpha_cmp_imm_eq")
+MINI_OP(OP_ALPHA_CMP_ULT, "alpha_cmp_ult")
+MINI_OP(OP_ALPHA_CMP_IMM_ULT, "alpha_cmp_imm_ult")
+MINI_OP(OP_ALPHA_CMP_ULE, "alpha_cmp_ule")
+MINI_OP(OP_ALPHA_CMP_IMM_ULE, "alpha_cmp_imm_ule")
+MINI_OP(OP_ALPHA_CMP_LT, "alpha_cmp_lt")
+MINI_OP(OP_ALPHA_CMP_IMM_LT, "alpha_cmp_imm_lt")
+MINI_OP(OP_ALPHA_CMP_LE, "alpha_cmp_le")
+MINI_OP(OP_ALPHA_CMP_IMM_LE, "alpha_cmp_imm_le")
+
+MINI_OP(OP_ALPHA_CMPT_EQ, "alpha_cmpt_eq")
+#endif
+