Fri Mar 29 16:09:54 CET 2002 Paolo Molaro <lupus@ximian.com>

[mono.git] / mono / metadata / loader.h

diff --git a/mono/metadata/loader.h b/mono/metadata/loader.h
index 1f4e2dc2f10541e5820cd7088a89eb5aea3febe3..1e0b2fd2ba7c086fa41f88270a8f1cd67e5af369 100644 (file)
--- a/mono/metadata/loader.h
+++ b/mono/metadata/loader.h
@@ -1,16 +1,18 @@
 #ifndef _MONO_METADATA_LOADER_H_
 #define _MONO_METADATA_LOADER_H_ 1
 
-#include <ffi.h>
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/image.h>
 
 typedef struct {
        guint16 flags;  /* method flags */
        guint16 iflags; /* method implementation flags */
-       MonoImage *image;
+       MonoClass *klass;
        MonoMethodSignature *signature;
        gpointer addr;
+       gpointer info; /* runtime info */
+       gpointer remoting_tramp; 
+       gint slot;
        /* name is useful mostly for debugging */
        const char *name; 
 } MonoMethod;
@@ -23,31 +25,55 @@ typedef struct {
 typedef struct {
        MonoMethod method;
        guint16 piflags;  /* pinvoke flags */
-       ffi_cif *cif;
+       void  (*code) (void);
 } MonoMethodPInvoke;
 
 typedef struct {
        MonoImage *corlib;
-       guint32    array_token;
-       guint32    string_token;
-       guint32    char_token;
+       MonoClass *object_class;
+       MonoClass *byte_class;
+       MonoClass *void_class;
+       MonoClass *boolean_class;
+       MonoClass *sbyte_class;
+       MonoClass *int16_class;
+       MonoClass *uint16_class;
+       MonoClass *int32_class;
+       MonoClass *uint32_class;
+       MonoClass *int_class;
+       MonoClass *uint_class;
+       MonoClass *int64_class;
+       MonoClass *uint64_class;
+       MonoClass *single_class;
+       MonoClass *double_class;
+       MonoClass *char_class;
+       MonoClass *string_class;
+       MonoClass *enum_class;
+       MonoClass *array_class;
+       MonoClass *multicastdelegate_class;
+       MonoClass *asyncresult_class;
+       MonoClass *waithandle_class;
+       MonoClass *typehandle_class;
+       MonoClass *fieldhandle_class;
+       MonoClass *methodhandle_class;
+       MonoClass *monotype_class;
+       MonoClass *exception_class;
+       MonoClass *thread_class;
+       MonoClass *transparent_proxy_class;
+       MonoClass *real_proxy_class;
+       MonoClass *mono_method_message_class;
 } MonoDefaults;
 
 extern MonoDefaults mono_defaults;
 
-void
-mono_init                  (void);
+void 
+mono_init_icall            (void);
 
 MonoMethod *
-mono_get_method            (MonoImage *image, guint32 token);
+mono_get_method            (MonoImage *image, guint32 token, MonoClass *klass);
 
 void               
 mono_free_method           (MonoMethod *method);
 
-guint32            
-mono_typedef_from_name     (MonoImage *image, const char *name, 
-                           const char *nspace, guint32 *mlist);
-
 MonoImage *
 mono_load_image            (const char *fname, enum MonoImageOpenStatus *status);
 
@@ -57,4 +83,7 @@ mono_add_internal_call     (const char *name, gpointer method);
 gpointer
 mono_lookup_internal_call  (const char *name);
 
+void
+mono_method_get_param_names (MonoMethod *method, const char **names);
+
 #endif