2009-05-28 Zoltan Varga <vargaz@gmail.com>

	* object-internals.h (MonoRuntimeCallbacks): New structure containing
	callbacks supplied by the runtime.

	* object.c (mono_install_callbacks): New internal function to install
	the callbacks.

	* object.c (mono_create_ftnptr): Move the implementation of this to
	mini/.

	* object.c (mono_get_addr_from_ftnptr): Ditto.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 9b76ab37a5d8e97d4fc0bbbf885f68b503a68568..6b2b294d30ea14b37fd924b8df100d02810d7885 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,16 @@
+2009-05-28  Zoltan Varga  <vargaz@gmail.com>
+
+       * object-internals.h (MonoRuntimeCallbacks): New structure containing
+       callbacks supplied by the runtime.
+
+       * object.c (mono_install_callbacks): New internal function to install
+       the callbacks.
+
+       * object.c (mono_create_ftnptr): Move the implementation of this to
+       mini/.
+
+       * object.c (mono_get_addr_from_ftnptr): Ditto.  
+
 2009-05-27 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * metadata-verify.c (parse_return_type): Proper byref check.

diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h
index e1710dfedc6094b0be1ff548677f1df9765caa39..300a7fa884e54a05964cb7d83bf5ec819af60251 100644 (file)
--- a/mono/metadata/object-internals.h
+++ b/mono/metadata/object-internals.h
@@ -499,6 +499,16 @@ typedef struct {
        guint32 intType;
 } MonoInterfaceTypeAttribute;
 
+/* 
+ * Callbacks supplied by the runtime and called by the modules in metadata/
+ * This interface is easier to extend than adding a new function type +
+ * a new 'install' function for every callback.
+ */
+typedef struct {
+       gpointer (*create_ftnptr) (MonoDomain *domain, gpointer addr);
+       gpointer (*get_addr_from_ftnptr) (gpointer descr);
+} MonoRuntimeCallbacks;
+
 /* used to free a dynamic method */
 typedef void        (*MonoFreeMethodFunc)       (MonoDomain *domain, MonoMethod *method);
 
@@ -565,6 +575,9 @@ mono_install_compile_method (MonoCompileFunc func) MONO_INTERNAL;
 void
 mono_install_free_method    (MonoFreeMethodFunc func) MONO_INTERNAL;
 
+void
+mono_install_callbacks      (MonoRuntimeCallbacks *cbs) MONO_INTERNAL;
+
 void
 mono_type_initialization_init (void) MONO_INTERNAL;
 

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 3ffb76005e24404b5d3d81a4919a57f750313e0a..33f261b513a938faeb9cb7f9e59b1d85212243de 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -141,6 +141,9 @@ static GHashTable *blocked_thread_hash;
 /* Main thread */
 static MonoThread *main_thread;
 
+/* Functions supplied by the runtime */
+static MonoRuntimeCallbacks callbacks;
+
 /**
  * mono_thread_set_main:
  * @thread: thread to set as the main thread
@@ -473,6 +476,12 @@ static MonoImtThunkBuilder imt_thunk_builder = NULL;
 #error "MONO_IMT_SIZE cannot be larger than 32"
 #endif
 
+void
+mono_install_callbacks (MonoRuntimeCallbacks *cbs)
+{
+       memcpy (&callbacks, cbs, sizeof (*cbs));
+}
+
 void
 mono_install_trampoline (MonoTrampoline func) 
 {
@@ -5704,49 +5713,24 @@ mono_store_remote_field_new (MonoObject *this, MonoClass *klass, MonoClassField
  * mono_create_ftnptr:
  *
  *   Given a function address, create a function descriptor for it.
- * This is only needed on IA64 and PPC64.
+ * This is only needed on some platforms.
  */
 gpointer
 mono_create_ftnptr (MonoDomain *domain, gpointer addr)
 {
-#ifdef __ia64__
-       gpointer *desc;
-
-       desc = mono_domain_code_reserve (domain, 2 * sizeof (gpointer));
-
-       desc [0] = addr;
-       desc [1] = NULL;
-
-       return desc;
-#elif defined(__ppc64__) || defined(__powerpc64__)
-       gpointer *desc;
-
-       desc = mono_domain_alloc0 (domain, 3 * sizeof (gpointer));
-
-       desc [0] = addr;
-       desc [1] = NULL;
-       desc [2] = NULL;
-
-       return desc;
-#else
-       return addr;
-#endif
+       return callbacks.create_ftnptr (domain, addr);
 }
 
 /*
  * mono_get_addr_from_ftnptr:
  *
  *   Given a pointer to a function descriptor, return the function address.
- * This is only needed on IA64 and PPC64.
+ * This is only needed on some platforms.
  */
 gpointer
 mono_get_addr_from_ftnptr (gpointer descr)
 {
-#if defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__)
-       return *(gpointer*)descr;
-#else
-       return descr;
-#endif
+       return callbacks.get_addr_from_ftnptr (descr);
 }      
 
 #if 0