2003-12-19 Bernie Solomon <bernard@ugsolutions.com>

	* embed.h, main.c: new files to enable embedding
	the interpreter

        * interp.c: make main callable from main.c
	rearrange main for embedding

	* Makefile.am: changes now most code is in a library

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

diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index f71bc794f9503a8a98047b00e9944c083f4835b0..1a8c71c2c405a6f0c1173464a0d1736d2ee848c8 100644 (file)
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,3 +1,13 @@
+2003-12-19  Bernie Solomon  <bernard@ugsolutions.com>
+
+       * embed.h, main.c: new files to enable embedding
+       the interpreter
+
+        * interp.c: make main callable from main.c
+       rearrange main for embedding
+
+       * Makefile.am: changes now most code is in a library
+
 2003-11-21  Lluis Sanchez Gual <lluis@ximian.com>
 
        * interp.c: Added support for context static fields.

diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index 0b34c78088e983448b6fd4dd36cfb35b9aeb31e3..c6301137b6c2b4699718af0a51573e25d6a37f8a 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -13,12 +13,25 @@ endif
 
 bin_PROGRAMS = mint
 
+lib_LTLIBRARIES = libmint.la
+
 mint_SOURCES =         \
+       main.c
+
+mint_LDADD =           \
+       libmint.la
+
+libmint_la_SOURCES =   \
        hacks.h         \
        interp.h        \
        interp.c        
 
-mint_LDADD =                           \
+libmintincludedir = $(includedir)/mono/interpreter
+
+libmintinclude_HEADERS =       \
+       embed.h
+
+libmint_la_LIBADD =                            \
        ../arch/libmonoarch.la          \
        ../metadata/libmonoruntime.la   \
        ../metadata/libmetadata.la      \

diff --git a/mono/interpreter/embed.h b/mono/interpreter/embed.h
new file mode 100644 (file)
index 0000000..b3a5449
--- /dev/null
+++ b/mono/interpreter/embed.h
@@ -0,0 +1,15 @@
+#include <mono/metadata/object.h>
+#include <mono/metadata/appdomain.h>
+
+int
+mono_main (int argc, char* argv[]);
+
+MonoDomain *
+mono_interp_init(const char *file);
+
+int
+mono_interp_exec(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]);
+
+void        
+mono_interp_cleanup(MonoDomain *domain);
+

diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index fcb75865f3475af3247f67a7c4a7601ddddfafb9..6ca1eeeec37bc37478b10f89befb0557fc3a6e22 100644 (file)
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -61,6 +61,7 @@
 
 /*#include <mono/cli/types.h>*/
 #include "interp.h"
+#include "embed.h"
 #include "hacks.h"
 
 /* Mingw 2.1 doesnt need this any more, but leave it in for now for older versions */
@@ -5049,14 +5050,67 @@ quit_function (MonoDomain *domain, gpointer user_data)
 
 }
 
+void
+mono_interp_cleanup(MonoDomain *domain)
+{
+    quit_function (domain, NULL);
+}
+
+int
+mono_interp_exec(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[])
+{
+    return ves_exec (domain, assembly, argc, argv);
+}
+
+MonoDomain *
+mono_interp_init(const char *file)
+{
+       MonoDomain *domain;
+
+       g_set_prgname (file);
+       mono_set_rootdir ();
+       
+       g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
+       g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR);
+
+       g_thread_init (NULL);
+
+       thread_context_id = TlsAlloc ();
+       TlsSetValue (thread_context_id, NULL);
+       InitializeCriticalSection(&calc_section);
+       InitializeCriticalSection(&create_method_pointer_mutex);
+
+       mono_install_compile_method (mono_create_method_pointer);
+       mono_install_runtime_invoke (interp_mono_runtime_invoke);
+       mono_install_remoting_trampoline (interp_create_remoting_trampoline);
+
+       mono_install_handler (interp_ex_handler);
+       mono_install_stack_walk (interp_walk_stack);
+       mono_runtime_install_cleanup (quit_function);
+
+       domain = mono_init (file);
+#ifdef __hpux /* generates very big stack frames */
+       mono_threads_set_default_stacksize(32*1024*1024);
+#endif
+       mono_init_icall ();
+       mono_add_internal_call ("System.Diagnostics.StackFrame::get_frame_info", ves_icall_get_frame_info);
+       mono_add_internal_call ("System.Diagnostics.StackTrace::get_trace", ves_icall_get_trace);
+       mono_add_internal_call ("Mono.Runtime::mono_runtime_install_handlers", mono_runtime_install_handlers);
+
+       mono_runtime_init (domain, NULL, NULL);
+
+       return domain;
+}
+
 int 
-main (int argc, char *argv [])
+mono_main (int argc, char *argv [])
 {
        MonoDomain *domain;
        int retval = 0, i, ocount = 0;
        char *file, *config_file = NULL;
        int enable_debugging = FALSE;
        MainThreadArgs main_args;
+       const char *error;
        
        if (argc < 2)
                usage ();
@@ -5102,38 +5156,21 @@ main (int argc, char *argv [])
        if (!file)
                usage ();
 
-       g_set_prgname (file);
-       mono_set_rootdir ();
-       
-       g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
-       g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR);
-
-       g_thread_init (NULL);
-
-       thread_context_id = TlsAlloc ();
-       TlsSetValue (thread_context_id, NULL);
-       InitializeCriticalSection(&calc_section);
-       InitializeCriticalSection(&create_method_pointer_mutex);
-
-       mono_install_compile_method (mono_create_method_pointer);
-       mono_install_runtime_invoke (interp_mono_runtime_invoke);
-       mono_install_remoting_trampoline (interp_create_remoting_trampoline);
-
-       mono_install_handler (interp_ex_handler);
-       mono_install_stack_walk (interp_walk_stack);
-       mono_runtime_install_cleanup (quit_function);
-
-       domain = mono_init (file);
-#ifdef __hpux /* generates very big stack frames */
-       mono_threads_set_default_stacksize(32*1024*1024);
-#endif
+       domain = mono_interp_init(file);
        mono_config_parse (config_file);
-       mono_init_icall ();
-       mono_add_internal_call ("System.Diagnostics.StackFrame::get_frame_info", ves_icall_get_frame_info);
-       mono_add_internal_call ("System.Diagnostics.StackTrace::get_trace", ves_icall_get_trace);
-       mono_add_internal_call ("Mono.Runtime::mono_runtime_install_handlers", mono_runtime_install_handlers);
 
-       mono_runtime_init (domain, NULL, NULL);
+       error = mono_verify_corlib ();
+       if (error) {
+               fprintf (stderr, "Corlib not in sync with this runtime: %s\n", error);
+               exit (1);
+       }
+
+       error = mono_check_corlib_version ();
+       if (error) {
+               fprintf (stderr, "Corlib not in sync with this runtime: %s\n", error);
+               fprintf (stderr, "Download a newer corlib at http://go-mono/daily.\n");
+               exit (1);
+       }
 
        main_args.domain=domain;
        main_args.file=file;

diff --git a/mono/interpreter/main.c b/mono/interpreter/main.c
new file mode 100644 (file)
index 0000000..70b5d96
--- /dev/null
+++ b/mono/interpreter/main.c
@@ -0,0 +1,9 @@
+#include "interp.h"
+#include "embed.h"
+
+int
+main (int argc, char* argv[])
+{
+       return mono_main (argc, argv);
+}
+