Compare commits

...
11 Commits
Author SHA1 Message Date
Ben Maurer 9e4af11a75 fix fc4
svn path=/branches/mono-1-1-8/mono/; revision=46273
2005-06-21 04:49:55 +00:00
Wade Berrier cfd654b338 Bump version to 1.1.8.1
svn path=/branches/mono-1-1-8/mono/; revision=46260
2005-06-20 19:39:07 +00:00
Ben Maurer 6706852461 2005-06-18 Ben Maurer <[email protected]>
* mini.c: Take mono_get_domainvar out of macros. This makes sure
	that we do not depend on undefined C behavior: the order stuff
	gets evaluated within an expression. Fixes mono when compiled on
	GCC 4.


svn path=/branches/mono-1-1-8/mono/; revision=46255
2005-06-20 18:31:51 +00:00
Gonzalo Paniagua Javier 9d9961ad92 2005-06-20 Gonzalo Paniagua Javier <[email protected]>
* domain.c:
	* appdomain.c:
	* domain-internals.h:
	* reflection.c: 'domain_assemblies' field is now protected by its own
	lock. Don't call into managed code to run the AssemblyLoad event if we
	now there are no registered delegates for it.


svn path=/branches/mono-1-1-8/mono/; revision=46253
2005-06-20 18:09:54 +00:00
Miguel de Icaza 1db9a3a7c2 Remove this from the branch
svn path=/branches/mono-1-1-8/mono/; revision=46251
2005-06-20 16:53:05 +00:00
Zoltan Varga 6f3a534e4a Merge from HEAD.
svn path=/branches/mono-1-1-8/mono/; revision=46213
2005-06-19 09:59:53 +00:00
Zoltan Varga 9db3450257 Merge ikvm fix from HEAD.
svn path=/branches/mono-1-1-8/mono/; revision=46212
2005-06-19 09:57:57 +00:00
Gonzalo Paniagua Javier f79948e57e 2005-06-18 Gonzalo Paniagua Javier <[email protected]>
* socket-io.c: fix the index in the socket array for writable/error
	sockets. Fixes bug #75306.


svn path=/branches/mono-1-1-8/mono/; revision=46202
2005-06-19 04:20:39 +00:00
Ben Maurer 38ba17f8fb backport config change
svn path=/tags/mono-1-1-8/mono/; revision=46068
2005-06-15 19:42:07 +00:00
Gonzalo Paniagua Javier 467094bf19 2005-06-14 Gonzalo Paniagua Javier <[email protected]>
* PageParser.cs: don't try to compile the master page if it wan't
	provided. Use MapPath from the base classes instead of the long
	version. Fixes bug #75269 that prevented xsp2 from working properly.

svn path=/tags/mono-1-1-8/mcs/; revision=46007
2005-06-15 03:22:46 +00:00
Miguel de Icaza 045f78538a Fix in the 1-1-8 tag
svn path=/tags/mono-1-1-8/mono/; revision=45930
2005-06-14 00:39:30 +00:00
16 changed files with 141 additions and 54 deletions

No files matched your search

+14 -15
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,1.1.8)
AM_INIT_AUTOMAKE(mono,1.1.8.1)
AM_MAINTAINER_MODE
AC_PROG_LN_S
@@ -1535,24 +1535,23 @@ case "$host" in
LIBC="libc.so"
INTL="libintl.so"
;;
esac
if test "x$X11" = "xlibX11.so"; then
*-*-*linux*)
AC_PATH_X
AC_PATH_PROG(OBJDUMP, objdump, no)
if test "x$no_x" != "xyes"; then
if test "x$OBJDUMP" != xno; then
AC_MSG_CHECKING(for the soname of libX11.so)
X11=$($OBJDUMP -p $x_libraries/libX11.so | $AWK '/SONAME/ {print $2}')
AC_MSG_RESULT($X11)
else
AC_MSG_WARN([Could not find objdump. WinForms will not work if you install this mono on a box without the X -devel package.]);
fi
AC_MSG_CHECKING(for the soname of libX11.so)
for i in $x_libraries /usr/lib /usr/lib64; do
for r in 4 5 6; do
if test -f $i/libX11.so.$r; then
X11=libX11.so.$r
AC_MSG_RESULT($X11)
fi
done
done
else
if test "x$X11" = "xlibX11.so"; then
AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]);
fi
fi
;;
esac
AC_SUBST(libsuffix)
+9
View File
@@ -1,3 +1,12 @@
2005-06-21 Ben Maurer <[email protected]>
* configure.host: remove -fexceptions, messes up with nptl
includes, as on fc4.
2005-06-17 Zoltan Varga <[email protected]>
* pthread_support.c: Workaround gcc-3.3 compiler bug.
2005-05-26 Sebastien Pouliot <[email protected]>
* libgc.vcproj: Project file for libgc.
-3
View File
@@ -21,10 +21,7 @@
gc_cflags=""
# We should set -fexceptions if we are using gcc and might be used
# inside something like gcj. This is the zeroth approximation:
if test :"$GCC": = :yes: ; then
gc_cflags="${gc_cflags} -fexceptions"
else
case "$host" in
hppa*-*-hpux* )
+23
View File
@@ -556,6 +556,27 @@ GC_bool GC_thr_initialized = FALSE;
volatile GC_thread GC_threads[THREAD_TABLE_SZ];
/*
* gcc-3.3.6 miscompiles the &GC_thread_key+sizeof(&GC_thread_key) expression so
* put it into a separate function.
*/
# ifdef __GNUC__
static __attribute__((noinline)) unsigned char* get_gc_thread_key_addr GC_PROTO((void))
{
return (unsigned char*)&GC_thread_key;
}
void GC_push_thread_structures GC_PROTO((void))
{
GC_push_all((ptr_t)(GC_threads), (ptr_t)(GC_threads)+sizeof(GC_threads));
# if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
GC_push_all((ptr_t)get_gc_thread_key_addr(),
(ptr_t)(get_gc_thread_key_addr())+sizeof(&GC_thread_key));
# endif
}
#else
void GC_push_thread_structures GC_PROTO((void))
{
GC_push_all((ptr_t)(GC_threads), (ptr_t)(GC_threads)+sizeof(GC_threads));
@@ -565,6 +586,8 @@ void GC_push_thread_structures GC_PROTO((void))
# endif
}
#endif
#ifdef THREAD_LOCAL_ALLOC
/* We must explicitly mark ptrfree and gcj free lists, since the free */
/* list links wouldn't otherwise be found. We also set them in the */
@@ -1,3 +1,9 @@
2005-06-14 Gonzalo Paniagua Javier <[email protected]>
* PageParser.cs: don't try to compile the master page if it wan't
provided. Use MapPath from the base classes instead of the long
version. Fixes bug #75269 that prevented xsp2 from working properly.
2005-06-13 Lluis Sanchez Gual <[email protected]>
* MasterPage.cs: Clear the default content of placeholders before
@@ -246,7 +246,8 @@ namespace System.Web.UI
masterPage = GetString (atts, "MasterPageFile", null);
// Make sure the page exists
MasterPageParser.GetCompiledMasterType (masterPage, HttpContext.Current.Request.MapPath (masterPage), HttpContext.Current);
if (masterPage != null)
MasterPageParser.GetCompiledMasterType (masterPage, MapPath (masterPage), HttpContext.Current);
#endif
// Ignored by now
GetString (atts, "EnableViewStateMac", null);
@@ -267,7 +268,7 @@ namespace System.Web.UI
} else {
string path = GetString (atts, "VirtualPath", null);
if (path != null)
masterType = MasterPageParser.GetCompiledMasterType (path, HttpContext.Current.Request.MapPath (path), HttpContext.Current);
masterType = MasterPageParser.GetCompiledMasterType (path, MapPath (path), HttpContext.Current);
else
ThrowParseException ("The MasterType directive must have either a TypeName or a VirtualPath attribute.");
}
+14
View File
@@ -1,3 +1,17 @@
2005-06-20 Gonzalo Paniagua Javier <[email protected]>
* domain.c:
* appdomain.c:
* domain-internals.h:
* reflection.c: 'domain_assemblies' field is now protected by its own
lock. Don't call into managed code to run the AssemblyLoad event if we
now there are no registered delegates for it.
2005-06-18 Gonzalo Paniagua Javier <[email protected]>
* socket-io.c: fix the index in the socket array for writable/error
sockets. Fixes bug #75306.
2005-06-12 Gonzalo Paniagua Javier <[email protected]>
* icall.c: no need to convert from utf16 to utf8 and then back again
+29 -17
View File
@@ -440,11 +440,11 @@ ves_icall_System_AppDomain_createDomain (MonoString *friendly_name, MonoAppDomai
mono_context_init (data);
/* The new appdomain should have all assemblies loaded */
mono_domain_lock (domain);
mono_domain_assemblies_lock (domain);
/*g_print ("copy assemblies from domain %p (%s)\n", domain, domain->friendly_name);*/
for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next)
add_assemblies_to_domain (data, tmp->data, NULL);
mono_domain_unlock (domain);
mono_domain_assemblies_unlock (domain);
return ad;
}
@@ -467,7 +467,7 @@ ves_icall_System_AppDomain_GetAssemblies (MonoAppDomain *ad, MonoBoolean refonly
count = 0;
/* Need to skip internal assembly builders created by remoting */
mono_domain_lock (domain);
mono_domain_assemblies_lock (domain);
for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
ass = tmp->data;
if (refonly && !ass->ref_only)
@@ -486,7 +486,7 @@ ves_icall_System_AppDomain_GetAssemblies (MonoAppDomain *ad, MonoBoolean refonly
mono_array_set (res, gpointer, i, mono_assembly_get_object (domain, ass));
++i;
}
mono_domain_unlock (domain);
mono_domain_assemblies_unlock (domain);
return res;
}
@@ -517,7 +517,7 @@ try_assembly_resolve (MonoDomain *domain, MonoString *fname, gboolean refonly)
}
/*
* LOCKING: assumes domain is already locked.
* LOCKING: assumes assemblies_lock in the domain is already locked.
*/
static void
add_assemblies_to_domain (MonoDomain *domain, MonoAssembly *ass, GHashTable *ht)
@@ -558,10 +558,12 @@ add_assemblies_to_domain (MonoDomain *domain, MonoAssembly *ass, GHashTable *ht)
static void
mono_domain_fire_assembly_load (MonoAssembly *assembly, gpointer user_data)
{
static MonoClassField *assembly_load_field;
static MonoMethod *assembly_load_method;
MonoDomain *domain = mono_domain_get ();
MonoReflectionAssembly *ref_assembly;
MonoClass *klass;
MonoMethod *method;
gpointer load_value;
void *params [1];
if (!domain->domain)
@@ -570,21 +572,31 @@ mono_domain_fire_assembly_load (MonoAssembly *assembly, gpointer user_data)
klass = domain->domain->mbr.obj.vtable->klass;
method = mono_class_get_method_from_name (klass, "DoAssemblyLoad", -1);
if (method == NULL) {
g_warning ("Method AppDomain.DoAssemblyLoad not found.\n");
return;
mono_domain_assemblies_lock (domain);
add_assemblies_to_domain (domain, assembly, NULL);
mono_domain_assemblies_unlock (domain);
if (assembly_load_field == NULL) {
assembly_load_field = mono_class_get_field_from_name (klass, "AssemblyLoad");
g_assert (assembly_load_field);
}
mono_domain_lock (domain);
add_assemblies_to_domain (domain, assembly, NULL);
mono_domain_unlock (domain);
mono_field_get_value (domain->domain, assembly_load_field, &load_value);
if (load_value == NULL) {
/* No events waiting to be triggered */
return;
}
ref_assembly = mono_assembly_get_object (domain, assembly);
g_assert (ref_assembly);
if (assembly_load_method == NULL) {
assembly_load_method = mono_class_get_method_from_name (klass, "DoAssemblyLoad", -1);
g_assert (assembly_load_method);
}
*params = ref_assembly;
mono_runtime_invoke (method, domain->domain, params, NULL);
mono_runtime_invoke (assembly_load_method, domain->domain, params, NULL);
}
static gchar *
@@ -852,17 +864,17 @@ mono_domain_assembly_search (MonoAssemblyName *aname,
MonoAssembly *ass;
gboolean refonly = GPOINTER_TO_UINT (user_data);
mono_domain_lock (domain);
mono_domain_assemblies_lock (domain);
for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
ass = tmp->data;
/* Dynamic assemblies can't match here in MS.NET */
if (ass->dynamic || refonly != ass->ref_only || !mono_assembly_names_equal (aname, &ass->aname))
continue;
mono_domain_unlock (domain);
mono_domain_assemblies_unlock (domain);
return ass;
}
mono_domain_unlock (domain);
mono_domain_assemblies_unlock (domain);
return NULL;
}
+4
View File
@@ -128,6 +128,8 @@ struct _MonoDomain {
* if the hashtable contains a GC visible reference to them.
*/
GHashTable *finalizable_objects_hash;
/* Used when accessing 'domain_assemblies' */
CRITICAL_SECTION assemblies_lock;
};
typedef struct {
@@ -143,6 +145,8 @@ typedef struct {
#define mono_domain_lock(domain) EnterCriticalSection(&(domain)->lock)
#define mono_domain_unlock(domain) LeaveCriticalSection(&(domain)->lock)
#define mono_domain_assemblies_lock(domain) EnterCriticalSection(&(domain)->assemblies_lock)
#define mono_domain_assemblies_unlock(domain) LeaveCriticalSection(&(domain)->assemblies_lock)
void
mono_jit_info_table_add (MonoDomain *domain, MonoJitInfo *ji);
+5 -3
View File
@@ -335,6 +335,7 @@ mono_domain_create (void)
domain->jit_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
InitializeCriticalSection (&domain->lock);
InitializeCriticalSection (&domain->assemblies_lock);
EnterCriticalSection (&appdomains_mutex);
domain_id_alloc (domain);
@@ -764,15 +765,15 @@ mono_domain_assembly_open (MonoDomain *domain, const char *name)
MonoAssembly *ass;
GSList *tmp;
mono_domain_lock (domain);
mono_domain_assemblies_lock (domain);
for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
ass = tmp->data;
if (strcmp (name, ass->aname.name) == 0) {
mono_domain_unlock (domain);
mono_domain_assemblies_unlock (domain);
return ass;
}
}
mono_domain_unlock (domain);
mono_domain_assemblies_unlock (domain);
if (!(ass = mono_assembly_open (name, NULL)))
return NULL;
@@ -882,6 +883,7 @@ mono_domain_free (MonoDomain *domain, gboolean force)
g_hash_table_destroy (domain->special_static_fields);
domain->special_static_fields = NULL;
}
DeleteCriticalSection (&domain->assemblies_lock);
DeleteCriticalSection (&domain->lock);
domain->setup = NULL;
+2 -2
View File
@@ -4358,9 +4358,9 @@ mono_image_basic_init (MonoReflectionAssemblyBuilder *assemblyb)
assembly->assembly.aname.name = image->image.name;
assembly->assembly.image = &image->image;
mono_domain_lock (domain);
mono_domain_assemblies_lock (domain);
domain->domain_assemblies = g_slist_prepend (domain->domain_assemblies, assembly);
mono_domain_unlock (domain);
mono_domain_assemblies_unlock (domain);
register_assembly (mono_object_domain (assemblyb), &assemblyb->assembly, &assembly->assembly);
mono_assembly_invoke_load_hook ((MonoAssembly*)assembly);
+1
View File
@@ -1384,6 +1384,7 @@ void ves_icall_System_Net_Sockets_Socket_Select_internal(MonoArray **sockets, gi
obj = mono_array_get (*sockets, MonoObject *, i);
if (obj == NULL) {
mode++;
idx++;
continue;
}
+11
View File
@@ -1,3 +1,14 @@
2005-06-18 Ben Maurer <[email protected]>
* mini.c: Take mono_get_domainvar out of macros. This makes sure
that we do not depend on undefined C behavior: the order stuff
gets evaluated within an expression. Fixes mono when compiled on
GCC 4.
2005-06-17 Zoltan Varga <[email protected]>
* mini.c (mono_method_to_ir): Allow STACK_PTR as input to SWITCH.
2005-06-13 Zoltan Varga <[email protected]>
* mini.c (mono_jit_free_method): Remove the method from the JitInfo table
+18 -10
View File
@@ -421,11 +421,13 @@ mono_jump_info_token_new (MonoMemPool *mp, MonoImage *image, guint32 token)
} while (0)
#define NEW_DOMAINCONST(cfg,dest) do { \
if (cfg->opt & MONO_OPT_SHARED) { \
NEW_TEMPLOAD (cfg, dest, mono_get_domainvar (cfg)->inst_c0); \
} else { \
NEW_PCONST (cfg, dest, (cfg)->domain); \
} \
if (cfg->opt & MONO_OPT_SHARED) { \
/* avoid depending on undefined C behavior in sequence points */ \
MonoInst* __domain_var = mono_get_domainvar (cfg); \
NEW_TEMPLOAD (cfg, dest, __domain_var->inst_c0); \
} else { \
NEW_PCONST (cfg, dest, (cfg)->domain); \
} \
} while (0)
#define GET_VARINFO_INST(cfg,num) ((cfg)->varinfo [(num)]->inst)
@@ -4299,7 +4301,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
MONO_INST_NEW (cfg, ins, *ip);
--sp;
ins->inst_left = *sp;
if (ins->inst_left->type != STACK_I4) goto unverified;
if ((ins->inst_left->type != STACK_I4) && (ins->inst_left->type != STACK_PTR))
ins->cil_code = ip;
ip += 5;
CHECK_OPSIZE (n * sizeof (guint32));
@@ -4621,12 +4623,14 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
if (cfg->opt & MONO_OPT_SHARED) {
int temp;
MonoInst *iargs [3];
MonoInst* domain_var;
if (cfg->compile_aot) {
cfg->ldstr_list = g_list_prepend (cfg->ldstr_list, GINT_TO_POINTER (n));
}
NEW_TEMPLOAD (cfg, iargs [0], mono_get_domainvar (cfg)->inst_c0);
/* avoid depending on undefined C behavior in sequence points */
domain_var = mono_get_domainvar (cfg);
NEW_TEMPLOAD (cfg, iargs [0], domain_var->inst_c0);
NEW_IMAGECONST (cfg, iargs [1], image);
NEW_ICONST (cfg, iargs [2], mono_metadata_token_index (n));
temp = mono_emit_jit_icall (cfg, bblock, mono_ldstr, iargs, ip);
@@ -5196,8 +5200,12 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
if ((cfg->opt & MONO_OPT_SHARED) || (cfg->compile_aot && addr)) {
int temp;
MonoInst *iargs [2];
MonoInst *domain_var;
g_assert (field->parent);
NEW_TEMPLOAD (cfg, iargs [0], mono_get_domainvar (cfg)->inst_c0);
/* avoid depending on undefined C behavior in sequence points */
domain_var = mono_get_domainvar (cfg);
NEW_TEMPLOAD (cfg, iargs [0], domain_var->inst_c0);
NEW_FIELDCONST (cfg, iargs [1], field);
temp = mono_emit_jit_icall (cfg, bblock, mono_class_static_field_address, iargs, ip);
NEW_TEMPLOAD (cfg, ins, temp);
+1 -1
View File
@@ -67,7 +67,7 @@ libMonoPosixHelper_la_LIBADD = \
$(Z_LIBS)
# libMonoPosixHelper_la_LDFLAGS = -no-undefined -version-info 1:0:1
libMonoPosixHelper_la_LDFLAGS = -no-undefined -module -avoid-version
libMonoPosixHelper_la_LDFLAGS = -no-undefined -avoid-version
#
# Use this target to refresh the values in map.[ch]
+1 -1
View File
@@ -119,7 +119,7 @@ copy_statfs (struct Mono_Posix_Statvfs *to, struct statfs *from)
to->f_files = from->f_files;
to->f_ffree = from->f_ffree;
to->f_favail = from->f_ffree; /* OSX doesn't have f_avail */
Mono_Posix_ToMountFlags (from->f_flag, &to->f_flag);
Mono_Posix_ToMountFlags (from->f_flags, &to->f_flag);
// from->f_fsid is an int32[2], to->f_fsid is a uint64,
// so this shouldn't lose anything.
memcpy (&to->f_fsid, &from->f_fsid, sizeof(to->f_fsid));