This commit was manufactured by cvs2svn to create branch 'mono-1-0'.

[mono.git] / mono / metadata / opcodes.c

diff --git a/mono/metadata/opcodes.c b/mono/metadata/opcodes.c
index f8b430234727715fce4e60022f9aa18f24cffd21..b9b3b540f829d1577325b257e17fee4ce31df831 100644 (file)
--- a/mono/metadata/opcodes.c
+++ b/mono/metadata/opcodes.c
@@ -8,10 +8,9 @@
  */
 #include <mono/metadata/opcodes.h>
 #include <stddef.h> /* for NULL */
-#include <config.h>
 
 #define MONO_PREFIX1_OFFSET MONO_CEE_ARGLIST
-#define MONO_CUSTOM_PREFIX_OFFSET MONO_CEE_MONO_ICALL
+#define MONO_CUSTOM_PREFIX_OFFSET MONO_CEE_MONO_FUNC1
 
 #define OPDEF(a,b,c,d,e,f,g,h,i,j) \
        { Mono ## e, MONO_FLOW_ ## j, MONO_ ## a },
@@ -24,46 +23,14 @@ mono_opcodes [MONO_CEE_LAST + 1] = {
 
 #undef OPDEF
 
-#ifdef HAVE_ARRAY_ELEM_INIT
-#define MSGSTRFIELD(line) MSGSTRFIELD1(line)
-#define MSGSTRFIELD1(line) str##line
-static const struct msgstr_t {
-#define OPDEF(a,b,c,d,e,f,g,h,i,j) char MSGSTRFIELD(__LINE__) [sizeof (b)];
-#include "mono/cil/opcode.def"
-#undef OPDEF
-} opstr = {
 #define OPDEF(a,b,c,d,e,f,g,h,i,j) b,
-#include "mono/cil/opcode.def"
-#undef OPDEF
-};
-static const gint16 opidx [] = {
-#define OPDEF(a,b,c,d,e,f,g,h,i,j) [MONO_ ## a] = offsetof (struct msgstr_t, MSGSTRFIELD(__LINE__)),
-#include "mono/cil/opcode.def"
-#undef OPDEF
-};
 
-const char*
-mono_opcode_name (int opcode)
-{
-       return (const char*)&opstr + opidx [opcode];
-}
-
-#else
-#define OPDEF(a,b,c,d,e,f,g,h,i,j) b,
-static const char* const
+const char* const
 mono_opcode_names [MONO_CEE_LAST + 1] = {
 #include "mono/cil/opcode.def"
        NULL
 };
 
-const char*
-mono_opcode_name (int opcode)
-{
-       return mono_opcode_names [opcode];
-}
-
-#endif
-
 MonoOpcodeEnum
 mono_opcode_value (const guint8 **ip, const guint8 *end)
 {