From fca57eb71e68ac9d0558136b65fc7906b2b0edfb Mon Sep 17 00:00:00 2001 From: miguel Date: Fri, 22 May 2009 20:44:26 +0000 Subject: [PATCH] 2009-05-22 Miguel de Icaza * icall.c: Remove warnings. * mono-config.c: Allow for CONFIG_CPU to be set in config.h and prevent auto-detection based on GCC defines. Add PS3 * metadata-verify.c: Do not include signal.h * generic-sharing.c, marshal.c: Add returns to avoid some warning messages. Not sure why the g_assert_not_reached is not enough to quiet the compiler. * appdomain.c: Remove code that is not used when DISABLE_SHADOW_COPY is set. * image.c: use g_getenv git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@134615 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 21 +++++++++++++++++++++ mono/metadata/appdomain.c | 4 +++- mono/metadata/generic-sharing.c | 8 ++++++++ mono/metadata/icall.c | 8 ++++++-- mono/metadata/image.c | 2 +- mono/metadata/marshal.c | 2 ++ mono/metadata/metadata-verify.c | 2 +- mono/metadata/mono-config.c | 4 ++++ 8 files changed, 46 insertions(+), 5 deletions(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index ff56af20e..403fe6e15 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,24 @@ +2009-05-22 Miguel de Icaza + + * icall.c: Remove warnings. + + * mono-config.c: Allow for CONFIG_CPU to be set in config.h and + prevent auto-detection based on GCC defines. + + Add PS3 + + * metadata-verify.c: Do not include signal.h + + * generic-sharing.c, marshal.c: Add returns to avoid some warning + messages. Not sure why the g_assert_not_reached is not enough to + quiet the compiler. + + + * appdomain.c: Remove code that is not used when + DISABLE_SHADOW_COPY is set. + + * image.c: use g_getenv + 2009-05-21 Miguel de Icaza * reflection.c: Remove code that it not used with diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index 0521f0f5c..0451dee78 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -431,10 +431,12 @@ mono_domain_create_appdomain_internal (char *friendly_name, MonoAppDomainSetup * add_assemblies_to_domain (data, mono_defaults.corlib->assembly, NULL); +#ifndef DISABLE_SHADOW_COPY shadow_location = get_shadow_assembly_location_base (data); mono_debugger_event_create_appdomain (data, shadow_location); g_free (shadow_location); - +#endif + return ad; } diff --git a/mono/metadata/generic-sharing.c b/mono/metadata/generic-sharing.c index 2dad1c9b2..b54eadb3b 100644 --- a/mono/metadata/generic-sharing.c +++ b/mono/metadata/generic-sharing.c @@ -585,6 +585,8 @@ inflate_other_data (gpointer data, int info_type, MonoGenericContext *context, M default: g_assert_not_reached (); } + /* Not reached, quiet compiler */ + return NULL; } static gpointer @@ -771,6 +773,8 @@ class_type_info (MonoDomain *domain, MonoClass *class, int info_type) default: g_assert_not_reached (); } + /* Not reached */ + return NULL; } static gpointer @@ -837,6 +841,8 @@ instantiate_other_info (MonoDomain *domain, MonoRuntimeGenericContextOtherInfoTe default: g_assert_not_reached (); } + /* Not reached */ + return NULL; } /* @@ -940,6 +946,8 @@ other_info_equal (gpointer data1, gpointer data2, int info_type) default: g_assert_not_reached (); } + /* never reached */ + return NULL; } static int diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c index 99d1c991d..77d001d8d 100644 --- a/mono/metadata/icall.c +++ b/mono/metadata/icall.c @@ -7217,14 +7217,16 @@ mono_ArgIterator_Setup (MonoArgIterator *iter, char* argsp, char* start) if (start) { iter->args = start; } else { - guint32 i, arg_size; - gint32 align; iter->args = argsp + sizeof (gpointer); #ifndef MONO_ARCH_REGPARMS + { + guint32 i, arg_size; + gint32 align; for (i = 0; i < iter->sig->sentinelpos; ++i) { arg_size = mono_type_stack_size (iter->sig->params [i], &align); iter->args = (char*)iter->args + arg_size; } + } #endif } iter->num_args = iter->sig->param_count - iter->sig->sentinelpos; @@ -7501,6 +7503,8 @@ custom_attrs_get_by_type (MonoObject *obj, MonoReflectionType *attr_type) if (mono_loader_get_last_error ()) { mono_raise_exception (mono_loader_error_prepare_exception (mono_loader_get_last_error ())); g_assert_not_reached (); + /* Not reached */ + return NULL; } else { return res; } diff --git a/mono/metadata/image.c b/mono/metadata/image.c index a254e33e3..da552e6fa 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -130,7 +130,7 @@ mono_images_init (void) loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal); loaded_images_refonly_hash = g_hash_table_new (g_str_hash, g_str_equal); - debug_assembly_unload = getenv ("MONO_DEBUG_ASSEMBLY_UNLOAD") != NULL; + debug_assembly_unload = g_getenv ("MONO_DEBUG_ASSEMBLY_UNLOAD") != NULL; } /** diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index 8c1b79a17..e13eef427 100644 --- a/mono/metadata/marshal.c +++ b/mono/metadata/marshal.c @@ -3458,6 +3458,8 @@ mono_marshal_get_remoting_invoke_for_target (MonoMethod *method, MonoRemotingTar } else { return mono_marshal_get_remoting_invoke (method); } + /* Not erached */ + return NULL; } G_GNUC_UNUSED static gpointer diff --git a/mono/metadata/metadata-verify.c b/mono/metadata/metadata-verify.c index da4451a02..ffa8e13d0 100644 --- a/mono/metadata/metadata-verify.c +++ b/mono/metadata/metadata-verify.c @@ -24,7 +24,7 @@ #include #include #include -#include +//#include #include #ifndef DISABLE_VERIFIER diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c index 28de1572e..d3e8ddadd 100644 --- a/mono/metadata/mono-config.c +++ b/mono/metadata/mono-config.c @@ -37,11 +37,14 @@ #define CONFIG_OS "aix" #elif defined(__hpux) #define CONFIG_OS "hpux" +#elif defined(SN_TARGET_PS3) +#define CONFIG_OS "CellOS" #else #warning Unknown operating system #define CONFIG_OS "unknownOS" #endif +#ifndef CONFIG_CPU #if defined(__i386__) #define CONFIG_CPU "x86" #define CONFIG_WORDSIZE "32" @@ -82,6 +85,7 @@ #warning Unknown CPU #define CONFIG_CPU "unknownCPU" #endif +#endif static void start_element (GMarkupParseContext *context, const gchar *element_name, -- 2.11.4.GIT