Compare commits

...
7 Commits
Author SHA1 Message Date
nobody f64163bfd7 This commit was manufactured by cvs2svn to create tag 'MONO_0_17'.
svn path=/tags/MONO_0_17/mono/; revision=9493
2002-12-09 18:46:51 +00:00
Miguel de Icaza 1d8902f810 De-c-sharpicize
svn path=/trunk/mono/; revision=9492
2002-12-09 18:46:51 +00:00
Miguel de Icaza 917887781d Update mono.pc.in
svn path=/trunk/mono/; revision=9491
2002-12-09 18:45:59 +00:00
Gonzalo Paniagua Javier a99224334e 2002-12-09 Gonzalo Paniagua Javier <[email protected]>
* appdomain.c: fix buglet when building exe file name.  Handle full
	assembly name (needed after latest changes to AssemblyName).
	* image.c:
	(mono_image_close): free some hashtables.

svn path=/trunk/mono/; revision=9490
2002-12-09 18:36:09 +00:00
Miguel de Icaza c38c598032 Flush
svn path=/trunk/mono/; revision=9489
2002-12-09 18:32:06 +00:00
Miguel de Icaza 981ab84fe7 New release
svn path=/trunk/mono/; revision=9488
2002-12-09 18:22:48 +00:00
Miguel de Icaza edefecba3b Add code for bounds check elimination
svn path=/trunk/mono/; revision=9487
2002-12-09 18:02:02 +00:00
12 changed files with 170 additions and 65 deletions

No files matched your search

-51
View File
@@ -1,51 +0,0 @@
/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
#undef HAVE_INET_PTON
#undef HAVE_INET_ATON
#undef HAVE_SOL_IP
#undef HAVE_SOL_TCP
#undef HAVE_IP_PKTINFO
#undef HAVE_STRUCT_IP_MREQN
#undef HAVE_PTHREAD
#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
#undef USE_MONO_MUTEX
#undef HAVE_LARGE_FILE_SUPPORT
#undef PLATFORM_WIN32
#undef HAVE_NEW_ICONV
#undef NAME_DEV_RANDOM
#undef HAVE_CRYPT_RNG
#undef HAVE_BOEHM_GC
/* The number of bytes in a void *. */
#undef SIZEOF_VOID_P
/* Define if you have the inet_aton function. */
#undef HAVE_INET_ATON
/* Define if you have the inet_pton function. */
#undef HAVE_INET_PTON
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H
/* Define if you have the <sys/filio.h> header file. */
#undef HAVE_SYS_FILIO_H
/* Define if you have the <sys/sockio.h> header file. */
#undef HAVE_SYS_SOCKIO_H
/* Define if you have the <utime.h> header file. */
#undef HAVE_UTIME_H
/* Name of package */
#undef PACKAGE
/* Version number of package */
#undef VERSION
+1 -1
View File
@@ -1,7 +1,7 @@
AC_INIT(README)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono, 0.16)
AM_INIT_AUTOMAKE(mono, 0.17)
AM_MAINTAINER_MODE
# Thread configuration inspired by sleepycat's db
+1 -1
View File
@@ -101,7 +101,7 @@
Screenshots: <a
href="http://modgb.sourceforge.net/monobasic_snap.png">in
Windows doing Windows.Forms</a> and in Linux doing <a
ref="images/gtk-vb.png">VB with Gtk#</a> (courtesy of Alp).
href="images/gtk-vb.png">VB with Gtk#</a> (courtesy of Alp).
Daniel Morgan has checked in his Oracle provider to the CVS
repository as well.
+1 -1
View File
@@ -8,5 +8,5 @@ Name: Mono
Description: Mono Runtime
Version: @VERSION@
Requires: glib-2.0 gmodule-2.0
Libs: -L${libdir} -lmono
Libs: -L${libdir} -lmono -lm
Cflags: -I${includedir}
+3
View File
@@ -212,6 +212,9 @@ gboolean mono_use_linear_scan = TRUE;
/* inline code */
gboolean mono_jit_inline_code = TRUE;
/* generate bound checking */
gboolean mono_jit_boundcheck = TRUE;
/* inline memcpy */
gboolean mono_inline_memcpy = TRUE;
+1
View File
@@ -236,6 +236,7 @@ extern gboolean mono_use_fast_iconv;
extern gboolean mono_break_on_exc;
extern gboolean mono_inline_memcpy;
extern guint32 mono_jit_tls_id;
extern gboolean mono_jit_boundcheck;
extern CRITICAL_SECTION *metadata_section;
+2
View File
@@ -228,6 +228,8 @@ main (int argc, char *argv [])
mono_jit_inline_code = FALSE;
else if (strcmp (argv [i], "--nointrinsic") == 0)
mono_inline_memcpy = FALSE;
else if (strcmp (argv [i], "--noboundcheck") == 0)
mono_jit_boundcheck = FALSE;
else if (strcmp (argv [i], "--nols") == 0)
mono_use_linear_scan = FALSE;
else if (strcmp (argv [i], "--breakonex") == 0)
+8 -4
View File
@@ -1645,8 +1645,10 @@ reg: LDLEN (reg) {
reg: LDELEMA (reg, CONST_I4) {
int ind;
x86_alu_membase_imm (s->code, X86_CMP, tree->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length), tree->right->data.i);
EMIT_COND_SYSTEM_EXCEPTION (X86_CC_GT, FALSE, "IndexOutOfRangeException");
if (mono_jit_boundcheck){
x86_alu_membase_imm (s->code, X86_CMP, tree->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length), tree->right->data.i);
EMIT_COND_SYSTEM_EXCEPTION (X86_CC_GT, FALSE, "IndexOutOfRangeException");
}
ind = tree->data.i * tree->right->data.i + G_STRUCT_OFFSET (MonoArray, vector);
@@ -1655,8 +1657,10 @@ reg: LDELEMA (reg, CONST_I4) {
reg: LDELEMA (reg, reg) {
x86_alu_reg_membase (s->code, X86_CMP, tree->right->reg1, tree->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length));
EMIT_COND_SYSTEM_EXCEPTION (X86_CC_LT, FALSE, "IndexOutOfRangeException");
if (mono_jit_boundcheck){
x86_alu_reg_membase (s->code, X86_CMP, tree->right->reg1, tree->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length));
EMIT_COND_SYSTEM_EXCEPTION (X86_CC_LT, FALSE, "IndexOutOfRangeException");
}
if (tree->data.i == 1 || tree->data.i == 2 ||
tree->data.i == 4 || tree->data.i == 8) {
+7
View File
@@ -1,3 +1,10 @@
2002-12-09 Gonzalo Paniagua Javier <[email protected]>
* appdomain.c: fix buglet when building exe file name. Handle full
assembly name (needed after latest changes to AssemblyName).
* image.c:
(mono_image_close): free some hashtables.
2002-12-05 Dietmar Maurer <[email protected]>
* threads.c (ves_icall_System_Threading_Thread_Abort): we use SIGRTMIN
+138 -6
View File
@@ -754,7 +754,7 @@ mono_domain_assembly_preload (MonoAssemblyName *aname,
dll = g_strconcat (aname->name, ".dll", NULL);
exe = g_strdup (dll);
strcpy (exe + strlen (exe) - 5, ".exe");
strcpy (exe + strlen (exe) - 4, ".exe");
if (domain->search_path && domain->search_path [0] != NULL) {
/* TODO: should also search in name/name.dll and name/name.exe from appbase */
@@ -822,12 +822,140 @@ ves_icall_System_Reflection_Assembly_LoadFrom (MonoString *fname)
return mono_assembly_get_object (domain, ass);
}
static void
free_assembly_name (MonoAssemblyName *aname)
{
if (aname == NULL)
return;
g_free ((void *) aname->name);
g_free ((void *) aname->culture);
g_free ((void *) aname->hash_value);
}
static gboolean
get_info_from_assembly_name (MonoReflectionAssemblyName *assRef, MonoAssemblyName *aname)
{
gchar *name;
gchar *value;
gchar **parts;
gchar **tmp;
gint major, minor, build, revision;
memset (aname, 0, sizeof (MonoAssemblyName));
name = mono_string_to_utf8 (assRef->name);
parts = tmp = g_strsplit (name, ",", 4);
g_free (name);
if (!tmp || !*tmp) {
g_strfreev (tmp);
return FALSE;
}
value = g_strstrip (*tmp);
/* g_print ("Assembly name: %s\n", value); */
aname->name = g_strdup (value);
tmp++;
if (!*tmp) {
g_strfreev (parts);
return TRUE;
}
value = g_strstrip (*tmp);
if (strncmp (value, "Version=", 8)) {
g_strfreev (parts);
return FALSE;
}
if (sscanf (value + 8, "%u.%u.%u.%u", &major, &minor, &build, &revision) != 4) {
g_strfreev (parts);
return FALSE;
}
/* g_print ("Version: %u.%u.%u.%u\n", major, minor, build, revision); */
aname->major = major;
aname->minor = minor;
aname->build = build;
aname->revision = revision;
tmp++;
if (!*tmp) {
g_strfreev (parts);
return FALSE;
}
value = g_strstrip (*tmp);
if (strncmp (value, "Culture=", 8)) {
g_strfreev (parts);
return FALSE;
}
/* g_print ("Culture: %s\n", aname->culture); */
aname->culture = g_strstrip (g_strdup (value + 8));
tmp++;
if (!*tmp) {
g_strfreev (parts);
return FALSE;
}
value = g_strstrip (*tmp);
if (strncmp (value, "PublicKeyToken=", 15)) {
g_strfreev (parts);
return FALSE;
}
value += 15;
if (*value && strcmp (value, "null")) {
gint i, len;
gchar h, l;
gchar *result;
value = g_strstrip (g_strdup (value));
len = strlen (value);
if (len % 2) {
g_strfreev (parts);
return FALSE;
}
aname->hash_len = len / 2;
aname->hash_value = g_malloc0 (aname->hash_len);
result = (gchar *) aname->hash_value;
for (i = 0; i < len; i++) {
if (i % 2) {
l = g_ascii_xdigit_value (value [i]);
if (l == -1) {
g_strfreev (parts);
return FALSE;
}
result [i / 2] = (h * 16) + l;
} else {
h = g_ascii_xdigit_value (value [i]);
if (h == -1) {
g_strfreev (parts);
return FALSE;
}
}
}
/*
g_print ("PublicKeyToken: ");
for (i = 0; i < aname->hash_len; i++) {
g_print ("%x", 0x00FF & aname->hash_value [i]);
}
g_print ("\n");
*/
}
g_strfreev (parts);
return TRUE;
}
MonoReflectionAssembly *
ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad, MonoReflectionAssemblyName *assRef, MonoObject *evidence)
{
MonoDomain *domain = ad->data;
char *name;
MonoImageOpenStatus status = MONO_IMAGE_OK;
MonoAssembly *ass;
MonoAssemblyName aname;
@@ -842,13 +970,17 @@ ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad, MonoReflectionAssem
g_assert (assRef != NULL);
g_assert (assRef->name != NULL);
/* FIXME : examine version, culture info */
if (!get_info_from_assembly_name (assRef, &aname)) {
MonoException *exc;
aname.name = name = mono_string_to_utf8 (assRef->name);
free_assembly_name (&aname);
/* This is a parse error... */
exc = mono_get_exception_file_not_found (assRef->name);
mono_raise_exception (exc);
}
ass = mono_assembly_load (&aname, NULL, &status);
g_free (name);
free_assembly_name (&aname);
if (!ass && (refass = try_assembly_resolve (domain, assRef->name)) == NULL){
/* FIXME: it doesn't make much sense since we really don't have a filename ... */
+7
View File
@@ -669,6 +669,13 @@ mono_image_close (MonoImage *image)
g_hash_table_destroy (image->array_cache);
g_hash_table_foreach (image->name_cache, free_hash_table, NULL);
g_hash_table_destroy (image->name_cache);
g_hash_table_destroy (image->native_wrapper_cache);
g_hash_table_destroy (image->managed_wrapper_cache);
g_hash_table_destroy (image->delegate_begin_invoke_cache);
g_hash_table_destroy (image->delegate_end_invoke_cache);
g_hash_table_destroy (image->delegate_invoke_cache);
g_hash_table_destroy (image->remoting_invoke_cache);
g_hash_table_destroy (image->runtime_invoke_cache);
if (image->raw_metadata != NULL)
mono_raw_buffer_free (image->raw_metadata);
+1 -1
View File
@@ -101,7 +101,7 @@
Screenshots: <a
href="http://modgb.sourceforge.net/monobasic_snap.png">in
Windows doing Windows.Forms</a> and in Linux doing <a
ref="images/gtk-vb.png">VB with Gtk#</a> (courtesy of Alp).
href="images/gtk-vb.png">VB with Gtk#</a> (courtesy of Alp).
Daniel Morgan has checked in his Oracle provider to the CVS
repository as well.