dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h, 1.65, 1.66 int_table


From: Richard Baumann <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h, 1.65, 1.66 int_table.c, 1.67, 1.68 lib_emit.c, 1.13, 1.14
Date: Sun, 20 Jul 2003 00:59:12 -0400

Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv16434/engine

Modified Files:
        int_proto.h int_table.c lib_emit.c 
Log Message:
Implement most of the remaining lib_emit icalls.


Index: int_proto.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_proto.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** int_proto.h 26 Jun 2003 03:39:25 -0000      1.65
--- int_proto.h 20 Jul 2003 04:59:09 -0000      1.66
***************
*** 6,18 ****
  extern ILObject * _IL_Object_MemberwiseClone(ILExecThread * _thread, ILObject 
* _this);
  
- extern ILObject * _IL_Enum_GetEnumValue(ILExecThread * _thread, ILObject * 
_this);
- extern ILString * _IL_Enum_FormatEnumWithFlags(ILExecThread * _thread, 
ILObject * _p1, ILObject * _p2);
- extern ILString * _IL_Enum_GetEnumName(ILExecThread * _thread, ILObject * 
_p1, ILObject * _p2);
- extern ILBool _IL_Enum_IsEnumValue(ILExecThread * _thread, ILObject * _p1, 
ILObject * _p2);
- extern ILObject * _IL_Enum_GetEnumValueFromName(ILExecThread * _thread, 
ILObject * _p1, ILString * _p2, ILBool _p3);
- extern ILObject * _IL_Enum_EnumValueOr(ILExecThread * _thread, ILObject * 
_p1, ILObject * _p2);
- extern ILObject * _IL_Enum_EnumIntToObject(ILExecThread * _thread, ILObject * 
_p1, ILInt32 _p2);
- extern ILObject * _IL_Enum_EnumLongToObject(ILExecThread * _thread, ILObject 
* _p1, ILInt64 _p2);
- 
  extern void _IL_ArgIterator_ctor_RuntimeArgumentHandle(ILExecThread * 
_thread, void * _this, void * _p1);
  extern void _IL_ArgIterator_ctor_RuntimeArgumentHandlepV(ILExecThread * 
_thread, void * _this, void * _p1, void * _p2);
--- 6,9 ----
***************
*** 23,29 ****
  extern ILInt32 _IL_ArgIterator_GetRemainingCount(ILExecThread * _thread, void 
* _this);
  
- extern void _IL_Array_Initialize(ILExecThread * _thread, ILObject * _this);
- extern ILObject * _IL_Array_CreateArray_jiiii(ILExecThread * _thread, 
ILNativeInt _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5);
- extern void _IL_Array_Set_Objectiii(ILExecThread * _thread, ILObject * _this, 
ILObject * _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4);
  extern ILObject * _IL_Array_Get_iii(ILExecThread * _thread, ILObject * _this, 
ILInt32 _p1, ILInt32 _p2, ILInt32 _p3);
  extern ILInt32 _IL_Array_GetLowerBound(ILExecThread * _thread, ILObject * 
_this, ILInt32 _p1);
--- 14,17 ----
***************
*** 31,45 ****
--- 19,45 ----
  extern ILInt32 _IL_Array_GetRank(ILExecThread * _thread, ILObject * _this);
  extern void _IL_Array_Clear(ILExecThread * _thread, ILObject * _p1, ILInt32 
_p2, ILInt32 _p3);
+ extern void _IL_Array_Initialize(ILExecThread * _thread, ILObject * _this);
  extern void _IL_Array_InternalCopy(ILExecThread * _thread, ILObject * _p1, 
ILInt32 _p2, ILObject * _p3, ILInt32 _p4, ILInt32 _p5);
  extern ILObject * _IL_Array_GetRelative(ILExecThread * _thread, ILObject * 
_this, ILInt32 _p1);
  extern void _IL_Array_SetRelative(ILExecThread * _thread, ILObject * _this, 
ILObject * _p1, ILInt32 _p2);
  extern ILInt32 _IL_Array_GetLength_(ILExecThread * _thread, ILObject * _this);
+ extern ILObject * _IL_Array_CreateArray_jiiii(ILExecThread * _thread, 
ILNativeInt _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5);
  extern ILObject * _IL_Array_CreateArray_jaiai(ILExecThread * _thread, 
ILNativeInt _p1, System_Array * _p2, System_Array * _p3);
  extern ILObject * _IL_Array_Get_ai(ILExecThread * _thread, ILObject * _this, 
System_Array * _p1);
  extern ILInt32 _IL_Array_GetLength_i(ILExecThread * _thread, ILObject * 
_this, ILInt32 _p1);
+ extern void _IL_Array_Set_Objectiii(ILExecThread * _thread, ILObject * _this, 
ILObject * _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4);
  extern void _IL_Array_Set_Objectai(ILExecThread * _thread, ILObject * _this, 
ILObject * _p1, System_Array * _p2);
  
  extern ILObject * _IL_Delegate_CreateBlankDelegate(ILExecThread * _thread, 
ILObject * _p1, ILObject * _p2);
  
+ extern ILObject * _IL_Enum_GetEnumValue(ILExecThread * _thread, ILObject * 
_this);
+ extern ILString * _IL_Enum_FormatEnumWithFlags(ILExecThread * _thread, 
ILObject * _p1, ILObject * _p2);
+ extern ILString * _IL_Enum_GetEnumName(ILExecThread * _thread, ILObject * 
_p1, ILObject * _p2);
+ extern ILBool _IL_Enum_IsEnumValue(ILExecThread * _thread, ILObject * _p1, 
ILObject * _p2);
+ extern ILObject * _IL_Enum_GetEnumValueFromName(ILExecThread * _thread, 
ILObject * _p1, ILString * _p2, ILBool _p3);
+ extern ILObject * _IL_Enum_EnumValueOr(ILExecThread * _thread, ILObject * 
_p1, ILObject * _p2);
+ extern ILObject * _IL_Enum_EnumIntToObject(ILExecThread * _thread, ILObject * 
_p1, ILInt32 _p2);
+ extern ILObject * _IL_Enum_EnumLongToObject(ILExecThread * _thread, ILObject 
* _p1, ILInt64 _p2);
+ 
  extern ILBool _IL_BitConverter_GetLittleEndian(ILExecThread * _thread);
  extern ILInt64 _IL_BitConverter_DoubleToInt64Bits(ILExecThread * _thread, 
ILDouble _p1);
***************
*** 109,122 ****
  
  extern System_String * _IL_String_Concat_StringString(ILExecThread * _thread, 
System_String * _p1, System_String * _p2);
- extern System_String * _IL_String_ctor_acii(ILExecThread * _thread, 
System_Array * _p1, ILInt32 _p2, ILInt32 _p3);
  extern System_String * _IL_String_ctor_ci(ILExecThread * _thread, ILUInt16 
_p1, ILInt32 _p2);
  extern System_String * _IL_String_ctor_ac(ILExecThread * _thread, 
System_Array * _p1);
  extern ILBool _IL_String_Equals(ILExecThread * _thread, System_String * _p1, 
System_String * _p2);
  extern ILUInt16 _IL_String_GetChar(ILExecThread * _thread, System_String * 
_this, ILInt32 _p1);
  extern System_String * _IL_String_NewString(ILExecThread * _thread, ILInt32 
_p1);
  extern void _IL_String_Copy_StringiStringii(ILExecThread * _thread, 
System_String * _p1, ILInt32 _p2, System_String * _p3, ILInt32 _p4, ILInt32 
_p5);
- extern ILInt32 _IL_String_IndexOf(ILExecThread * _thread, System_String * 
_this, ILUInt16 _p1, ILInt32 _p2, ILInt32 _p3);
  extern ILInt32 _IL_String_InternalCompare(ILExecThread * _thread, 
System_String * _p1, ILInt32 _p2, ILInt32 _p3, System_String * _p4, ILInt32 
_p5, ILInt32 _p6, ILBool _p7, ILObject * _p8);
  extern System_String * _IL_String_Trim(ILExecThread * _thread, System_String 
* _this, System_Array * _p1, ILInt32 _p2);
  extern System_String * _IL_String_ctor_pcii(ILExecThread * _thread, ILUInt16 
* _p1, ILInt32 _p2, ILInt32 _p3);
  extern System_String * _IL_String_ctor_pc(ILExecThread * _thread, ILUInt16 * 
_p1);
--- 109,122 ----
  
  extern System_String * _IL_String_Concat_StringString(ILExecThread * _thread, 
System_String * _p1, System_String * _p2);
  extern System_String * _IL_String_ctor_ci(ILExecThread * _thread, ILUInt16 
_p1, ILInt32 _p2);
  extern System_String * _IL_String_ctor_ac(ILExecThread * _thread, 
System_Array * _p1);
  extern ILBool _IL_String_Equals(ILExecThread * _thread, System_String * _p1, 
System_String * _p2);
  extern ILUInt16 _IL_String_GetChar(ILExecThread * _thread, System_String * 
_this, ILInt32 _p1);
+ extern ILInt32 _IL_String_IndexOf(ILExecThread * _thread, System_String * 
_this, ILUInt16 _p1, ILInt32 _p2, ILInt32 _p3);
  extern System_String * _IL_String_NewString(ILExecThread * _thread, ILInt32 
_p1);
  extern void _IL_String_Copy_StringiStringii(ILExecThread * _thread, 
System_String * _p1, ILInt32 _p2, System_String * _p3, ILInt32 _p4, ILInt32 
_p5);
  extern ILInt32 _IL_String_InternalCompare(ILExecThread * _thread, 
System_String * _p1, ILInt32 _p2, ILInt32 _p3, System_String * _p4, ILInt32 
_p5, ILInt32 _p6, ILBool _p7, ILObject * _p8);
  extern System_String * _IL_String_Trim(ILExecThread * _thread, System_String 
* _this, System_Array * _p1, ILInt32 _p2);
+ extern System_String * _IL_String_ctor_acii(ILExecThread * _thread, 
System_Array * _p1, ILInt32 _p2, ILInt32 _p3);
  extern System_String * _IL_String_ctor_pcii(ILExecThread * _thread, ILUInt16 
* _p1, ILInt32 _p2, ILInt32 _p3);
  extern System_String * _IL_String_ctor_pc(ILExecThread * _thread, ILUInt16 * 
_p1);
***************
*** 180,183 ****
--- 180,184 ----
  
  extern ILInt32 _IL_Thread_InternalGetThreadId(ILExecThread * _thread);
+ extern ILObject * _IL_Thread_InternalCurrentThread(ILExecThread * _thread);
  extern void _IL_Thread_InitializeThread(ILExecThread * _thread, ILObject * 
_this);
  extern void _IL_Thread_FinalizeThread(ILExecThread * _thread, ILObject * 
_this);
***************
*** 214,218 ****
  extern void _IL_Thread_VolatileWrite_Rdd(ILExecThread * _thread, ILDouble * 
_p1, ILDouble _p2);
  extern void _IL_Thread_VolatileWrite_RObjectObject(ILExecThread * _thread, 
ILObject * * _p1, ILObject * _p2);
- extern ILObject * _IL_Thread_InternalCurrentThread(ILExecThread * _thread);
  extern ILInt32 _IL_Thread_InternalGetState(ILExecThread * _thread, ILObject * 
_this);
  extern void _IL_Thread_InternalSetBackground(ILExecThread * _thread, ILObject 
* _this, ILBool _p1);
--- 215,218 ----
***************
*** 333,336 ****
--- 333,346 ----
  extern ILObject * _IL_ClrMethod_GetBaseDefinition(ILExecThread * _thread, 
ILObject * _this);
  
+ extern ILInt32 _IL_ClrParameter_GetParamAttrs(ILExecThread * _thread, 
ILNativeInt _p1);
+ extern ILString * _IL_ClrParameter_GetParamName(ILExecThread * _thread, 
ILNativeInt _p1);
+ extern ILObject * _IL_ClrParameter_GetDefault(ILExecThread * _thread, 
ILNativeInt _p1);
+ 
+ extern ILObject * _IL_ClrProperty_GetPropertyType(ILExecThread * _thread, 
ILNativeInt _p1);
+ 
+ extern ILInt32 _IL_ClrResourceStream_ResourceRead(ILExecThread * _thread, 
ILNativeInt _p1, ILInt64 _p2, System_Array * _p3, ILInt32 _p4, ILInt32 _p5);
+ extern ILInt32 _IL_ClrResourceStream_ResourceReadByte(ILExecThread * _thread, 
ILNativeInt _p1, ILInt64 _p2);
+ extern ILUInt8 * _IL_ClrResourceStream_ResourceGetAddress(ILExecThread * 
_thread, ILNativeInt _p1, ILInt64 _p2);
+ 
  extern ILInt32 _IL_ClrType_GetClrArrayRank(ILExecThread * _thread, ILObject * 
_this);
  extern ILInt32 _IL_ClrType_GetAttributeFlagsImpl(ILExecThread * _thread, 
ILObject * _this);
***************
*** 357,370 ****
  extern ILObject * _IL_ClrType_GetGenericType(ILExecThread * _thread, ILObject 
* _this);
  
- extern ILInt32 _IL_ClrParameter_GetParamAttrs(ILExecThread * _thread, 
ILNativeInt _p1);
- extern ILString * _IL_ClrParameter_GetParamName(ILExecThread * _thread, 
ILNativeInt _p1);
- extern ILObject * _IL_ClrParameter_GetDefault(ILExecThread * _thread, 
ILNativeInt _p1);
- 
- extern ILObject * _IL_ClrProperty_GetPropertyType(ILExecThread * _thread, 
ILNativeInt _p1);
- 
- extern ILInt32 _IL_ClrResourceStream_ResourceRead(ILExecThread * _thread, 
ILNativeInt _p1, ILInt64 _p2, System_Array * _p3, ILInt32 _p4, ILInt32 _p5);
- extern ILInt32 _IL_ClrResourceStream_ResourceReadByte(ILExecThread * _thread, 
ILNativeInt _p1, ILInt64 _p2);
- extern ILUInt8 * _IL_ClrResourceStream_ResourceGetAddress(ILExecThread * 
_thread, ILNativeInt _p1, ILInt64 _p2);
- 
  extern ILObject * _IL_Module_GetAssembly(ILExecThread * _thread, ILObject * 
_this);
  extern ILObject * _IL_Module_GetModuleType(ILExecThread * _thread, ILObject * 
_this);
--- 367,370 ----
***************
*** 375,379 ****
  
  extern ILNativeInt _IL_AssemblyBuilder_ClrAssemblyCreate(ILExecThread * 
_thread, ILString * _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5, 
ILInt32 _p6, ILNativeInt * writer);
! extern void _IL_AssemblyBuilder_ClrSetEntryPoint(ILExecThread * _thread, 
ILObject * _this, ILNativeInt _p1, ILInt32 _p2);
  extern ILInt32 _IL_AssemblyBuilder_ClrGetItemToken(ILExecThread * _thread, 
ILNativeInt _p1);
  extern ILNativeInt _IL_AssemblyBuilder_ClrGetItemFromToken(ILExecThread * 
_thread, ILNativeInt _p1, ILInt32 _p2);
--- 375,379 ----
  
  extern ILNativeInt _IL_AssemblyBuilder_ClrAssemblyCreate(ILExecThread * 
_thread, ILString * _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5, 
ILInt32 _p6, ILNativeInt * writer);
! extern ILBool _IL_AssemblyBuilder_ClrSave(ILExecThread * _thread, ILNativeInt 
_p1, ILNativeInt _p2, ILString * _p3, ILNativeInt _p4, ILInt32 _p5);
  extern ILInt32 _IL_AssemblyBuilder_ClrGetItemToken(ILExecThread * _thread, 
ILNativeInt _p1);
  extern ILNativeInt _IL_AssemblyBuilder_ClrGetItemFromToken(ILExecThread * 
_thread, ILNativeInt _p1, ILInt32 _p2);

Index: int_table.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_table.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** int_table.c 26 Jun 2003 03:39:25 -0000      1.67
--- int_table.c 20 Jul 2003 04:59:09 -0000      1.68
***************
*** 41,95 ****
  #if !defined(HAVE_LIBFFI)
  
- static void marshal_pppp(void (*fn)(), void *rvalue, void **avalue)
- {
-       *((void * *)rvalue) = (*(void * (*)(void *, void *, void *))fn)(*((void 
* *)(avalue[0])), *((void * *)(avalue[1])), *((void * *)(avalue[2])));
- }
- 
- #endif
- 
- #if !defined(HAVE_LIBFFI)
- 
- static void marshal_ppppb(void (*fn)(), void *rvalue, void **avalue)
- {
-       *((void * *)rvalue) = (*(void * (*)(void *, void *, void *, 
ILInt8))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((void * 
*)(avalue[2])), *((ILInt8 *)(avalue[3])));
- }
- 
- #endif
- 
- #if !defined(HAVE_LIBFFI)
- 
- static void marshal_pppi(void (*fn)(), void *rvalue, void **avalue)
- {
-       *((void * *)rvalue) = (*(void * (*)(void *, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])));
- }
- 
- #endif
- 
- #if !defined(HAVE_LIBFFI)
- 
- static void marshal_pppl(void (*fn)(), void *rvalue, void **avalue)
- {
-       *((void * *)rvalue) = (*(void * (*)(void *, void *, 
ILInt64))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt64 
*)(avalue[2])));
- }
- 
- #endif
- 
- #ifndef _IL_Enum_suppressed
- 
- IL_METHOD_BEGIN(Enum_Methods)
-       IL_METHOD("GetEnumValue", "(T)oSystem.Object;", _IL_Enum_GetEnumValue, 
marshal_ppp)
-       IL_METHOD("FormatEnumWithFlags", 
"(oSystem.Type;oSystem.Object;)oSystem.String;", _IL_Enum_FormatEnumWithFlags, 
marshal_pppp)
-       IL_METHOD("GetEnumName", 
"(oSystem.Type;oSystem.Object;)oSystem.String;", _IL_Enum_GetEnumName, 
marshal_pppp)
-       IL_METHOD("IsEnumValue", "(oSystem.Type;oSystem.Object;)Z", 
_IL_Enum_IsEnumValue, marshal_bppp)
-       IL_METHOD("GetEnumValueFromName", 
"(oSystem.Type;oSystem.String;Z)oSystem.Object;", 
_IL_Enum_GetEnumValueFromName, marshal_ppppb)
-       IL_METHOD("EnumValueOr", 
"(oSystem.Object;oSystem.Object;)oSystem.Object;", _IL_Enum_EnumValueOr, 
marshal_pppp)
-       IL_METHOD("EnumIntToObject", "(oSystem.Type;i)oSystem.Object;", 
_IL_Enum_EnumIntToObject, marshal_pppi)
-       IL_METHOD("EnumLongToObject", "(oSystem.Type;l)oSystem.Object;", 
_IL_Enum_EnumLongToObject, marshal_pppl)
- IL_METHOD_END
- 
- #endif
- 
- #if !defined(HAVE_LIBFFI)
- 
  static void marshal_vppp(void (*fn)(), void *rvalue, void **avalue)
  {
--- 41,44 ----
***************
*** 151,157 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ppjiiii(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, ILNativeUInt, ILInt32, 
ILInt32, ILInt32, ILInt32))fn)(*((void * *)(avalue[0])), *((ILNativeUInt 
*)(avalue[1])), *((ILInt32 *)(avalue[2])), *((ILInt32 *)(avalue[3])), 
*((ILInt32 *)(avalue[4])), *((ILInt32 *)(avalue[5])));
  }
  
--- 100,106 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_pppiii(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, void *, ILInt32, ILInt32, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])), *((ILInt32 *)(avalue[3])), *((ILInt32 *)(avalue[4])));
  }
  
***************
*** 160,166 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_vpppiii(void (*fn)(), void *rvalue, void **avalue)
  {
!       (*(void (*)(void *, void *, void *, ILInt32, ILInt32, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((void * 
*)(avalue[2])), *((ILInt32 *)(avalue[3])), *((ILInt32 *)(avalue[4])), 
*((ILInt32 *)(avalue[5])));
  }
  
--- 109,115 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ippi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])));
  }
  
***************
*** 169,175 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_pppiii(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, void *, ILInt32, ILInt32, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])), *((ILInt32 *)(avalue[3])), *((ILInt32 *)(avalue[4])));
  }
  
--- 118,124 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_vppii(void (*fn)(), void *rvalue, void **avalue)
  {
!       (*(void (*)(void *, void *, ILInt32, ILInt32))fn)(*((void * 
*)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 *)(avalue[2])), *((ILInt32 
*)(avalue[3])));
  }
  
***************
*** 178,184 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ippi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])));
  }
  
--- 127,133 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_vppipii(void (*fn)(), void *rvalue, void **avalue)
  {
!       (*(void (*)(void *, void *, ILInt32, void *, ILInt32, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])), *((void * *)(avalue[3])), *((ILInt32 *)(avalue[4])), *((ILInt32 
*)(avalue[5])));
  }
  
***************
*** 187,193 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_vppii(void (*fn)(), void *rvalue, void **avalue)
  {
!       (*(void (*)(void *, void *, ILInt32, ILInt32))fn)(*((void * 
*)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 *)(avalue[2])), *((ILInt32 
*)(avalue[3])));
  }
  
--- 136,142 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_pppi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])));
  }
  
***************
*** 196,202 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_vppipii(void (*fn)(), void *rvalue, void **avalue)
  {
!       (*(void (*)(void *, void *, ILInt32, void *, ILInt32, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])), *((void * *)(avalue[3])), *((ILInt32 *)(avalue[4])), *((ILInt32 
*)(avalue[5])));
  }
  
--- 145,151 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_vpppi(void (*fn)(), void *rvalue, void **avalue)
  {
!       (*(void (*)(void *, void *, void *, ILInt32))fn)(*((void * 
*)(avalue[0])), *((void * *)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32 
*)(avalue[3])));
  }
  
***************
*** 205,211 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_vpppi(void (*fn)(), void *rvalue, void **avalue)
  {
!       (*(void (*)(void *, void *, void *, ILInt32))fn)(*((void * 
*)(avalue[0])), *((void * *)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32 
*)(avalue[3])));
  }
  
--- 154,160 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ppjiiii(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, ILNativeUInt, ILInt32, 
ILInt32, ILInt32, ILInt32))fn)(*((void * *)(avalue[0])), *((ILNativeUInt 
*)(avalue[1])), *((ILInt32 *)(avalue[2])), *((ILInt32 *)(avalue[3])), 
*((ILInt32 *)(avalue[4])), *((ILInt32 *)(avalue[5])));
  }
  
***************
*** 221,230 ****
  #endif
  
  #ifndef _IL_Array_suppressed
  
  IL_METHOD_BEGIN(Array_Methods)
-       IL_METHOD("Initialize", "(T)V", _IL_Array_Initialize, marshal_vpp)
-       IL_METHOD("CreateArray", "(jiiii)oSystem.Array;", 
_IL_Array_CreateArray_jiiii, marshal_ppjiiii)
-       IL_METHOD("Set", "(ToSystem.Object;iii)V", _IL_Array_Set_Objectiii, 
marshal_vpppiii)
        IL_METHOD("Get", "(Tiii)oSystem.Object;", _IL_Array_Get_iii, 
marshal_pppiii)
        IL_METHOD("GetLowerBound", "(Ti)i", _IL_Array_GetLowerBound, 
marshal_ippi)
--- 170,194 ----
  #endif
  
+ #if !defined(HAVE_LIBFFI)
+ 
+ static void marshal_pppp(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((void * *)rvalue) = (*(void * (*)(void *, void *, void *))fn)(*((void 
* *)(avalue[0])), *((void * *)(avalue[1])), *((void * *)(avalue[2])));
+ }
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
+ static void marshal_vpppiii(void (*fn)(), void *rvalue, void **avalue)
+ {
+       (*(void (*)(void *, void *, void *, ILInt32, ILInt32, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((void * 
*)(avalue[2])), *((ILInt32 *)(avalue[3])), *((ILInt32 *)(avalue[4])), 
*((ILInt32 *)(avalue[5])));
+ }
+ 
+ #endif
+ 
  #ifndef _IL_Array_suppressed
  
  IL_METHOD_BEGIN(Array_Methods)
        IL_METHOD("Get", "(Tiii)oSystem.Object;", _IL_Array_Get_iii, 
marshal_pppiii)
        IL_METHOD("GetLowerBound", "(Ti)i", _IL_Array_GetLowerBound, 
marshal_ippi)
***************
*** 232,242 ****
--- 196,209 ----
        IL_METHOD("GetRank", "(T)i", _IL_Array_GetRank, marshal_ipp)
        IL_METHOD("Clear", "(oSystem.Array;ii)V", _IL_Array_Clear, 
marshal_vppii)
+       IL_METHOD("Initialize", "(T)V", _IL_Array_Initialize, marshal_vpp)
        IL_METHOD("InternalCopy", "(oSystem.Array;ioSystem.Array;ii)V", 
_IL_Array_InternalCopy, marshal_vppipii)
        IL_METHOD("GetRelative", "(Ti)oSystem.Object;", _IL_Array_GetRelative, 
marshal_pppi)
        IL_METHOD("SetRelative", "(ToSystem.Object;i)V", _IL_Array_SetRelative, 
marshal_vpppi)
        IL_METHOD("GetLength", "(T)i", _IL_Array_GetLength_, marshal_ipp)
+       IL_METHOD("CreateArray", "(jiiii)oSystem.Array;", 
_IL_Array_CreateArray_jiiii, marshal_ppjiiii)
        IL_METHOD("CreateArray", "(j[i[i)oSystem.Array;", 
_IL_Array_CreateArray_jaiai, marshal_ppjpp)
        IL_METHOD("Get", "(T[i)oSystem.Object;", _IL_Array_Get_ai, marshal_pppp)
        IL_METHOD("GetLength", "(Ti)i", _IL_Array_GetLength_i, marshal_ippi)
+       IL_METHOD("Set", "(ToSystem.Object;iii)V", _IL_Array_Set_Objectiii, 
marshal_vpppiii)
        IL_METHOD("Set", "(ToSystem.Object;[i)V", _IL_Array_Set_Objectai, 
marshal_vpppp)
  IL_METHOD_END
***************
*** 254,257 ****
--- 221,257 ----
  #if !defined(HAVE_LIBFFI)
  
+ static void marshal_ppppb(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((void * *)rvalue) = (*(void * (*)(void *, void *, void *, 
ILInt8))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((void * 
*)(avalue[2])), *((ILInt8 *)(avalue[3])));
+ }
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
+ static void marshal_pppl(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((void * *)rvalue) = (*(void * (*)(void *, void *, 
ILInt64))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt64 
*)(avalue[2])));
+ }
+ 
+ #endif
+ 
+ #ifndef _IL_Enum_suppressed
+ 
+ IL_METHOD_BEGIN(Enum_Methods)
+       IL_METHOD("GetEnumValue", "(T)oSystem.Object;", _IL_Enum_GetEnumValue, 
marshal_ppp)
+       IL_METHOD("FormatEnumWithFlags", 
"(oSystem.Type;oSystem.Object;)oSystem.String;", _IL_Enum_FormatEnumWithFlags, 
marshal_pppp)
+       IL_METHOD("GetEnumName", 
"(oSystem.Type;oSystem.Object;)oSystem.String;", _IL_Enum_GetEnumName, 
marshal_pppp)
+       IL_METHOD("IsEnumValue", "(oSystem.Type;oSystem.Object;)Z", 
_IL_Enum_IsEnumValue, marshal_bppp)
+       IL_METHOD("GetEnumValueFromName", 
"(oSystem.Type;oSystem.String;Z)oSystem.Object;", 
_IL_Enum_GetEnumValueFromName, marshal_ppppb)
+       IL_METHOD("EnumValueOr", 
"(oSystem.Object;oSystem.Object;)oSystem.Object;", _IL_Enum_EnumValueOr, 
marshal_pppp)
+       IL_METHOD("EnumIntToObject", "(oSystem.Type;i)oSystem.Object;", 
_IL_Enum_EnumIntToObject, marshal_pppi)
+       IL_METHOD("EnumLongToObject", "(oSystem.Type;l)oSystem.Object;", 
_IL_Enum_EnumLongToObject, marshal_pppl)
+ IL_METHOD_END
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
  static void marshal_bp(void (*fn)(), void *rvalue, void **avalue)
  {
***************
*** 581,587 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_pppii(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, void *, ILInt32, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])), *((ILInt32 *)(avalue[3])));
  }
  
--- 581,587 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ppSi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, ILUInt16, 
ILInt32))fn)(*((void * *)(avalue[0])), *((ILUInt16 *)(avalue[1])), *((ILInt32 
*)(avalue[2])));
  }
  
***************
*** 590,596 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ppSi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, ILUInt16, 
ILInt32))fn)(*((void * *)(avalue[0])), *((ILUInt16 *)(avalue[1])), *((ILInt32 
*)(avalue[2])));
  }
  
--- 590,596 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_Sppi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeUInt *)rvalue) = (*(ILUInt16 (*)(void *, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])));
  }
  
***************
*** 599,605 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_Sppi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeUInt *)rvalue) = (*(ILUInt16 (*)(void *, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])));
  }
  
--- 599,605 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ippSii(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, void *, ILUInt16, 
ILInt32, ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), 
*((ILUInt16 *)(avalue[2])), *((ILInt32 *)(avalue[3])), *((ILInt32 
*)(avalue[4])));
  }
  
***************
*** 617,623 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ippSii(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, void *, ILUInt16, 
ILInt32, ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), 
*((ILUInt16 *)(avalue[2])), *((ILInt32 *)(avalue[3])), *((ILInt32 
*)(avalue[4])));
  }
  
--- 617,623 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ippiipiibp(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, void *, ILInt32, 
ILInt32, void *, ILInt32, ILInt32, ILInt8, void *))fn)(*((void * 
*)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 *)(avalue[2])), *((ILInt32 
*)(avalue[3])), *((void * *)(avalue[4])), *((ILInt32 *)(avalue[5])), *((ILInt32 
*)(avalue[6])), *((ILInt8 *)(avalue[7])), *((void * *)(avalue[8])));
  }
  
***************
*** 626,632 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ippiipiibp(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, void *, ILInt32, 
ILInt32, void *, ILInt32, ILInt32, ILInt8, void *))fn)(*((void * 
*)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 *)(avalue[2])), *((ILInt32 
*)(avalue[3])), *((void * *)(avalue[4])), *((ILInt32 *)(avalue[5])), *((ILInt32 
*)(avalue[6])), *((ILInt8 *)(avalue[7])), *((void * *)(avalue[8])));
  }
  
--- 626,632 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ppppi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, void *, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((void * 
*)(avalue[2])), *((ILInt32 *)(avalue[3])));
  }
  
***************
*** 635,641 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_ppppi(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, void *, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((void * 
*)(avalue[2])), *((ILInt32 *)(avalue[3])));
  }
  
--- 635,641 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_pppii(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((void * *)rvalue) = (*(void * (*)(void *, void *, ILInt32, 
ILInt32))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 
*)(avalue[2])), *((ILInt32 *)(avalue[3])));
  }
  
***************
*** 727,740 ****
  IL_METHOD_BEGIN(String_Methods)
        IL_METHOD("Concat", "(oSystem.String;oSystem.String;)oSystem.String;", 
_IL_String_Concat_StringString, marshal_pppp)
-       IL_CONSTRUCTOR(".ctor", "(T[cii)V", 0, 0, _IL_String_ctor_acii, 
marshal_pppii)
        IL_CONSTRUCTOR(".ctor", "(Tci)V", 0, 0, _IL_String_ctor_ci, 
marshal_ppSi)
        IL_CONSTRUCTOR(".ctor", "(T[c)V", 0, 0, _IL_String_ctor_ac, marshal_ppp)
        IL_METHOD("Equals", "(oSystem.String;oSystem.String;)Z", 
_IL_String_Equals, marshal_bppp)
        IL_METHOD("GetChar", "(Ti)c", _IL_String_GetChar, marshal_Sppi)
        IL_METHOD("NewString", "(i)oSystem.String;", _IL_String_NewString, 
marshal_ppi)
        IL_METHOD("Copy", "(oSystem.String;ioSystem.String;ii)V", 
_IL_String_Copy_StringiStringii, marshal_vppipii)
-       IL_METHOD("IndexOf", "(Tcii)i", _IL_String_IndexOf, marshal_ippSii)
        IL_METHOD("InternalCompare", 
"(oSystem.String;iioSystem.String;iiZoSystem.Globalization.CultureInfo;)i", 
_IL_String_InternalCompare, marshal_ippiipiibp)
        IL_METHOD("Trim", "(T[ci)oSystem.String;", _IL_String_Trim, 
marshal_ppppi)
        IL_CONSTRUCTOR(".ctor", "(T*cii)V", 0, 0, _IL_String_ctor_pcii, 
marshal_pppii)
        IL_CONSTRUCTOR(".ctor", "(T*c)V", 0, 0, _IL_String_ctor_pc, marshal_ppp)
--- 727,740 ----
  IL_METHOD_BEGIN(String_Methods)
        IL_METHOD("Concat", "(oSystem.String;oSystem.String;)oSystem.String;", 
_IL_String_Concat_StringString, marshal_pppp)
        IL_CONSTRUCTOR(".ctor", "(Tci)V", 0, 0, _IL_String_ctor_ci, 
marshal_ppSi)
        IL_CONSTRUCTOR(".ctor", "(T[c)V", 0, 0, _IL_String_ctor_ac, marshal_ppp)
        IL_METHOD("Equals", "(oSystem.String;oSystem.String;)Z", 
_IL_String_Equals, marshal_bppp)
        IL_METHOD("GetChar", "(Ti)c", _IL_String_GetChar, marshal_Sppi)
+       IL_METHOD("IndexOf", "(Tcii)i", _IL_String_IndexOf, marshal_ippSii)
        IL_METHOD("NewString", "(i)oSystem.String;", _IL_String_NewString, 
marshal_ppi)
        IL_METHOD("Copy", "(oSystem.String;ioSystem.String;ii)V", 
_IL_String_Copy_StringiStringii, marshal_vppipii)
        IL_METHOD("InternalCompare", 
"(oSystem.String;iioSystem.String;iiZoSystem.Globalization.CultureInfo;)i", 
_IL_String_InternalCompare, marshal_ippiipiibp)
        IL_METHOD("Trim", "(T[ci)oSystem.String;", _IL_String_Trim, 
marshal_ppppi)
+       IL_CONSTRUCTOR(".ctor", "(T[cii)V", 0, 0, _IL_String_ctor_acii, 
marshal_pppii)
        IL_CONSTRUCTOR(".ctor", "(T*cii)V", 0, 0, _IL_String_ctor_pcii, 
marshal_pppii)
        IL_CONSTRUCTOR(".ctor", "(T*c)V", 0, 0, _IL_String_ctor_pc, marshal_ppp)
***************
*** 964,967 ****
--- 964,976 ----
  #if !defined(HAVE_LIBFFI)
  
+ static void marshal_pp(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((void * *)rvalue) = (*(void * (*)(void *))fn)(*((void * 
*)(avalue[0])));
+ }
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
  static void marshal_vpi(void (*fn)(), void *rvalue, void **avalue)
  {
***************
*** 1124,1140 ****
  #endif
  
- #if !defined(HAVE_LIBFFI)
- 
- static void marshal_pp(void (*fn)(), void *rvalue, void **avalue)
- {
-       *((void * *)rvalue) = (*(void * (*)(void *))fn)(*((void * 
*)(avalue[0])));
- }
- 
- #endif
- 
  #ifndef _IL_Thread_suppressed
  
  IL_METHOD_BEGIN(Thread_Methods)
        IL_METHOD("InternalGetThreadId", "()i", _IL_Thread_InternalGetThreadId, 
marshal_ip)
        IL_METHOD("InitializeThread", "(T)V", _IL_Thread_InitializeThread, 
marshal_vpp)
        IL_METHOD("FinalizeThread", "(T)V", _IL_Thread_FinalizeThread, 
marshal_vpp)
--- 1133,1141 ----
  #endif
  
  #ifndef _IL_Thread_suppressed
  
  IL_METHOD_BEGIN(Thread_Methods)
        IL_METHOD("InternalGetThreadId", "()i", _IL_Thread_InternalGetThreadId, 
marshal_ip)
+       IL_METHOD("InternalCurrentThread", "()oSystem.Threading.Thread;", 
_IL_Thread_InternalCurrentThread, marshal_pp)
        IL_METHOD("InitializeThread", "(T)V", _IL_Thread_InitializeThread, 
marshal_vpp)
        IL_METHOD("FinalizeThread", "(T)V", _IL_Thread_FinalizeThread, 
marshal_vpp)
***************
*** 1171,1175 ****
        IL_METHOD("VolatileWrite", "(&dd)V", _IL_Thread_VolatileWrite_Rdd, 
marshal_vppd)
        IL_METHOD("VolatileWrite", "(&oSystem.Object;oSystem.Object;)V", 
_IL_Thread_VolatileWrite_RObjectObject, marshal_vppp)
-       IL_METHOD("InternalCurrentThread", "()oSystem.Threading.Thread;", 
_IL_Thread_InternalCurrentThread, marshal_pp)
        IL_METHOD("InternalGetState", "(T)vSystem.Threading.ThreadState;", 
_IL_Thread_InternalGetState, marshal_ipp)
        IL_METHOD("InternalSetBackground", "(TZ)V", 
_IL_Thread_InternalSetBackground, marshal_vppb)
--- 1172,1175 ----
***************
*** 1737,1788 ****
  #endif
  
- #if !defined(HAVE_LIBFFI)
- 
- static void marshal_ppppiipipp(void (*fn)(), void *rvalue, void **avalue)
- {
-       *((void * *)rvalue) = (*(void * (*)(void *, void *, void *, ILInt32, 
ILInt32, void *, ILInt32, void *, void *))fn)(*((void * *)(avalue[0])), *((void 
* *)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32 *)(avalue[3])), 
*((ILInt32 *)(avalue[4])), *((void * *)(avalue[5])), *((ILInt32 *)(avalue[6])), 
*((void * *)(avalue[7])), *((void * *)(avalue[8])));
- }
- 
- #endif
- 
- #if !defined(HAVE_LIBFFI)
- 
- static void marshal_pppiipp(void (*fn)(), void *rvalue, void **avalue)
- {
-       *((void * *)rvalue) = (*(void * (*)(void *, void *, ILInt32, ILInt32, 
void *, void *))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), 
*((ILInt32 *)(avalue[2])), *((ILInt32 *)(avalue[3])), *((void * *)(avalue[4])), 
*((void * *)(avalue[5])));
- }
- 
- #endif
- 
- #ifndef _IL_ClrType_suppressed
- 
- IL_METHOD_BEGIN(ClrType_Methods)
-       IL_METHOD("GetClrArrayRank", "(T)i", _IL_ClrType_GetClrArrayRank, 
marshal_ipp)
-       IL_METHOD("GetAttributeFlagsImpl", 
"(T)vSystem.Reflection.TypeAttributes;", _IL_ClrType_GetAttributeFlagsImpl, 
marshal_ipp)
-       IL_METHOD("GetClrTypeCategory", 
"(T)vSystem.Reflection.ClrTypeCategory;", _IL_ClrType_GetClrTypeCategory, 
marshal_ipp)
-       IL_METHOD("GetElementType", "(T)oSystem.Type;", 
_IL_ClrType_GetElementType, marshal_ppp)
-       IL_METHOD("GetInterfaces", "(T)[oSystem.Type;", 
_IL_ClrType_GetInterfaces, marshal_ppp)
-       IL_METHOD("IsSubclassOf", "(ToSystem.Type;)Z", 
_IL_ClrType_IsSubclassOf, marshal_bppp)
-       IL_METHOD("GetClrFullName", "(T)oSystem.String;", 
_IL_ClrType_GetClrFullName, marshal_ppp)
-       IL_METHOD("GetClrAssembly", "(T)oSystem.Reflection.Assembly;", 
_IL_ClrType_GetClrAssembly, marshal_ppp)
-       IL_METHOD("GetClrBaseType", "(T)oSystem.Type;", 
_IL_ClrType_GetClrBaseType, marshal_ppp)
-       IL_METHOD("GetInterface", "(ToSystem.String;Z)oSystem.Type;", 
_IL_ClrType_GetInterface, marshal_ppppb)
-       IL_METHOD("GetMemberImpl", 
"(ToSystem.String;vSystem.Reflection.MemberTypes;vSystem.Reflection.BindingFlags;oSystem.Reflection.Binder;vSystem.Reflection.CallingConventions;[oSystem.Type;[vSystem.Reflection.ParameterModifier;)oSystem.Reflection.MemberInfo;",
 _IL_ClrType_GetMemberImpl, marshal_ppppiipipp)
-       IL_METHOD("GetMembersImpl", 
"(TvSystem.Reflection.MemberTypes;vSystem.Reflection.BindingFlags;oSystem.Type;oSystem.String;)oSystem.Object;",
 _IL_ClrType_GetMembersImpl, marshal_pppiipp)
-       IL_METHOD("IsClrNestedType", "(T)Z", _IL_ClrType_IsClrNestedType, 
marshal_bpp)
-       IL_METHOD("GetClrGUID", "(T)vSystem.Guid;", _IL_ClrType_GetClrGUID, 
marshal_vppp)
-       IL_METHOD("GetClrModule", "(T)oSystem.Reflection.Module;", 
_IL_ClrType_GetClrModule, marshal_ppp)
-       IL_METHOD("GetClrNestedDeclaringType", "(T)oSystem.Type;", 
_IL_ClrType_GetClrNestedDeclaringType, marshal_ppp)
-       IL_METHOD("GetClrName", "(T)oSystem.String;", _IL_ClrType_GetClrName, 
marshal_ppp)
-       IL_METHOD("GetClrNamespace", "(T)oSystem.String;", 
_IL_ClrType_GetClrNamespace, marshal_ppp)
-       IL_METHOD("IsGenericTypeImpl", "(T)Z", _IL_ClrType_IsGenericTypeImpl, 
marshal_bpp)
-       IL_METHOD("ArityImpl", "(T)i", _IL_ClrType_ArityImpl, marshal_ipp)
-       IL_METHOD("GetInstantiation", "(T)[oSystem.Type;", 
_IL_ClrType_GetInstantiation, marshal_ppp)
-       IL_METHOD("Instantiate", "(T[oSystem.Type;)oSystem.Type;", 
_IL_ClrType_Instantiate, marshal_pppp)
-       IL_METHOD("GetGenericType", "(T)oSystem.Type;", 
_IL_ClrType_GetGenericType, marshal_ppp)
- IL_METHOD_END
- 
- #endif
- 
  #ifndef _IL_ClrParameter_suppressed
  
--- 1737,1740 ----
***************
*** 1840,1843 ****
--- 1792,1843 ----
  #endif
  
+ #if !defined(HAVE_LIBFFI)
+ 
+ static void marshal_ppppiipipp(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((void * *)rvalue) = (*(void * (*)(void *, void *, void *, ILInt32, 
ILInt32, void *, ILInt32, void *, void *))fn)(*((void * *)(avalue[0])), *((void 
* *)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32 *)(avalue[3])), 
*((ILInt32 *)(avalue[4])), *((void * *)(avalue[5])), *((ILInt32 *)(avalue[6])), 
*((void * *)(avalue[7])), *((void * *)(avalue[8])));
+ }
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
+ static void marshal_pppiipp(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((void * *)rvalue) = (*(void * (*)(void *, void *, ILInt32, ILInt32, 
void *, void *))fn)(*((void * *)(avalue[0])), *((void * *)(avalue[1])), 
*((ILInt32 *)(avalue[2])), *((ILInt32 *)(avalue[3])), *((void * *)(avalue[4])), 
*((void * *)(avalue[5])));
+ }
+ 
+ #endif
+ 
+ #ifndef _IL_ClrType_suppressed
+ 
+ IL_METHOD_BEGIN(ClrType_Methods)
+       IL_METHOD("GetClrArrayRank", "(T)i", _IL_ClrType_GetClrArrayRank, 
marshal_ipp)
+       IL_METHOD("GetAttributeFlagsImpl", 
"(T)vSystem.Reflection.TypeAttributes;", _IL_ClrType_GetAttributeFlagsImpl, 
marshal_ipp)
+       IL_METHOD("GetClrTypeCategory", 
"(T)vSystem.Reflection.ClrTypeCategory;", _IL_ClrType_GetClrTypeCategory, 
marshal_ipp)
+       IL_METHOD("GetElementType", "(T)oSystem.Type;", 
_IL_ClrType_GetElementType, marshal_ppp)
+       IL_METHOD("GetInterfaces", "(T)[oSystem.Type;", 
_IL_ClrType_GetInterfaces, marshal_ppp)
+       IL_METHOD("IsSubclassOf", "(ToSystem.Type;)Z", 
_IL_ClrType_IsSubclassOf, marshal_bppp)
+       IL_METHOD("GetClrFullName", "(T)oSystem.String;", 
_IL_ClrType_GetClrFullName, marshal_ppp)
+       IL_METHOD("GetClrAssembly", "(T)oSystem.Reflection.Assembly;", 
_IL_ClrType_GetClrAssembly, marshal_ppp)
+       IL_METHOD("GetClrBaseType", "(T)oSystem.Type;", 
_IL_ClrType_GetClrBaseType, marshal_ppp)
+       IL_METHOD("GetInterface", "(ToSystem.String;Z)oSystem.Type;", 
_IL_ClrType_GetInterface, marshal_ppppb)
+       IL_METHOD("GetMemberImpl", 
"(ToSystem.String;vSystem.Reflection.MemberTypes;vSystem.Reflection.BindingFlags;oSystem.Reflection.Binder;vSystem.Reflection.CallingConventions;[oSystem.Type;[vSystem.Reflection.ParameterModifier;)oSystem.Reflection.MemberInfo;",
 _IL_ClrType_GetMemberImpl, marshal_ppppiipipp)
+       IL_METHOD("GetMembersImpl", 
"(TvSystem.Reflection.MemberTypes;vSystem.Reflection.BindingFlags;oSystem.Type;oSystem.String;)oSystem.Object;",
 _IL_ClrType_GetMembersImpl, marshal_pppiipp)
+       IL_METHOD("IsClrNestedType", "(T)Z", _IL_ClrType_IsClrNestedType, 
marshal_bpp)
+       IL_METHOD("GetClrGUID", "(T)vSystem.Guid;", _IL_ClrType_GetClrGUID, 
marshal_vppp)
+       IL_METHOD("GetClrModule", "(T)oSystem.Reflection.Module;", 
_IL_ClrType_GetClrModule, marshal_ppp)
+       IL_METHOD("GetClrNestedDeclaringType", "(T)oSystem.Type;", 
_IL_ClrType_GetClrNestedDeclaringType, marshal_ppp)
+       IL_METHOD("GetClrName", "(T)oSystem.String;", _IL_ClrType_GetClrName, 
marshal_ppp)
+       IL_METHOD("GetClrNamespace", "(T)oSystem.String;", 
_IL_ClrType_GetClrNamespace, marshal_ppp)
+       IL_METHOD("IsGenericTypeImpl", "(T)Z", _IL_ClrType_IsGenericTypeImpl, 
marshal_bpp)
+       IL_METHOD("ArityImpl", "(T)i", _IL_ClrType_ArityImpl, marshal_ipp)
+       IL_METHOD("GetInstantiation", "(T)[oSystem.Type;", 
_IL_ClrType_GetInstantiation, marshal_ppp)
+       IL_METHOD("Instantiate", "(T[oSystem.Type;)oSystem.Type;", 
_IL_ClrType_Instantiate, marshal_pppp)
+       IL_METHOD("GetGenericType", "(T)oSystem.Type;", 
_IL_ClrType_GetGenericType, marshal_ppp)
+ IL_METHOD_END
+ 
+ #endif
+ 
  #ifndef _IL_Module_suppressed
  
***************
*** 1864,1870 ****
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_vppji(void (*fn)(), void *rvalue, void **avalue)
  {
!       (*(void (*)(void *, void *, ILNativeUInt, ILInt32))fn)(*((void * 
*)(avalue[0])), *((void * *)(avalue[1])), *((ILNativeUInt *)(avalue[2])), 
*((ILInt32 *)(avalue[3])));
  }
  
--- 1864,1870 ----
  #if !defined(HAVE_LIBFFI)
  
! static void marshal_bpjjpji(void (*fn)(), void *rvalue, void **avalue)
  {
!       *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, 
ILNativeUInt, void *, ILNativeUInt, ILInt32))fn)(*((void * *)(avalue[0])), 
*((ILNativeUInt *)(avalue[1])), *((ILNativeUInt *)(avalue[2])), *((void * 
*)(avalue[3])), *((ILNativeUInt *)(avalue[4])), *((ILInt32 *)(avalue[5])));
  }
  
***************
*** 1875,1879 ****
  IL_METHOD_BEGIN(AssemblyBuilder_Methods)
        IL_METHOD("ClrAssemblyCreate", 
"(oSystem.String;iiiivSystem.Reflection.Emit.AssemblyBuilderAccess;&j)j", 
_IL_AssemblyBuilder_ClrAssemblyCreate, marshal_jppiiiiip)
!       IL_METHOD("ClrSetEntryPoint", 
"(TjvSystem.Reflection.Emit.PEFileKinds;)V", 
_IL_AssemblyBuilder_ClrSetEntryPoint, marshal_vppji)
        IL_METHOD("ClrGetItemToken", "(j)i", 
_IL_AssemblyBuilder_ClrGetItemToken, marshal_ipj)
        IL_METHOD("ClrGetItemFromToken", "(ji)j", 
_IL_AssemblyBuilder_ClrGetItemFromToken, marshal_jpji)
--- 1875,1879 ----
  IL_METHOD_BEGIN(AssemblyBuilder_Methods)
        IL_METHOD("ClrAssemblyCreate", 
"(oSystem.String;iiiivSystem.Reflection.Emit.AssemblyBuilderAccess;&j)j", 
_IL_AssemblyBuilder_ClrAssemblyCreate, marshal_jppiiiiip)
!       IL_METHOD("ClrSave", 
"(jjoSystem.String;jvSystem.Reflection.Emit.PEFileKinds;)Z", 
_IL_AssemblyBuilder_ClrSave, marshal_bpjjpji)
        IL_METHOD("ClrGetItemToken", "(j)i", 
_IL_AssemblyBuilder_ClrGetItemToken, marshal_ipj)
        IL_METHOD("ClrGetItemFromToken", "(ji)j", 
_IL_AssemblyBuilder_ClrGetItemFromToken, marshal_jpji)

Index: lib_emit.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_emit.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** lib_emit.c  12 Jul 2003 12:06:15 -0000      1.13
--- lib_emit.c  20 Jul 2003 04:59:09 -0000      1.14
***************
*** 30,41 ****
  /*
   * private static IntPtr ClrAssemblyCreate(String name, int v1, int v2,
!  *                                                                            
   int v3, int v4,
   *                                         AssemblyBuilderAccess access,
!  *                                                                            
   out IntPtr writer);
   */
! ILNativeInt _IL_AssemblyBuilder_ClrAssemblyCreate
!               (ILExecThread *_thread, ILString *name, ILInt32 v1,
!                ILInt32 v2, ILInt32 v3, ILInt32 v4, ILInt32 access,
!                ILNativeInt *writerReturn)
[...1419 lines suppressed...]
        if(parameter)
--- 1629,1633 ----
   */
  ILInt32 _IL_ParameterBuilder_ClrParameterGetAttrs(ILExecThread *_thread,
!                                                   ILNativeInt parameter)
  {
        if(parameter)
***************
*** 1164,1168 ****
   */
  ILString *_IL_ParameterBuilder_ClrParameterGetName(ILExecThread *_thread,
!                                                                               
                   ILNativeInt parameter)
  {
        if(parameter)
--- 1645,1649 ----
   */
  ILString *_IL_ParameterBuilder_ClrParameterGetName(ILExecThread *_thread,
!                                                    ILNativeInt parameter)
  {
        if(parameter)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]