1 2002-02-16 Jeffrey Stedfast <fejj@ximian.com>
3 * socket-io.c (convert_sockopt_level_and_name): If the system
4 doesn't define SOL_IP or SOL_TCP, get them by hand using
5 getprotobyname() and caching the values (because this could be a
7 (ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal):
8 Don't attempt to add or drop memberships unless the system
9 supports it. Also use the appropriate struct when the system does
10 support it. Ie, not all systems have struct ip_mreqn so use struct
11 ip_mreq when appropriate.
13 Fri Feb 15 18:15:44 CET 2002 Paolo Molaro <lupus@ximian.com>
15 * reflection.c: handle finally clauses.
17 Fri Feb 15 15:06:33 CET 2002 Paolo Molaro <lupus@ximian.com>
19 * socket-io.c: use g_snprintf() instead of snprintf.
21 2002-02-14 Jeffrey Stedfast <fejj@ximian.com>
23 * reflection.c (mono_param_get_objects): Cast second argument to
24 mono_method_get_param_names to a const char** to silence the
27 * appdomain.c (mono_domain_assembly_open): Put parens around the
28 truth statement in the for-loop.
30 * unicode.c (iconv_convert): Got rid of a compiler warning about
31 int i being unused when the system has a new iconv.
32 (iconv_get_length): Same.
34 * image.c (load_class_names): Cast the second argument to
35 g_hash_table_insert() to char* to hush compiler warnings about the
37 (mono_image_open): Same here.
39 * socket-io.c: Don't conditionally include sys/filio.h or
40 sys/sockio.h here anymore since we now get them from
42 (inet_pton): If the system doesn't support inet_aton, implement
43 using inet_addr and also #define INADDR_NONE if it isn't defined
46 Thu Feb 14 19:01:06 CET 2002 Paolo Molaro <lupus@ximian.com>
48 * metadata.c, metadata.h: added function to get packing and size info
50 * reflection.h, reflection.c: handle field RVA data. Save info about
51 the table layout if needed. Assign typedef indexes to all the types
52 before dumping the info about them to avoid forward reference problems.
54 2002-02-14 Dietmar Maurer <dietmar@ximian.com>
56 * socket-io.c (convert_sockopt_level_and_name): ifdef
57 SO_ACCEPTCONN because it is not defined on my system (old debian)
59 Thu Feb 14 11:49:30 CET 2002 Paolo Molaro <lupus@ximian.com>
61 * opcode.c: use stddef.h to get NULL.
63 2002-02-14 Jeffrey Stedfast <fejj@ximian.com>
65 * socket-io.c: conditionally include sys/filio.h and sys/sockio.h
66 for FIONBIO, FIONREAD and SIOCATMARK.
67 (ves_icall_System_Net_Dns_GetHostByAddr_internal): SunOS doesn't
68 define INADDR_NONE and besides, inet_addr() is deprecated and
69 should not be used. Use inet_pton() instead - it also has the
70 added bonus that it can easily handle IPv6 addresses as well.
71 (inet_pton): Implement using inet_aton() ifndef HAVE_INET_PTON.
73 Wed Feb 13 23:00:21 CET 2002 Paolo Molaro <lupus@ximian.com>
75 * decimal.c: remove _MSC_VER conditional.
77 2002-02-13 Dick Porter <dick@ximian.com>
80 * icall.c: Internal calls for Blocking, Select, Shutdown,
81 GetSocketOption and SetSocketOption
83 Wed Feb 13 19:20:01 CET 2002 Paolo Molaro <lupus@ximian.com>
85 * assembly.cs: better resolver: use it instead of some kludgy
88 Wed Feb 13 18:25:55 CET 2002 Paolo Molaro <lupus@ximian.com>
90 * reflection.c: the best way to speed-up the compiler is to avoid
93 2002-02-13 Dietmar Maurer <dietmar@ximian.com>
95 * class.c (mono_class_vtable): changed the object layout
97 (mono_class_create_from_typespec): consider MONO_TYPE_PTR
99 Tue Feb 12 20:06:01 CET 2002 Paolo Molaro <lupus@ximian.com>
101 * assembly.c: look for assemblies in the assembly dir, too.
103 Tue Feb 12 14:03:42 CET 2002 Paolo Molaro <lupus@ximian.com>
105 * class.c: fix thinko in mono_class_from_type().
107 Mon Feb 11 19:43:51 CET 2002 Paolo Molaro <lupus@ximian.com>
109 * exception.h, exception.c: added TypeLoadException.
110 * object.h, object.c: added mono_array_clone ().
111 * icall.c: handle throwOnError in AssemblyGetType().
113 * opcode.h, opcode.c: use a single value for the opcode val.
114 Compile fix for non-gcc compilers.
116 Fri Feb 8 12:26:37 CET 2002 Paolo Molaro <lupus@ximian.com>
118 * opcodes.c, opcodes.h: export interesting info about opcodes.
120 2002-02-05 Dietmar Maurer <dietmar@ximian.com>
122 * object.h (MONO_CHECK_ARG, MONO_CHECK_ARG_NULL): new macro for
125 * class.c (class_compute_field_layout): set element_class for enums
126 (mono_class_create_from_typedef): set element_class for normal classes
128 * icall.c (ves_icall_System_Enum_get_value): impl.
130 * class.c (mono_class_create_from_typedef): do not set valuetype
131 flag for System.ValueType and System.Enum
133 2002-02-04 Dietmar Maurer <dietmar@ximian.com>
135 * unicode.c (iconv_convert): fix big endian problem.
137 Fri Feb 1 16:13:20 CET 2002 Paolo Molaro <lupus@ximian.com>
139 * class.c: add asserts if we are ever going to scribble over memory.
140 * socket-io.c: not all systems have AF_IRDA defined.
142 2002-01-31 Dietmar Maurer <dietmar@ximian.com>
144 * class.c (class_compute_field_layout): do not consider static
145 fields to compute alignment
147 2002-01-25 Dietmar Maurer <dietmar@ximian.com>
149 * appdomain.c (mono_appdomain_get): impl.
150 (ves_icall_System_AppDomain_ExecuteAssembly): impl.
152 Thu Jan 24 12:59:23 CET 2002 Paolo Molaro <lupus@ximian.com>
154 * icall.c: ignore "file://" prefix when loading an assembly.
156 2002-01-23 Dick Porter <dick@ximian.com>
160 * Makefile.am: Added socket support
162 2002-01-23 Miguel de Icaza <miguel@ximian.com>
164 * icall.c (ves_icall_appdomain_get_default_assemblies): put this
165 code back. This should return the assemblies that are loaded by
166 the runtime on behalf of an application domain.
168 The current implementation is still broken, it just returns every
169 assembly loaded, but until we get real applications domain this
172 2002-01-23 Dietmar Maurer <dietmar@ximian.com>
174 * icall.c (ves_icall_appdomain_get_cur_domain): runtime_init the
177 2002-01-23 Miguel de Icaza <miguel@ximian.com>
179 * icall.c (ves_icall_appdomain_get_cur_domain): Cache the value of
180 the mono_class_from_name lookup.
181 (ves_icall_get_parameter_info): ditto.
182 (ves_icall_appdomain_get_assemblies, add_assembly): Implement new internal
184 (ves_icall_System_Reflection_Assembly_get_code_base): Another new call.
186 Tue Jan 22 22:43:47 CET 2002 Paolo Molaro <lupus@ximian.com>
188 * class.c: load also nested classes on class init.
189 System.ValueType instance methods gets passed boxed
190 values, unless methods in derived classed that get a pointer to the
192 * icall.c: use better name parsing code in GetType().
193 * image.c, image.h: add mono_image_loaded ().
194 * metadata.c, metadata.h: add mono_metadata_nesting_typedef ().
195 * reflection.c, reflection.h: added mono_reflection_parse_type().
197 2002-01-22 Veronica De Santis <veron78@interfree.it>
199 * icall.c : Added mapping of internal calls for Manual and Auto reset events
200 * threads.c : Added the implementation of internal calls for events
201 * threads.h : Added prototypes of internal calls for events
203 2002-01-21 Radek Doulik <rodo@ximian.com>
205 * icall.c (ves_icall_InitializeArray): swap bytes on big endians
207 2002-01-21 Dietmar Maurer <dietmar@ximian.com>
209 * class.c (mono_class_init): set min_align to 1 (instead of 0)
210 (mono_class_value_size): use min_align
212 2002-01-20 Dick Porter <dick@ximian.com>
215 * threads.c: Replaced all instances of WapiHandle * with HANDLE,
216 so it compiles on w32.
218 2002-01-17 Dietmar Maurer <dietmar@ximian.com>
220 * metadata.c (mono_type_stack_size): impl.
222 * class.c (mono_class_get_field): impl. memberref token
224 2002-01-16 Veronica De Santis <veron78@@interfree.it>
226 * icall.h : Added the internal calls mapping for CreateMutex_internal
227 and ReleaseMutex_internal.
228 * threads.h : Added the prototype of mutexes internal calls.
229 * threads.c : Added the implementations of mutexes internal calls.
231 Tue Jan 15 22:47:57 CET 2002 Paolo Molaro <lupus@ximian.com>
233 * metaparse.h: removed unused file.
234 * reflection.c, reflection.h: added stream_data_align () function
235 to align data in streams and keep stream aligned. Add support for
236 exception support in method headers.
238 Tue Jan 15 19:42:50 CET 2002 Paolo Molaro <lupus@ximian.com>
240 * unicode.c: make iconv_convert () return the number of bytess written
241 in the output buffer.
243 2002-01-15 Dick Porter <dick@ximian.com>
244 * threads.c: Make the runtime's idea of infinite timeouts coincide
245 with the class library's
247 Fix a particularly egregious bug in mono_thread_cleanup(). That
248 code was so utterly bogus it must have been written on a Monday.
250 Mon Jan 14 17:01:03 CET 2002 Paolo Molaro <lupus@ximian.com>
252 * reflection.h: add subtypes field to TypeBuilder.
253 * reflection.c: encode constants for literal fields.
254 Handle subtypes. Fix user string token (and add a zero byte)
257 2002-01-14 Dietmar Maurer <dietmar@ximian.com>
259 * class.c (mono_class_init): bug fix: assign slot numbers for
262 Fri Jan 11 18:54:42 CET 2002 Paolo Molaro <lupus@ximian.com>
264 * reflection.c: don't try to output a code RVA for abstract methods.
265 Small fixes for method header format. Output parameter info to the
266 ParamDef table. Save method overriding info to MethodImpl table.
267 Fix property support. Allow typedef.extends to be a type in the
269 * verify.c: fix off-by-one error.
271 Thu Jan 10 19:36:27 CET 2002 Paolo Molaro <lupus@ximian.com>
273 * class.c: fix mono_class_from_mono_type () for szarray types.
274 Remove unused cache check in mono_class_from_type_spec().
275 * icall.c: *type_from_name () functions handle simple arrays and byref.
276 * reflection.c: handle byref and szarray types. Handle methods without
277 body (gets P/Invoke compilation working). Handle types and fields in
279 * reflection.h: add rank to MonoTypeInfo.
281 2002-01-10 Dick Porter <dick@ximian.com>
283 * threads.c: Implemented WaitAll(), WaitAny() and WaitOne()
286 Wed Jan 9 19:27:13 CET 2002 Paolo Molaro <lupus@ximian.com>
288 * icall.c: initialize class in type_from_handle ().
289 Loop also in parent classes for get_method ().
290 * reflection.c: properly encode class and valuetype types.
291 Start on encoding TypeBuilder types. Handle fieldrefs.
292 Use correct length when registering a user string.
293 Handle ConstructorBuilder and MonoMethod in get_token ().
294 Make mono_type_get_object () aware of cached types.
295 * object.c: back out change to mono_string_new ().
297 Tue Jan 8 22:47:44 EST 2002 Matt Kimball <matt@kimball.net>
298 * object.c: mono_string_new should return a NULL when the string
299 passed in is NULL -- not try to deference it.
301 Sat Jan 5 15:48:04 CET 2002 Paolo Molaro <lupus@ximian.com>
303 * icall.c: hack to make IsSubType work for TypeBuilders.
304 * reflection.c: emit constructors before methods.
305 Retrieve param names in mono_param_get_objects().
307 2002/01/05 Nick Drochak <ndrochak@gol.com>
309 * Makefile.am: fix list of headers and sources so automake 1.5
310 doesn't complain. Removed \# at end of list.
312 Thu Jan 3 23:17:17 CET 2002 Paolo Molaro <lupus@ximian.com>
314 * reflection.c: get token for a method ref. Set return type of
316 * loader.c: debug message.
319 Mon Dec 24 17:18:10 CET 2001 Paolo Molaro <lupus@ximian.com>
321 * icall.c: fix array init with rank > 1. FindMembers
322 loops in parent class as well.
323 * image.c: do not insert nested types in name cache.
324 * reflection.c: warning fix.
325 * reflection.h: add override method (for interface impl).
327 Mon Dec 24 16:16:56 CET 2001 Paolo Molaro <lupus@ximian.com>
329 * metadata.c: fix customattr decoding.
331 2001-12-21 Miguel de Icaza <miguel@ximian.com>
333 * rawbuffer.cs: Added native Win32 implementation, avoids using
334 mmap on Cygwin. This patch is from Dan Lewis (dihlewis@yahoo.co.uk)
336 Thu Dec 20 20:11:26 CET 2001 Paolo Molaro <lupus@ximian.com>
338 * class.c: make the low-level routines handle the cache.
340 Thu Dec 20 15:20:35 CET 2001 Paolo Molaro <lupus@ximian.com>
342 * image.c: fopen (file, "rb") ("David Dawkins" <david@dawkins.st>).
344 Tue Dec 18 18:50:00 CET 2001 Paolo Molaro <lupus@ximian.com>
346 * class.c: fix mono_array_element_size() for objects.
347 * class.h, class.c: add properties to MonoClass and load them
349 * icall.c: check with isinst() when assigning a value to an array
350 instead of requiring the classes to match exactly.
351 Implemented icall for System.Type::GetType().
352 Implemented icalls to get ParameterInfo, ProprtyInfo and info about
353 enums. Handle bindingflags when looking for methods and fields.
354 * metadata.h, metadata.c: implemented mono_metadata_properties_from_typedef()
355 and mono_metadata_methods_from_property().
356 * reflection.h, reflection.c: added structures for propreties,
357 parameters and enums. Implemented mono_property_get_object() and
358 mono_param_get_objects().
360 2001-12-18 Dick Porter <dick@ximian.com>
362 * file-io.c: Use mono_string_to_utf16() instead of
365 * object.c: Added mono_string_to_utf16(), which copies the non
366 NULL-terminated MonoString into a new double-null-terminated
369 2001-12-17 Dietmar Maurer <dietmar@ximian.com>
371 * icall.c (ves_icall_System_DateTime_GetNow): added EPOCH adjustment
373 2001-12-16 Dietmar Maurer <dietmar@ximian.com>
375 * file-io.c: raise exceptions if handle is invalid.
377 Thu Dec 13 20:27:08 CET 2001 Paolo Molaro <lupus@ximian.com>
379 * assembly.c: yet another check for mscorlib.
380 * class.c, class.h: load nesting info for classes.
381 * icall.c: many new functions to support the Reflection classes.
382 * metadata.c, metadata.h: mono_metadata_nested_in_typedef() added.
383 * reflection.h, reflection.c: mono_image_create_token(),
384 mono_assembly_get_object(), mono_type_get_object(),
385 mono_method_get_object(), mono_field_get_object(): methods to return
386 objects that parallel the C representation of assemblies, types,
389 2001-12-11 Dick Porter <dick@ximian.com>
392 * file-io.c: Internal calls for file IO.
394 Thu Dec 6 16:21:30 CET 2001 Paolo Molaro <lupus@ximian.com>
396 * tabledefs.h: missing FileAttributes.
397 * verify.h, verify.c: use is_valid_string () to simplify and check for
398 valid strings more correctly. Fix warnings and speeling.
399 Check more tables: Filed, File, ModuleRef, StandAloneSig.
400 Check code: branches, maxstack, method calls.
402 2001-12-04 Dietmar Maurer <dietmar@ximian.com>
404 * object.c (mono_object_allocate): removed static, so that the jit
405 can allocate value types.
407 * icall.c (ves_icall_System_DateTime_GetNow): impl.
409 Mon Dec 3 17:02:01 CET 2001 Paolo Molaro <lupus@ximian.com>
411 * class.c: init enum types right away and register the
412 token->MonoClass map in mono_class_create_from_typedef ().
413 * verify.h, verify.c: first cut of the verifier.
414 * pedump.c: add --verify switch to verify metadata tables.
415 * tabledefs.h: add some missing enums.
417 2001-11-30 Dietmar Maurer <dietmar@ximian.com>
419 * class.c (mono_install_runtime_class_init): impl.
420 (mono_class_init): renamed mono_class_metadata_init to
421 mono_class_init, also removed the metadata_inited flag
423 * object.c (mono_object_isinst): use faster algorithm
425 2001-11-30 Radek Doulik <rodo@ximian.com>
427 * mono-endian.h: reverted last change
428 added function prototypes
430 * Makefile.am (libmetadata_a_SOURCES): reverted my last change and
431 add mono-endian.c back
433 * mono-endian.c: returned back, as Paolo pointed out, it's needed
434 for unaligned access, I've mistaked it with endianess. I am
436 (mono_read16): fix reverted endianess
440 2001-11-30 Dick Porter <dick@ximian.com>
442 * exception.c: Implement mono_exception_from_name()
444 Fri Nov 30 12:01:02 CET 2001 Paolo Molaro <lupus@ximian.com>
446 * metadata.h, metadata.c: remove params_size and locals_size and their
447 calculation from the metadata code: they are only usefult to the
450 2001-11-29 Radek Doulik <rodo@ximian.com>
452 * object.c (mono_ldstr): swap bytes here, it's probably not the
453 best place, but works for me now, I'll redo it once I know mono
454 better, also note that I add PROT_WRITE and don't reset back, also
455 note that it's only affects big endians, so x86 should be OK
457 * mono-endian.h (read16): use just glib macros for both endians
459 * mono-endian.c: removed as glib macros are used in in
460 mono-endian.h so we don't need to care about endianess for read
461 macros as glib does that for us already
463 Thu Nov 29 18:20:58 CET 2001 Paolo Molaro <lupus@ximian.com>
465 * class.h, class.h: take minimum alignment into consideration so
466 that the fields of a class remain aligned also when in an array.
468 Tue Nov 27 16:39:01 CET 2001 Paolo Molaro <lupus@ximian.com>
470 * loader.h, loader.c: add mono_method_get_param_names().
471 * class.c: 0-init class fields.
473 2001-11-26 Dick Porter <dick@ximian.com>
477 * threads.c: New file that handles System.Threading on all platforms
480 * object.h: Remove the synchronisation struct from MonoObject,
481 replace it with a pointer that gets initialised on demand
483 * Makefile.am: Replace all the system-specific threading code with
484 a single file that uses the new wrapper library
486 Mon Nov 19 11:37:14 CET 2001 Paolo Molaro <lupus@ximian.com>
488 * class.c, class.h: add mono_install_trampoline() so that the runtime
489 can register a function to create a trampoline: removes the ugly
490 requirement that a runtime needed to export arch_create_jit_trampoline.
491 * object.h, object.c: added mono_install_handler() so that the runtime
492 can install an handler for exceptions generated in C code (with
493 mono_raise_exception()). Added C struct for System.Delegate.
494 * pedump.c: removed arch_create_jit_trampoline.
495 * reflection.c: some cleanups to allow registering user strings and
496 later getting a token for methodrefs and fieldrefs before the assembly
498 * row-indexes.h: updates and fixes from the new ECMA specs.
500 Thu Nov 15 17:44:49 CET 2001 Paolo Molaro <lupus@ximian.com>
502 * class.h, class.c: add enum_basetype field to MonoClass.
503 * metadata.h, metadata.c: add mono_metadata_get_constant_index()
504 to get index in the constant table reated to a field, param or
506 * reflection.h, reflection.c: handle constructors. Set public-key and
507 version number of the built assembly to 0.
508 * row-indexes.h: update from new ECMA spec.
510 Wed Nov 14 19:26:06 CET 2001 Paolo Molaro <lupus@ximian.com>
512 * class.h, class.c: add a max_interface_id to MonoClass.
513 * icall.c: rename my_mono_new_object() to my_mono_new_mono_type()
514 since it's used to do that. Added mono_type_type_from_obj().
515 Make GetType() return NULL instead of segfaulting if the type was not
516 found. Handle simple arrays in assQualifiedName.
517 * object.h: add a struct to represent an Exception.
518 * reflection.c: output call convention in method signature.
519 Add code to support P/Invoke methods and fixed offsets for fields.
521 Mon Nov 12 12:41:32 CET 2001 Paolo Molaro <lupus@ximian.com>
523 * decimal.c, decimal.h: mono_double2decimal() get the sign bit from
525 * icall.c: use mono_array_addr instead of array->vector: fixes the
526 reflection image writing.
527 * reflection.c: init call convention byte to 0 in method signature.
528 Encode the property signature. Don't output property-related methods
529 twice. Really process the properties for a type (don't cast a field to
530 a property, my mom always told me that).
531 Fix 64 bit issues in pointer alignment in a different and more
534 2001-11-10 Sean MacIsaac <macisaac@ximian.com>
536 * loader.h: Removed type class from MonoDefaults, added monotype
538 * loader.c: Loaded MonoType, removed loading of Type
540 * icall.c (my_mono_new_object): Now returns a System.MonoType,
541 and fills in System.Type._impl with a RuntimeTypeHandle rather
542 than the actual MonoClass *
544 (ves_icall_type_from_handle): change from type_class to
547 (ves_icall_System_Runtime_InteropServices_Marshal_ReadIntPtr):
550 (ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAuto):
553 (ves_icall_System_Reflection_Assembly_LoadFrom): implemented
555 (ves_icall_System_Reflection_Assembly_GetType): implemented
557 (ves_icall_System_MonoType_assQualifiedName): implemented
559 (ves_icall_System_PAL_OpSys_GetCurrentDirecotry): implemented
561 2001-11-09 Miguel de Icaza <miguel@ximian.com>
563 * assembly.c (mono_assembly_open): Implement a cache for the
566 (mono_assembly_close): only destroy the assembly when the last
569 2001-11-09 Dick Porter <dick@ximian.com>
571 * Makefile.am (pedump_LDADD): Don't need THREAD_LIBS any more
573 2001-11-09 Dietmar Maurer <dietmar@ximian.com>
575 * class.c (mono_class_metadata_init): bug fix: compute the right slot
577 Fri Nov 9 15:48:02 CET 2001 Paolo Molaro <lupus@ximian.com>
579 * icall.c, decimal.h, decimal.c: integrated decimal internalcalls
581 * object.h: add mono_string_chars ().
583 2001-11-07 Miguel de Icaza <miguel@ximian.com>
585 * reflection.c (build_compressed_metadata): Eliminates warnings
586 and uses 64-bit clean code.
588 * metadata.c (mono_type_hash): Change signature to eliminate warnings.
589 (mono_type_equal): Change signature to eliminate warnings.
591 Wed Nov 7 15:40:01 CET 2001 Paolo Molaro <lupus@ximian.com>
593 * icall.c, loader.c: remove the internalcall array constructors.
594 Changes to match the new MonoArray structure.
595 * object.h, object.c: an array object doesn't allocate an extra
596 vector. Add mono_array_new_full () to create jagged arrays easily.
598 Mon Nov 5 19:51:06 CET 2001 Paolo Molaro <lupus@ximian.com>
600 * metadata.h, metadata.c: add mono_metadata_field_info () to
601 retreive all the info about a field from vairous tables.
602 * icall.c: implement S.Runtime.CServices::InitializeArray () icall.
603 * class.h, class.c: augment MonoClassField with more info.
604 Implemented mono_ldtoken for fields. Implemented ExplicitLayout
605 policy and load a field's RVA if needed.
607 2001-11-05 Dietmar Maurer <dietmar@ximian.com>
609 * class.c (mono_class_metadata_init): create a trampoline for all
610 virtual functions instead of actually compiling them.
612 Fri Nov 2 19:37:51 CET 2001 Paolo Molaro <lupus@ximian.com>
614 * class.h, class.c: include name in MonoClassField.
615 * class.c: fix fundamental type of System.Object and System.String.
616 Set the right fundamental type for SZARRAY, too. Handle TypeSpec
618 * icall.c: remove internalcalls for the Reflection stuff that is now
620 * loader.c: mono_field_from_memberref () implementation.
621 * mono-endian.c: thinko (s/struct/union/g).
622 * object.c, object.h: make the mono_string_* prototypes actually use
623 MonoString instead of MonoObject.
624 * reflection.c, reflection.h: updates for changes in the reflection
625 code in corlib: we use C structures that map to the actual C# classes.
626 Handle SZARRAYs when encoding types. Handle locals in methods. Use a
627 fat method header if needed and use the info from the ILGenerator for
628 methods. Handle fields in types. Misc fixes.
630 2001-10-17 Dietmar Maurer <dietmar@ximian.com>
632 * class.c (mono_class_metadata_init): bug fix: always allocate
633 space for static class data
635 2001-10-25 Dietmar Maurer <dietmar@ximian.com>
637 * class.c (mono_compute_relative_numbering): use relative
638 numbering to support fast runtime type checks.
640 2001-10-17 Sean MacIsaac <macisaac@ximian.com>
642 * class.c (mono_class_create_from_typeref): added debugging output
643 to print class name when MonoDummy is returned instead of real class
645 2001-10-15 Dietmar Maurer <dietmar@ximian.com>
647 * class.c (mono_class_metadata_init): interface offset table now
648 contains pointers into the vtable - this is more efficient for the jit
650 2001-10-12 Dietmar Maurer <dietmar@ximian.com>
652 * class.c (mono_class_metadata_init): use a temporary vtable (the
653 old algorithm only worked for the interpreter, but not for the jit)
655 2001-10-11 Dietmar Maurer <dietmar@ximian.com>
657 * loader.c (method_from_memberref): use mono_class_get to get the
658 class of an array instead of using System.Array directly.
659 (mono_get_method): also add MEMBERREF methods to the method cache
660 which usefull for arrays.
662 2001-10-10 Dietmar Maurer <dietmar@ximian.com>
664 * pedump.c (arch_compile_method): added to compute vtable entry
666 * metadata.c (mono_metadata_interfaces_from_typedef): also return the
667 number of interfaces.
669 * class.h: merged MonoArrayClass into MonoClass
671 * class.c (mono_class_create_from_typedef): compute the vtable size and
672 allocate space to include the vtable inside MonoClass
673 (mono_class_metadata_init): initialize the vtable
675 Mon Oct 8 16:12:38 CEST 2001 Paolo Molaro <lupus@ximian.com>
677 * metadata.c, metadata.h: use MonoArrayType to describe the shape of an array.
678 Guard against calling bsearch with a NULL pointer (pointed out by Laurent Rioux, smoux).
679 * image.c: endian fixes by Laurent Rioux.
680 * object.h, object.c: rename MonoStringObject to MonoString and
681 MonoArrayObject to MonoArray. Change some function names to conform to
682 the style mono_<object>_<action>. mono_string_new_utf16 () takes a
683 guint16* as first argument, so don't use char*.
684 Provide macros to do the interesting things on arrays in a portable way.
685 * threads-pthread.c: updates for the API changes and #include <sched.h>
686 (required for sched_yield()).
687 * icall.c: updates for the API changes above.
688 * Makefile.am, mono-endian.c. mono-endian.h: include unaligned read routines for
689 platforms that need them.
691 Mon Oct 8 10:43:23 CEST 2001 Paolo Molaro <lupus@ximian.com>
693 * class.c: set the correct type for all the fundamental
694 type when loading the class.
696 2001-10-05 Dick Porter <dick@ximian.com>
698 * threads-pthread.c (pthread_mutex_timedlock): Simple
699 compatibility version for C libraries that lack this call.
701 Thu Oct 4 19:10:30 CEST 2001 Paolo Molaro <lupus@ximian.com>
703 * class.c: MonoTypes stored in MonoClass are stored as
704 fundamental MonoTypes when the class represents a
705 fundamental type (System.Int32, ...).
706 The TypeHandle return by ldtoken is a MonoType*.
707 * icall.c: ves_icall_get_data_chunk () write out all the
708 PE/COFF stuff. Implement ves_icall_define_method (),
709 ves_icall_set_method_body (), ves_icall_type_from_handle ().
710 * image.c: properly skip unknown streams.
711 * loader.h, loader.c: add type_class to mono_defaults.
712 * metadata.c, metadata.h: export compute_size () as
713 mono_metadata_compute_size () with a better interface.
715 * pedump.c: don't try to print the entry point RVA if there is no entry point.
716 * reflection.c, reflection.h: many cleanups, fixes, output method
717 signatures and headers, typedef and typeref info, compress the metadata
718 tables, output all the heap streams, cli header etc.
719 * row-indexes.h: typo fixes.
721 2001-10-04 Dick Porter <dick@ximian.com>
723 * object.h: Add a synchronisation mutex struct to MonoObject
725 * object.c (mono_new_object): Initialise the object
726 synchronisation mutexes
728 * icall.c: System.Threading.Monitor internal calls
731 * threads-pthread.c: System.Threading.Monitor internal calls
733 * threads-types.h: New file, includes the system-specific thread
736 * threads-pthread-types.h:
737 * threads-pthread-types.c: New files, handle pthread-specific
738 synchronisation types
740 * threads-dummy-types.h:
741 * threads-dummy-types.c: New files of dummy support for
742 thread-specific types
746 * pedump.c: include mono-endian.h not endian.h
748 * Makefile.am: More threads files.
749 Name mono-endian.h not endian.h
751 Tue Oct 2 20:33:48 CEST 2001 Paolo Molaro <lupus@ximian.com>
753 * Makefile.am, reflection.h, reflection.c: move here the reflection related
754 stuff and implement a few more bits.
755 * icall.c: a field needs to be dereferenced twice. Do not use the same
756 name for two variables in the same scope.
757 * image.c, image.h: cleanups.
759 2001-10-02 Dietmar Maurer <dietmar@ximian.com>
761 * class.c (mono_class_metadata_init): bug fix: compute the right size
763 Mon Oct 1 20:43:57 CEST 2001 Paolo Molaro <lupus@ximian.com>
765 * icall.c: implemented some of the Reflection internalcalls.
766 * image.c, image.h: start writing out the PE/COFF image.
767 * metadata.h, metadata.c: implement mono_metadata_encode_value ()
768 that does the reverse than decode_blob_size ().
769 * object.c: use mono_metadata_encode_value (). Move here
770 temporary implementation of mono_string_to_utf8 ().
771 * rawbuffer.c: make malloc_map static.
773 Fri Sep 28 19:26:30 CEST 2001 Paolo Molaro <lupus@ximian.com>
775 * metadata.c: fix type comparison for arrays.
776 * loader.h, loader.c: half-assed fix to get more tests work in cygwin.
777 Added a couple of new classes to monodefaults.
778 * icall.c: added a couple of Reflection-related internalcalls.
779 * class.h, class.c: implemented mono_ldtoken () for RuntimeTypeHandles.
780 Added a byval_arg MonoType to MonoClass.
782 2001-09-28 Dick Porter <dick@ximian.com>
786 * threads-pthread.c: Implemented internal calls for
787 LocalDataStoreSlot operations. Applied mutexes around all shared
788 data. Reworked the thread creation and Start() operations to
789 avoid a race condition.
792 * threads-dummy.c: Dummy calls for the LocalDataStoreSlot operations
794 Thu Sep 27 21:45:55 CEST 2001 Paolo Molaro <lupus@ximian.com>
796 * rawbuffer.c: disable mmap on cygwin since it seems to be broken there.
798 Thu Sep 27 19:52:11 CEST 2001 Paolo Molaro <lupus@ximian.com>
800 * class.c, loader.c: warn and return NULL instead of erroring out.
801 * icall.c: added System.AppDomain::getCurDomain().
802 * loader.c: we don't need to lookup the typedef again for p/invoke calls.
804 2001-09-25 Dick Porter <dick@ximian.com>
807 * threads-pthread.c: Implemented timed thread joining and added
808 System.Threading.Thread::Join_internal internal call
810 * icall.c: Added System.Threading.Thread::Join_internal internal call
813 * threads-dummy.c: Dummy calls for System.Thread.Thread::Join_internal
815 Mon Sep 24 18:56:59 CEST 2001 Paolo Molaro <lupus@ximian.com>
817 * object.c, object.h: added mono_ldstr (), mono_string_is_interned () and
818 mono_string_intern () to implement the semantics of the ldstr opcode
819 and the interning of System.Strings.
820 * icall.c: provide hooks to make String::IsIntern and String::Intern
823 2001-09-23 Dick Porter <dick@ximian.com>
826 * threads-dummy.h: New files of dummy threading routines
828 * Makefile.am (THREAD_SOURCE): Arrange to compile different thread
829 support code based on system specifics
831 Rename PTHREAD_LIBS to THREAD_LIBS
833 2001-09-23 Dick Porter <dick@ximian.com>
835 * threads-pthread.c: Implement the System.Threading.Thread::Sleep,
836 Schedule (called when asked to Sleep for 0 ms) and CurrentThread
838 (mono_thread_init): Set up a Thread object instance to return when
839 the main thread calls Thread.CurrentThread
840 (mono_thread_cleanup): Wait for all subthreads to exit
842 * icall.c: New internal calls for System.Threading.Thread::Sleep
843 (including Schedule) and CurrentThread
845 * threads.h: New file, to insulate thread-specific stuff from the
848 2001-09-21 Dick Porter <dick@ximian.com>
851 * threads-pthread.c: New file, for handling pthreads-style
852 threading support. Start() now starts a new thread and executes
853 the ThreadStart delegate instance.
855 * icall.c: Added the internalcall for
856 System.Threading.Thread::Start_internal
858 * Makefile.am: Added new files, and PTHREADS_LIBS to the link line
860 Thu Sep 20 19:37:39 CEST 2001 Paolo Molaro <lupus@ximian.com>
862 * loader.c: work around the different signatures for delegates
863 constructors csc generates in compiled code vs the ones compiled in mscorlib.
865 Tue Sep 18 13:16:32 CEST 2001 Paolo Molaro <lupus@ximian.com>
867 * class.h, class.c: add mono_class_get_field_from_name ().
868 * *: Fix C comments and other ANSI C issues.
870 Mon Sep 10 20:21:34 CEST 2001 Paolo Molaro <lupus@ximian.com>
872 * endian.h, assembly.c: fix some endianness issues.
874 Fri Sep 7 18:40:40 CEST 2001 Paolo Molaro <lupus@ximian.com>
876 * loader.h, load.c: add delegate_class to mono_defaults.
877 Handle runtime provided methods in mono_get_method ().
879 2001-08-29 Dietmar Maurer <dietmar@ximian.com>
881 * loader.c (mono_get_method): use pinvoke for internal call
883 * icall.c: use pinvoke for internal call
885 * loader.c (method_from_memberref): set the method name
887 Wed Aug 29 12:43:41 CEST 2001 Paolo Molaro <lupus@ximian.com>
889 * metadata.c: help the compiler generate better code for
890 mono_class_from_mono_type ().
892 2001-08-28 Dietmar Maurer <dietmar@ximian.com>
894 * class.c (mono_class_metadata_init): delayed computing of the
895 class size to mono_class_metadata_init ()
897 Tue Aug 28 15:47:15 CEST 2001 Paolo Molaro <lupus@ximian.com>
899 * class.c, class.h: add an interfaces member to MonoClass.
900 * image.c, image.h: add assembly_name field to MonoImage
901 from the assembly table.
902 * metadata.c, metadata.h: add mono_metadata_interfaces_from_typedef ().
904 Mon Aug 27 20:12:01 CEST 2001 Paolo Molaro <lupus@ximian.com>
906 * class.c: Handle Array in mono_class_from_mono_type ().
907 * metadata.c, pedump.c: some endian fixes.
909 Mon Aug 27 15:23:23 CEST 2001 Paolo Molaro <lupus@ximian.com>
911 * class.c, loader.c, loader.h: More types handled in mono_class_from_mono_type ().
912 * metadata.c: fix small problem introduced with the latest commit.
914 Mon Aug 27 12:17:17 CEST 2001 Paolo Molaro <lupus@ximian.com>
916 * loader.c, metadata.c, metadata.h: Export mono_metadata_type_equal().
917 We don't need a MonoMetadata pointer anymore to compare signatures in
918 mono_metadata_signature_equal (), update callers.
919 Reduced memory usage an number of allocations for MonoMethodHeader and
922 Sun Aug 26 23:03:09 CEST 2001 Paolo Molaro <lupus@ximian.com>
924 * metadata.c: added compare for szarray.
926 Sun Aug 26 11:34:24 CEST 2001 Paolo Molaro <lupus@ximian.com>
928 * class.h, class.c, loader.h, loader.c: export mono_class_from_mono_type ()
929 and add a couple more types to it and mono_defaults. Give an hint on
930 classes that need implementing in our corlib and are referenced
933 Sat Aug 25 12:52:54 CEST 2001 Paolo Molaro <lupus@ximian.com>
935 * class.h, class.c: keep track if a class is also an Enum.
936 * loader.c: Implement a couple more types for use in libffi
937 marshalling. Gives better diagnostics when failing to dlopen
938 a library. Set method->klass for P/Invoke methods, too.
940 Fri Aug 24 19:30:25 CEST 2001 Paolo Molaro <lupus@ximian.com>
942 * class.c, class.h: add a MonoType this_arg to MonoClass that
943 represents a pointer to an object of the class' type that
944 can be used by the interpreter and later the type cache.
945 Add best guess alignment info for valuetype objects.
947 Fri Aug 24 15:50:31 CEST 2001 Paolo Molaro <lupus@ximian.com>
949 * metadata.h, metadata.c, class.h, class.c: squeezed MonoParam
950 into MonoType: one less level of indirection and allocation and
951 simplifies quite a bit of code. Added cache for MonoTypes that are
952 used frequently, so that we don't need to allocate them all the time.
954 2001-08-24 Dietmar Maurer <dietmar@ximian.com>
956 * class.c (mono_class_create_from_typedef): System.Enum is also a
957 value type, although it does not derive from System.ValueType
958 (maybe a bug in the ms compiler?)
960 * metadata.c (mono_type_size): return the right size for value types
962 * loader.c (mono_get_method): only initialize method header if not abstract
964 * class.c (mono_class_from_mono_type): use mono_default values.
966 2001-08-23 Dietmar Maurer <dietmar@ximian.com>
968 * *: use MonoClass pointers instead of <type_tokens>
970 * class.h: new flag: metadata_inited.
972 * class.c (mono_class_metadata_init): impl.
973 (mono_class_instance_size): impl.
974 (mono_class_data_size): impl.
976 Wed Aug 22 16:27:30 CEST 2001 Paolo Molaro <lupus@ximian.com>
978 * metadata.c, loader.h, loader.c, image.h, image.c, class.h, class.c:
979 MonoClass now has the name and name_space fields.
980 MonoMethod has a pointer to its MonoClass, instead of MonoImage.
981 mono_get_method () takes and optional MonoClass as argument.
982 Removed mono_typedef_from_name() and added mono_class_token_from_name()
983 instead that takes advantage of a map from class names to typedef
986 Tue Aug 21 18:54:58 CEST 2001 Paolo Molaro <lupus@ximian.com>
988 * metadata.c: zero is not a valid alignment boundary.
989 Merge MONO_TYPE_VOID in default decoding code.
991 2001-08-21 Dietmar Maurer <dietmar@ximian.com>
993 * image.h: merged MonoMetadata into MonoImage
995 * class.h: cleanup of MonoArrayClass, use a MonoClass pointer to
996 identify the type of elements.
998 Mon Aug 20 19:39:00 CEST 2001 Paolo Molaro <lupus@ximian.com>
1000 * blob.h: fix MONO_TYPE_TYPEDBYREF value.
1001 * cil-coff.h: split MonoMSDOSHeader and add size info.
1002 * image.c: add some consistency checks.
1003 * metadata.c: fix row size computation: one programmer
1004 error and one LAMESPEC. Handle MONO_TYPE_TYPEDBYREF.
1005 add explanation for the locator routine.
1006 Fix decoding of size in method header.
1008 2001-08-20 Miguel de Icaza <miguel@ximian.com>
1010 * assembly.c (g_concat_dir_and_file): Use _S for string concat.
1011 (g_concat_dir_and_file): Bring g_concat_dir_and_file
1012 function from gnome-libs. This uses the right path separator
1013 based on the OS, and also works around a bug in some systems where
1014 a double slash is not allowed.
1015 (default_assembly_name_resolver): Use g_concat_dir_and_file
1016 (mono_assembly_open): ditto.
1018 2001-08-20 Dietmar Maurer <dietmar@ximian.com>
1020 * metadata.c (mono_metadata_signature_equal): impl.
1022 * *: void is now a realy MonoType (instead of using NULL)
1024 * metadata.c (do_mono_metadata_parse_type): use
1025 mono_metadata_parse_type to parse void value.
1027 Sat Aug 18 12:51:28 CEST 2001 Paolo Molaro <lupus@ximian.com>
1029 * metadata.c, metadata.h: in the signature and method header store
1030 only the space required for holding the loca vars and incoming arguments.
1032 2001-08-15 Dietmar Maurer <dietmar@ximian.com>
1034 * metadata.c (do_mono_metadata_parse_type): treat void like any
1035 other type (instead of assigning NULL);
1037 2001-08-14 Dietmar Maurer <dietmar@ximian.com>
1039 * metadata.c (mono_metadata_parse_mh): fixxed pinned/byref value
1041 2001-08-09 Dietmar Maurer <dietmar@ximian.com>
1043 * image.c (do_mono_image_open): added a cache for arrays.
1045 Sat Aug 4 12:46:02 CEST 2001 Paolo Molaro <lupus@ximian.com>
1047 * metadata.h, metadata.c: add mono_metadata_decode_row_col () to
1048 decode a single column from a row in a metadata table and changes
1049 to take advantage of it in the typedef locator (gives a nice speed up).
1050 Store offset info for function params.
1052 2001-08-02 Dietmar Maurer <dietmar@ximian.com>
1054 * image.h (MONO_IMAGE_IS_CORLIB): removed
1056 Wed Aug 1 22:54:08 CEST 2001 Paolo Molaro <lupus@ximian.com>
1058 * assembly.c: how could mono_assembly_close () had ever worked?
1059 * metadata.c, metadata.h: provide offset info for local vars.
1060 Implement mono_type_size () to take care of alignment as well
1061 as size (it was mono_field_type_size in cli/class.c before).
1063 2001-08-01 Dietmar Maurer <dietmar@ximian.com>
1065 * image.h (MONO_IMAGE_IS_CORLIB): new macro to check root image
1067 * assembly.h (CORLIB_NAME): set to corlib.dll
1069 * assembly.c (mono_assembly_open): replaced strcmp() with !strcmp()
1071 Tue Jul 31 17:54:02 CEST 2001 Paolo Molaro <lupus@ximian.com>
1073 * metadata.h, metadata.c, Makefile.am, private.h, assembly.c, blob.h,
1074 cil-coff.h, image.c, image.h, pedump.c, rawbuffer.c, rawbuffer.h, row-indexes.h,
1075 tokentype.h: massive namespace cleanup.
1077 Mon Jul 30 20:11:01 CEST 2001 Paolo Molaro <lupus@ximian.com>
1079 * metadata.h, metadata.c: decode exception clauses when parsing method header.
1081 2001-07-27 Dietmar Maurer <dietmar@ximian.com>
1083 * metadata.c (mono_metadata_free_type): added check for type !=
1084 NULL (void) before calling mono_metadata_free_type()
1086 Thu Jul 26 19:11:19 CEST 2001 Paolo Molaro <lupus@ximian.com>
1088 * metadata.h, row_indexes.h: added header with enumerations to use
1089 to index in the columns from tables in metadata and to decode coded
1090 tokens: we should start using this instead of embedding magic numbers
1093 Thu Jul 26 13:03:27 CEST 2001 Paolo Molaro <lupus@ximian.com>
1095 * assembly.c, cil-coff.h, image.c, image.h, pedump.c, typedef.c:
1096 Move metadata_t info from cli_image_info_t to MonoImage, where
1097 it's easily accessible. Changed all the uses accordingly.
1098 Added the method and class caches to MonoImage.
1099 * metadata.c, metadata.h: Changed mono_metadata_decode_blob_size ()
1100 and mono_metadata_decode_value () signature to be more consistent
1101 with the other parse functions (and simplify code). Taken advantage
1102 of zero-length array allocation with GCC. Removed reduntant (and
1103 wrong) MonoFieldType struct and use MonoParam instead. Changed
1104 mono_metadata_parse_field_type () to use common code for parsing.
1105 Added mono_metadata_typedef_from_field () and
1106 mono_metadata_typedef_from_method () to lookup a typedef index from a
1107 field or method token.
1108 Pack the MonoRetType structure more tightly (fits in 8 bytes now).
1110 2001-07-23 Miguel de Icaza <miguel@ximian.com>
1112 * metadata.c (mono_metadata_parse_field_type): Implement.
1113 (do_mono_metadata_parse_type): Split engine from
1114 mono_metadata_parse_type, so that we can create smaller structures
1115 for things that just have one pointer to the MonoType (look at
1118 2001-07-20 Miguel de Icaza <miguel@ximian.com>
1120 * metadata.c (mono_metadata_parse_mh): Correct the implementation,
1121 as Jan Gray found out, it is incorrect.
1123 2001-07-18 Miguel de Icaza <miguel@ximian.com>
1125 * assembly.c: Implement asssembly loading. This loads an image
1126 and loads all the referenced assemblies. Come to think of it, we
1127 could always do lazy loading of the assemblies.
1129 * image.c (mono_image_open): Keep loaded images in a hashtable.
1131 * image.h (MonoImage): Add reference count.
1133 2001-07-17 Miguel de Icaza <miguel@ximian.com>
1135 * assembly.c (mono_assembly_open): Keep track of the file name in
1136 case the assembly has no ASSEMBLY table.
1138 * metadata.h: Fixed Paolo's quick hack. Put the documnentation
1141 Sun Jul 15 19:39:06 CEST 2001 Paolo Molaro <lupus@ximian.com>
1143 * metadata.c, metadata.h: decode local vars in method header
1144 parse function. Change callers accordingly.
1146 Sun Jul 15 17:40:47 CEST 2001 Paolo Molaro <lupus@ximian.com>
1148 * metadata.h, cil-coff.h: protect against multiple inclusion.
1149 Added some new structures to hold information decoded from metadata:
1150 MonoType, MonoParam, MonoArray, MonoMethod, MonoMethodSignature
1151 and relevant decoding/free functions.
1152 * metadata.c: implement decoding functions. Add warning for out of bounds
1153 index in mono_metadata_locate(). Implement mono_get_method () to retreive
1154 all the info about a method signature and invocation. Remove check on
1155 uninitialized local var in parse_mh() and fix memory leak.
1157 2001-07-12 Miguel de Icaza <miguel@ximian.com>
1159 * metadata.h: More macros.
1161 * tokentype.h: New file.
1163 Fri Jul 6 11:30:53 CEST 2001 Paolo Molaro <lupus@ximian.com>
1165 * assembly.c: added a consistency check and initialize
1166 some structures with g_new0().
1167 * metadata.c: fixed a couple more bugs in table size computation
1168 and add other checks for out-of bound access to metadata.
1170 Thu Jul 5 22:34:21 CEST 2001 Paolo Molaro <lupus@ximian.com>
1172 * metatada.c: fix bugs computing table sizes. Spew a
1173 warning when index in string heap is out of bounds.
1175 2001-07-04 Miguel de Icaza <miguel@ximian.com>
1177 * metadata.h: Add a couple of macros to manipulate tokens.
1179 Tue Jul 3 18:33:32 CEST 2001 Paolo Molaro <lupus@ximian.com>
1181 * assembly.c: g_free(ii->cli_sections) (and avoid double free of
1182 cli_section_tables).
1184 2001-07-01 Miguel de Icaza <miguel@ximian.com>
1186 * metadata.c (mono_metadata_user_string): New function, provides
1187 access to the UserString heap.
1189 2001-06-27 Miguel de Icaza <miguel@ximian.com>
1191 * metadata.c: Add inline documentation.
1193 2001-06-26 Miguel de Icaza <miguel@ximian.com>
1195 * propertyattr.h, paramattr.h, methodsem.h, methodattr.h: New
1198 2001-06-22 Miguel de Icaza <miguel@ximian.com>
1200 * typeattr.h: New file, TypeAttribute flags.
1202 2001-06-21 Miguel de Icaza <miguel@ximian.com>
1204 * mono/metadata/assembly.c (mono_assembly_ensure_section_idx,
1205 mono_assembly_ensure_section): Section loading code.
1206 (load_section_tables): Load the sections.
1208 * mono/metadata/metadata.c (mono_metadata_locate_token,
1209 mono_metadata_locate): Functions to locate the information
1210 definition given a token or a table and an index.
1211 (mono_metadata_compute_table_bases): New.
1212 (compute_size): New function to compute the sizes of the various
1215 * mono/metadata/metadata.h: Finish listing the different index
1218 * mono/metadata/pedump.c: Improve to dump new information.
1220 2001-06-19 Miguel de Icaza <miguel@ximian.com>
1222 * mono/metadata/metadata.c: Entered all the tables matching
1225 * mono/metadata/assembly.c (load_metadata_ptrs): Fix for Beta2