2008-02-18 Zoltan Varga <vargaz@gmail.com>

	* genmdesc.c: Error out if the .md contains CEE_ opcodes if
	MONO_ARCH_ENABLE_NORMALIZE_OPCODES is defined.

	* cpu-amd64.md: Remove some unused opcodes.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index d0060a0dfa1f5fc93ad3b47e22a02a1336fa6589..9f68b238f286f59e3875a150c321361763ce46ae 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-18  Zoltan Varga  <vargaz@gmail.com>
 
+       * genmdesc.c: Error out if the .md contains CEE_ opcodes if 
+       MONO_ARCH_ENABLE_NORMALIZE_OPCODES is defined.
+
+       * cpu-amd64.md: Remove some unused opcodes.
+
        * mini.h mini-ops.h mini.c: Define the OP_Ccc opcodes in mini-ops.h normally
        like the other opcodes.
 

diff --git a/mono/mini/cpu-amd64.md b/mono/mini/cpu-amd64.md
index ef81e64a087bb9323e86b4bebbf12e61cf7af2ba..3b3c1ba479ea602dc06d28f95457e260d5634d0a 100644 (file)
--- a/mono/mini/cpu-amd64.md
+++ b/mono/mini/cpu-amd64.md
@@ -98,9 +98,6 @@ start_handler: len:9
 endfinally: len:9
 endfilter: src1:a len:9
 ckfinite: dest:f src1:f len:43
-mul.ovf: dest:i src1:i src2:i clob:1 len:10
-# this opcode is handled specially in the code generator
-mul.ovf.un: dest:i src1:i src2:i len:18
 ceq: dest:c len:8
 cgt: dest:c len:8
 cgt.un: dest:c len:8

diff --git a/mono/mini/genmdesc.c b/mono/mini/genmdesc.c
index f0ec807d6b39c02960e70cff9107b2eabcaafad5..fc6140b13fd6589292ff1f3cfa1f37d6c66a65d6 100644 (file)
--- a/mono/mini/genmdesc.c
+++ b/mono/mini/genmdesc.c
@@ -119,12 +119,14 @@ init_table (void) {
        table = g_hash_table_new (g_str_hash, g_str_equal);
 
        opcodes = g_new0 (OpDesc, OP_LAST);
+#ifndef MONO_ARCH_ENABLE_NORMALIZE_OPCODES
        for (i = 0; i < MONO_CEE_LAST; ++i) {
                desc = opcodes + i;
                desc->num = i;
                desc->name = mono_inst_name (i);
                g_hash_table_insert (table, (char *)desc->name, desc);
        }
+#endif
        for (i = OP_LOAD; i < OP_LAST; ++i) {
                desc = opcodes + i;
                desc->num = i;