[Dotgnu-pnet-commits] CVS: pnet/engine lib_marshal.c,1.2,1.3 int_proto.h,1.34,1.35 int_table.c,1.37,1.38

[Gopal.V <address@hidden>]

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

Modified Files:
        lib_marshal.c int_proto.h int_table.c 
Log Message:
PtrToStructure patches


Index: lib_marshal.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_marshal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lib_marshal.c       13 Aug 2002 06:47:56 -0000      1.2
--- lib_marshal.c       5 Dec 2002 18:49:38 -0000       1.3
***************
*** 459,462 ****
--- 459,491 ----
  }
  
+ /*
+  * public static void PtrToStructureInternal(IntPtr ptr, Object structure);
+  */
+ void _IL_Marshal_PtrToStructureInternal(ILExecThread * _thread, 
+                               ILNativeInt ptr,ILObject * structure)
+ {
+       ILClass *classInfo;
+       ILInt32 size;
+       if(UnmanagedOK(_thread) && ptr)
+       {
+               /* Convert the "Object" into an "ILClass *" structure */
+               classInfo = GetObjectClass(structure);
+               if(!classInfo)
+               {
+                       return;
+               }
+               
+               /* Get the size of the type */
+               size=(ILInt32)(ILSizeOfType
+                                       (_thread, 
ILType_FromValueType(classInfo)));
+               ILMemCpy(structure,(void*)ptr,size);
+               return;
+       }
+       else if(!ptr)
+       {
+               ILExecThreadThrowArgNull(_thread, "ptr");
+       }
+ }
+ 
  #endif /* IL_CONFIG_PINVOKE */
  

Index: int_proto.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_proto.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** int_proto.h 1 Dec 2002 09:56:03 -0000       1.34
--- int_proto.h 5 Dec 2002 18:49:39 -0000       1.35
***************
*** 42,45 ****
--- 42,51 ----
  extern ILObject * _IL_Enum_EnumLongToObject(ILExecThread * _thread, ILObject 
* enumType, ILInt64 value);
  
+ extern ILBool _IL_BitConverter_GetLittleEndian(ILExecThread * _thread);
+ extern ILInt64 _IL_BitConverter_DoubleToInt64Bits(ILExecThread * _thread, 
ILDouble value);
+ extern ILDouble _IL_BitConverter_Int64BitsToDouble(ILExecThread * _thread, 
ILInt64 value);
+ extern ILInt32 _IL_BitConverter_FloatToInt32Bits(ILExecThread * _thread, 
ILFloat value);
+ extern ILFloat _IL_BitConverter_Int32BitsToFloat(ILExecThread * _thread, 
ILInt32 value);
+ 
  extern ILInt32 _IL_Buffer_GetLength(ILExecThread * _thread, ILObject * array);
  extern void _IL_Buffer_Copy(ILExecThread * _thread, ILObject * src, ILInt32 
srcOffset, ILObject * dst, ILInt32 dstOffset, ILInt32 count);
***************
*** 62,102 ****
  extern void _IL_Decimal_Subtract(ILExecThread * _thread, ILDecimal * _result, 
ILDecimal * x, ILDecimal * y);
  
- extern System_String * _IL_String_Concat_StringString(ILExecThread * _thread, 
System_String * str1, System_String * str2);
- extern System_String * _IL_String_ctor_ci(ILExecThread * _thread, ILUInt16 c, 
ILInt32 count);
- extern System_String * _IL_String_ctor_ac(ILExecThread * _thread, 
System_Array * value);
- extern ILBool _IL_String_Equals(ILExecThread * _thread, System_String * a, 
System_String * b);
- extern ILUInt16 _IL_String_GetChar(ILExecThread * _thread, System_String * 
_this, ILInt32 posn);
- extern System_String * _IL_String_NewString(ILExecThread * _thread, ILInt32 
length);
- extern void _IL_String_Copy_StringiStringii(ILExecThread * _thread, 
System_String * dest, ILInt32 destPos, System_String * src, ILInt32 srcPos, 
ILInt32 length);
- extern ILInt32 _IL_String_InternalCompare(ILExecThread * _thread, 
System_String * strA, ILInt32 indexA, ILInt32 lengthA, System_String * strB, 
ILInt32 indexB, ILInt32 lengthB, ILBool ignoreCase, ILObject * culture);
- extern System_String * _IL_String_Trim(ILExecThread * _thread, System_String 
* _this, System_Array * trimChars, ILInt32 trimFlags);
- extern System_String * _IL_String_ctor_acii(ILExecThread * _thread, 
System_Array * value, ILInt32 startIndex, ILInt32 length);
- extern System_String * _IL_String_ctor_pcii(ILExecThread * _thread, ILUInt16 
* value, ILInt32 startIndex, ILInt32 length);
- extern System_String * _IL_String_ctor_pc(ILExecThread * _thread, ILUInt16 * 
value);
- extern System_String * _IL_String_ctor_pbiiEncoding(ILExecThread * _thread, 
ILInt8 * value, ILInt32 startIndex, ILInt32 length, ILObject * enc);
- extern System_String * _IL_String_ctor_pbii(ILExecThread * _thread, ILInt8 * 
value, ILInt32 startIndex, ILInt32 length);
- extern System_String * _IL_String_ctor_pb(ILExecThread * _thread, ILInt8 * 
value);
- extern ILInt32 _IL_String_Compare(ILExecThread * _thread, System_String * 
strA, System_String * strB);
- extern ILInt32 _IL_String_InternalOrdinal(ILExecThread * _thread, 
System_String * strA, ILInt32 indexA, ILInt32 lengthA, System_String * strB, 
ILInt32 indexB, ILInt32 lengthB);
- extern System_String * _IL_String_NewBuilder(ILExecThread * _thread, 
System_String * value, ILInt32 length);
- extern void _IL_String_Copy_StringiString(ILExecThread * _thread, 
System_String * dest, ILInt32 destPos, System_String * src);
- extern void _IL_String_InsertSpace(ILExecThread * _thread, System_String * 
str, ILInt32 srcPos, ILInt32 destPos);
- extern void _IL_String_RemoveSpace(ILExecThread * _thread, System_String * 
str, ILInt32 index, ILInt32 length);
- extern System_String * _IL_String_Concat_StringStringString(ILExecThread * 
_thread, System_String * str1, System_String * str2, System_String * str3);
- extern void _IL_String_CopyToChecked(ILExecThread * _thread, System_String * 
_this, ILInt32 sourceIndex, System_Array * destination, ILInt32 
destinationIndex, ILInt32 count);
- extern ILInt32 _IL_String_IndexOfAny(ILExecThread * _thread, System_String * 
_this, System_Array * anyOf, ILInt32 startIndex, ILInt32 count);
- extern ILInt32 _IL_String_IndexOf(ILExecThread * _thread, System_String * 
_this, ILUInt16 value, ILInt32 startIndex, ILInt32 count);
- extern ILInt32 _IL_String_GetHashCode(ILExecThread * _thread, System_String * 
_this);
- extern ILInt32 _IL_String_FindInRange(ILExecThread * _thread, System_String * 
_this, ILInt32 srcFirst, ILInt32 srcLast, ILInt32 step, System_String * dest);
- extern System_String * _IL_String_Intern(ILExecThread * _thread, 
System_String * str);
- extern System_String * _IL_String_IsInterned(ILExecThread * _thread, 
System_String * str);
- extern ILInt32 _IL_String_LastIndexOf(ILExecThread * _thread, System_String * 
_this, ILUInt16 value, ILInt32 startIndex, ILInt32 count);
- extern ILInt32 _IL_String_LastIndexOfAny(ILExecThread * _thread, 
System_String * _this, System_Array * anyOf, ILInt32 startIndex, ILInt32 count);
- extern void _IL_String_CharFill_Stringiic(ILExecThread * _thread, 
System_String * str, ILInt32 start, ILInt32 count, ILUInt16 ch);
- extern void _IL_String_CharFill_Stringiacii(ILExecThread * _thread, 
System_String * str, ILInt32 start, System_Array * chars, ILInt32 index, 
ILInt32 count);
- extern System_String * _IL_String_Replace_cc(ILExecThread * _thread, 
System_String * _this, ILUInt16 oldChar, ILUInt16 newChar);
- extern System_String * _IL_String_Replace_StringString(ILExecThread * 
_thread, System_String * _this, System_String * oldValue, System_String * 
newValue);
- extern void _IL_String_SetChar(ILExecThread * _thread, System_String * _this, 
ILInt32 posn, ILUInt16 value);
- 
  extern ILBool _IL_Double_IsNaN(ILExecThread * _thread, ILDouble d);
  extern ILInt32 _IL_Double_TestInfinity(ILExecThread * _thread, ILDouble d);
--- 68,71 ----
***************
*** 111,120 ****
  extern void _IL_Guid_NewGuid(ILExecThread * _thread, void * _result);
  
- extern ILBool _IL_BitConverter_GetLittleEndian(ILExecThread * _thread);
- extern ILInt64 _IL_BitConverter_DoubleToInt64Bits(ILExecThread * _thread, 
ILDouble value);
- extern ILDouble _IL_BitConverter_Int64BitsToDouble(ILExecThread * _thread, 
ILInt64 value);
- extern ILInt32 _IL_BitConverter_FloatToInt32Bits(ILExecThread * _thread, 
ILFloat value);
- extern ILFloat _IL_BitConverter_Int32BitsToFloat(ILExecThread * _thread, 
ILInt32 value);
- 
  extern ILDouble _IL_Math_Log(ILExecThread * _thread, ILDouble d);
  extern ILDouble _IL_Math_RoundDouble(ILExecThread * _thread, ILDouble value, 
ILInt32 digits);
--- 80,83 ----
***************
*** 143,146 ****
--- 106,146 ----
  extern ILInt32 _IL_Single_TestInfinity(ILExecThread * _thread, ILFloat f);
  
+ extern System_String * _IL_String_Concat_StringString(ILExecThread * _thread, 
System_String * str1, System_String * str2);
+ extern System_String * _IL_String_ctor_ci(ILExecThread * _thread, ILUInt16 c, 
ILInt32 count);
+ extern System_String * _IL_String_ctor_ac(ILExecThread * _thread, 
System_Array * value);
+ extern ILBool _IL_String_Equals(ILExecThread * _thread, System_String * a, 
System_String * b);
+ extern ILUInt16 _IL_String_GetChar(ILExecThread * _thread, System_String * 
_this, ILInt32 posn);
+ extern System_String * _IL_String_NewString(ILExecThread * _thread, ILInt32 
length);
+ extern void _IL_String_Copy_StringiStringii(ILExecThread * _thread, 
System_String * dest, ILInt32 destPos, System_String * src, ILInt32 srcPos, 
ILInt32 length);
+ extern ILInt32 _IL_String_InternalCompare(ILExecThread * _thread, 
System_String * strA, ILInt32 indexA, ILInt32 lengthA, System_String * strB, 
ILInt32 indexB, ILInt32 lengthB, ILBool ignoreCase, ILObject * culture);
+ extern System_String * _IL_String_Trim(ILExecThread * _thread, System_String 
* _this, System_Array * trimChars, ILInt32 trimFlags);
+ extern ILInt32 _IL_String_IndexOf(ILExecThread * _thread, System_String * 
_this, ILUInt16 value, ILInt32 startIndex, ILInt32 count);
+ extern System_String * _IL_String_ctor_acii(ILExecThread * _thread, 
System_Array * value, ILInt32 startIndex, ILInt32 length);
+ extern System_String * _IL_String_ctor_pcii(ILExecThread * _thread, ILUInt16 
* value, ILInt32 startIndex, ILInt32 length);
+ extern System_String * _IL_String_ctor_pc(ILExecThread * _thread, ILUInt16 * 
value);
+ extern System_String * _IL_String_ctor_pbiiEncoding(ILExecThread * _thread, 
ILInt8 * value, ILInt32 startIndex, ILInt32 length, ILObject * enc);
+ extern System_String * _IL_String_ctor_pbii(ILExecThread * _thread, ILInt8 * 
value, ILInt32 startIndex, ILInt32 length);
+ extern System_String * _IL_String_ctor_pb(ILExecThread * _thread, ILInt8 * 
value);
+ extern ILInt32 _IL_String_Compare(ILExecThread * _thread, System_String * 
strA, System_String * strB);
+ extern ILInt32 _IL_String_InternalOrdinal(ILExecThread * _thread, 
System_String * strA, ILInt32 indexA, ILInt32 lengthA, System_String * strB, 
ILInt32 indexB, ILInt32 lengthB);
+ extern System_String * _IL_String_NewBuilder(ILExecThread * _thread, 
System_String * value, ILInt32 length);
+ extern void _IL_String_Copy_StringiString(ILExecThread * _thread, 
System_String * dest, ILInt32 destPos, System_String * src);
+ extern void _IL_String_InsertSpace(ILExecThread * _thread, System_String * 
str, ILInt32 srcPos, ILInt32 destPos);
+ extern void _IL_String_RemoveSpace(ILExecThread * _thread, System_String * 
str, ILInt32 index, ILInt32 length);
+ extern System_String * _IL_String_Concat_StringStringString(ILExecThread * 
_thread, System_String * str1, System_String * str2, System_String * str3);
+ extern void _IL_String_CopyToChecked(ILExecThread * _thread, System_String * 
_this, ILInt32 sourceIndex, System_Array * destination, ILInt32 
destinationIndex, ILInt32 count);
+ extern ILInt32 _IL_String_IndexOfAny(ILExecThread * _thread, System_String * 
_this, System_Array * anyOf, ILInt32 startIndex, ILInt32 count);
+ extern ILInt32 _IL_String_GetHashCode(ILExecThread * _thread, System_String * 
_this);
+ extern ILInt32 _IL_String_FindInRange(ILExecThread * _thread, System_String * 
_this, ILInt32 srcFirst, ILInt32 srcLast, ILInt32 step, System_String * dest);
+ extern System_String * _IL_String_Intern(ILExecThread * _thread, 
System_String * str);
+ extern System_String * _IL_String_IsInterned(ILExecThread * _thread, 
System_String * str);
+ extern ILInt32 _IL_String_LastIndexOf(ILExecThread * _thread, System_String * 
_this, ILUInt16 value, ILInt32 startIndex, ILInt32 count);
+ extern ILInt32 _IL_String_LastIndexOfAny(ILExecThread * _thread, 
System_String * _this, System_Array * anyOf, ILInt32 startIndex, ILInt32 count);
+ extern void _IL_String_CharFill_Stringiic(ILExecThread * _thread, 
System_String * str, ILInt32 start, ILInt32 count, ILUInt16 ch);
+ extern void _IL_String_CharFill_Stringiacii(ILExecThread * _thread, 
System_String * str, ILInt32 start, System_Array * chars, ILInt32 index, 
ILInt32 count);
+ extern System_String * _IL_String_Replace_cc(ILExecThread * _thread, 
System_String * _this, ILUInt16 oldChar, ILUInt16 newChar);
+ extern System_String * _IL_String_Replace_StringString(ILExecThread * 
_thread, System_String * _this, System_String * oldValue, System_String * 
newValue);
+ extern void _IL_String_SetChar(ILExecThread * _thread, System_String * _this, 
ILInt32 posn, ILUInt16 value);
+ 
  extern ILObject * _IL_Type_GetTypeFromHandle(ILExecThread * _thread, void * 
handle);
  extern ILObject * _IL_Type_GetType(ILExecThread * _thread, ILString * name, 
ILBool throwOnError, ILBool ignoreCase);
***************
*** 267,270 ****
--- 267,271 ----
  extern void _IL_Marshal_WriteInt64(ILExecThread * _thread, ILNativeInt ptr, 
ILInt32 ofs, ILInt64 val);
  extern void _IL_Marshal_WriteIntPtr(ILExecThread * _thread, ILNativeInt ptr, 
ILInt32 ofs, ILNativeInt val);
+ extern void _IL_Marshal_PtrToStructureInternal(ILExecThread * _thread, 
ILNativeInt ptr, ILObject * structure);
  
  extern void _IL_RuntimeHelpers_InitializeArray(ILExecThread * _thread, 
ILObject * array, void * field);
***************
*** 291,324 ****
  extern ILObject * _IL_MethodBase_GetCurrentMethod(ILExecThread * _thread);
  
- extern ILObject * _IL_FieldInfo_GetFieldFromHandle(ILExecThread * _thread, 
void * handle);
- 
- extern ILObject * _IL_Module_GetModuleType(ILExecThread * _thread, ILObject * 
_this);
- extern ILObject * _IL_Module_GetAssembly(ILExecThread * _thread, ILObject * 
_this);
- extern ILString * _IL_Module_GetFullName(ILExecThread * _thread, ILObject * 
_this);
- extern ILObject * _IL_Module_GetType(ILExecThread * _thread, ILObject * 
_this, ILString * name, ILBool throwOnError, ILBool ignoreCase);
- extern System_Array * _IL_Module_GetTypes(ILExecThread * _thread, ILObject * 
_this);
- extern ILBool _IL_Module_IsResource(ILExecThread * _thread, ILObject * _this);
- 
- extern ILInt32 _IL_ClrType_GetClrArrayRank(ILExecThread * _thread, ILObject * 
_this);
- extern ILInt32 _IL_ClrType_GetAttributeFlagsImpl(ILExecThread * _thread, 
ILObject * _this);
- extern ILObject * _IL_ClrType_GetElementType(ILExecThread * _thread, ILObject 
* _this);
- extern ILObject * _IL_ClrType_GetInterface(ILExecThread * _thread, ILObject * 
_this, ILString * name, ILBool ignoreCase);
- extern System_Array * _IL_ClrType_GetInterfaces(ILExecThread * _thread, 
ILObject * _this);
- extern ILObject * _IL_ClrType_GetMemberImpl(ILExecThread * _thread, ILObject 
* _this, ILString * name, ILInt32 memberTypes, ILInt32 bindingAttr, ILObject * 
binder, ILInt32 callingConventions, System_Array * types, System_Array * 
modifiers);
- extern ILObject * _IL_ClrType_GetMembersImpl(ILExecThread * _thread, ILObject 
* _this, ILInt32 memberTypes, ILInt32 bindingAttr, ILObject * arrayType, 
ILString * name);
- extern ILInt32 _IL_ClrType_GetClrTypeCategory(ILExecThread * _thread, 
ILObject * _this);
- extern ILBool _IL_ClrType_IsSubclassOf(ILExecThread * _thread, ILObject * 
_this, ILObject * c);
- extern ILBool _IL_ClrType_IsClrNestedType(ILExecThread * _thread, ILObject * 
_this);
- extern ILString * _IL_ClrType_GetClrFullName(ILExecThread * _thread, ILObject 
* _this);
- extern ILObject * _IL_ClrType_GetClrAssembly(ILExecThread * _thread, ILObject 
* _this);
- extern ILObject * _IL_ClrType_GetClrBaseType(ILExecThread * _thread, ILObject 
* _this);
- extern void _IL_ClrType_GetClrGUID(ILExecThread * _thread, void * _result, 
ILObject * _this);
- extern ILObject * _IL_ClrType_GetClrModule(ILExecThread * _thread, ILObject * 
_this);
- extern ILObject * _IL_ClrType_GetClrNestedDeclaringType(ILExecThread * 
_thread, ILObject * _this);
- extern ILString * _IL_ClrType_GetClrName(ILExecThread * _thread, ILObject * 
_this);
- extern ILString * _IL_ClrType_GetClrNamespace(ILExecThread * _thread, 
ILObject * _this);
- 
  extern ILObject * _IL_ClrConstructor_Invoke(ILExecThread * _thread, ILObject 
* _this, ILInt32 invokeAttr, ILObject * binder, System_Array * parameters, 
ILObject * culture);
  
  extern ILObject * _IL_ClrField_GetFieldType(ILExecThread * _thread, 
ILNativeInt item);
  extern ILObject * _IL_ClrField_GetValue(ILExecThread * _thread, ILObject * 
_this, ILObject * obj);
--- 292,299 ----
  extern ILObject * _IL_MethodBase_GetCurrentMethod(ILExecThread * _thread);
  
  extern ILObject * _IL_ClrConstructor_Invoke(ILExecThread * _thread, ILObject 
* _this, ILInt32 invokeAttr, ILObject * binder, System_Array * parameters, 
ILObject * culture);
  
+ extern ILObject * _IL_FieldInfo_GetFieldFromHandle(ILExecThread * _thread, 
void * handle);
+ 
  extern ILObject * _IL_ClrField_GetFieldType(ILExecThread * _thread, 
ILNativeInt item);
  extern ILObject * _IL_ClrField_GetValue(ILExecThread * _thread, ILObject * 
_this, ILObject * obj);
***************
*** 328,337 ****
  
  extern ILBool _IL_ClrHelpers_CanAccess(ILExecThread * _thread, ILNativeInt 
item);
- extern ILInt32 _IL_ClrHelpers_GetMemberAttrs(ILExecThread * _thread, 
ILNativeInt item);
- extern ILObject * _IL_ClrHelpers_GetSemantics(ILExecThread * _thread, 
ILNativeInt item, ILInt32 type, ILBool nonPublic);
  extern ILString * _IL_ClrHelpers_GetName(ILExecThread * _thread, ILNativeInt 
item);
  extern ILInt32 _IL_ClrHelpers_GetNumParameters(ILExecThread * _thread, 
ILNativeInt item);
  extern ILInt32 _IL_ClrHelpers_GetCallConv(ILExecThread * _thread, ILNativeInt 
item);
  extern ILInt32 _IL_ClrHelpers_GetImplAttrs(ILExecThread * _thread, 
ILNativeInt item);
  extern System_Array * _IL_ClrHelpers_GetCustomAttributes(ILExecThread * 
_thread, ILNativeInt item, ILNativeInt type, ILBool inherit);
  extern ILBool _IL_ClrHelpers_IsDefined(ILExecThread * _thread, ILNativeInt 
item, ILNativeInt type, ILBool inherit);
--- 303,312 ----
  
  extern ILBool _IL_ClrHelpers_CanAccess(ILExecThread * _thread, ILNativeInt 
item);
  extern ILString * _IL_ClrHelpers_GetName(ILExecThread * _thread, ILNativeInt 
item);
  extern ILInt32 _IL_ClrHelpers_GetNumParameters(ILExecThread * _thread, 
ILNativeInt item);
+ extern ILInt32 _IL_ClrHelpers_GetMemberAttrs(ILExecThread * _thread, 
ILNativeInt item);
  extern ILInt32 _IL_ClrHelpers_GetCallConv(ILExecThread * _thread, ILNativeInt 
item);
  extern ILInt32 _IL_ClrHelpers_GetImplAttrs(ILExecThread * _thread, 
ILNativeInt item);
+ extern ILObject * _IL_ClrHelpers_GetSemantics(ILExecThread * _thread, 
ILNativeInt item, ILInt32 type, ILBool nonPublic);
  extern System_Array * _IL_ClrHelpers_GetCustomAttributes(ILExecThread * 
_thread, ILNativeInt item, ILNativeInt type, ILBool inherit);
  extern ILBool _IL_ClrHelpers_IsDefined(ILExecThread * _thread, ILNativeInt 
item, ILNativeInt type, ILBool inherit);
***************
*** 344,357 ****
  extern ILObject * _IL_ClrMethod_GetBaseDefinition(ILExecThread * _thread, 
ILObject * _this);
  
- extern ILObject * _IL_ClrProperty_GetPropertyType(ILExecThread * _thread, 
ILNativeInt item);
- 
  extern ILInt32 _IL_ClrParameter_GetParamAttrs(ILExecThread * _thread, 
ILNativeInt item);
  extern ILString * _IL_ClrParameter_GetParamName(ILExecThread * _thread, 
ILNativeInt item);
  extern ILObject * _IL_ClrParameter_GetDefault(ILExecThread * _thread, 
ILNativeInt item);
  
  extern ILInt32 _IL_ClrResourceStream_ResourceRead(ILExecThread * _thread, 
ILNativeInt handle, ILInt64 position, System_Array * buffer, ILInt32 offset, 
ILInt32 count);
  extern ILInt32 _IL_ClrResourceStream_ResourceReadByte(ILExecThread * _thread, 
ILNativeInt handle, ILInt64 position);
  extern ILUInt8 * _IL_ClrResourceStream_ResourceGetAddress(ILExecThread * 
_thread, ILNativeInt handle, ILInt64 position);
  
  extern void _IL_AssemblyBuilder_ClrSetEntryPoint(ILExecThread * _thread, 
ILObject * _this, ILNativeInt clrMethod, ILInt32 fileKind);
  
--- 319,358 ----
  extern ILObject * _IL_ClrMethod_GetBaseDefinition(ILExecThread * _thread, 
ILObject * _this);
  
  extern ILInt32 _IL_ClrParameter_GetParamAttrs(ILExecThread * _thread, 
ILNativeInt item);
  extern ILString * _IL_ClrParameter_GetParamName(ILExecThread * _thread, 
ILNativeInt item);
  extern ILObject * _IL_ClrParameter_GetDefault(ILExecThread * _thread, 
ILNativeInt item);
  
+ extern ILObject * _IL_ClrProperty_GetPropertyType(ILExecThread * _thread, 
ILNativeInt item);
+ 
  extern ILInt32 _IL_ClrResourceStream_ResourceRead(ILExecThread * _thread, 
ILNativeInt handle, ILInt64 position, System_Array * buffer, ILInt32 offset, 
ILInt32 count);
  extern ILInt32 _IL_ClrResourceStream_ResourceReadByte(ILExecThread * _thread, 
ILNativeInt handle, ILInt64 position);
  extern ILUInt8 * _IL_ClrResourceStream_ResourceGetAddress(ILExecThread * 
_thread, ILNativeInt handle, ILInt64 position);
  
+ extern ILInt32 _IL_ClrType_GetClrArrayRank(ILExecThread * _thread, ILObject * 
_this);
+ extern ILInt32 _IL_ClrType_GetAttributeFlagsImpl(ILExecThread * _thread, 
ILObject * _this);
+ extern ILObject * _IL_ClrType_GetElementType(ILExecThread * _thread, ILObject 
* _this);
+ extern ILObject * _IL_ClrType_GetInterface(ILExecThread * _thread, ILObject * 
_this, ILString * name, ILBool ignoreCase);
+ extern System_Array * _IL_ClrType_GetInterfaces(ILExecThread * _thread, 
ILObject * _this);
+ extern ILObject * _IL_ClrType_GetMemberImpl(ILExecThread * _thread, ILObject 
* _this, ILString * name, ILInt32 memberTypes, ILInt32 bindingAttr, ILObject * 
binder, ILInt32 callingConventions, System_Array * types, System_Array * 
modifiers);
+ extern ILObject * _IL_ClrType_GetMembersImpl(ILExecThread * _thread, ILObject 
* _this, ILInt32 memberTypes, ILInt32 bindingAttr, ILObject * arrayType, 
ILString * name);
+ extern ILInt32 _IL_ClrType_GetClrTypeCategory(ILExecThread * _thread, 
ILObject * _this);
+ extern ILBool _IL_ClrType_IsSubclassOf(ILExecThread * _thread, ILObject * 
_this, ILObject * c);
+ extern ILBool _IL_ClrType_IsClrNestedType(ILExecThread * _thread, ILObject * 
_this);
+ extern ILString * _IL_ClrType_GetClrFullName(ILExecThread * _thread, ILObject 
* _this);
+ extern ILObject * _IL_ClrType_GetClrAssembly(ILExecThread * _thread, ILObject 
* _this);
+ extern ILObject * _IL_ClrType_GetClrBaseType(ILExecThread * _thread, ILObject 
* _this);
+ extern void _IL_ClrType_GetClrGUID(ILExecThread * _thread, void * _result, 
ILObject * _this);
+ extern ILObject * _IL_ClrType_GetClrModule(ILExecThread * _thread, ILObject * 
_this);
+ extern ILObject * _IL_ClrType_GetClrNestedDeclaringType(ILExecThread * 
_thread, ILObject * _this);
+ extern ILString * _IL_ClrType_GetClrName(ILExecThread * _thread, ILObject * 
_this);
+ extern ILString * _IL_ClrType_GetClrNamespace(ILExecThread * _thread, 
ILObject * _this);
+ 
+ extern ILObject * _IL_Module_GetModuleType(ILExecThread * _thread, ILObject * 
_this);
+ extern ILObject * _IL_Module_GetAssembly(ILExecThread * _thread, ILObject * 
_this);
+ extern ILString * _IL_Module_GetFullName(ILExecThread * _thread, ILObject * 
_this);
+ extern ILObject * _IL_Module_GetType(ILExecThread * _thread, ILObject * 
_this, ILString * name, ILBool throwOnError, ILBool ignoreCase);
+ extern System_Array * _IL_Module_GetTypes(ILExecThread * _thread, ILObject * 
_this);
+ extern ILBool _IL_Module_IsResource(ILExecThread * _thread, ILObject * _this);
+ 
  extern void _IL_AssemblyBuilder_ClrSetEntryPoint(ILExecThread * _thread, 
ILObject * _this, ILNativeInt clrMethod, ILInt32 fileKind);
  
***************
*** 377,381 ****
  extern System_Array * _IL_DirMethods_GetLogicalDrives(ILExecThread * _thread);
  extern void _IL_DirMethods_GetPathInfo(ILExecThread * _thread, void * 
_result);
- extern ILString * _IL_DirMethods_GetCurrentDirectory(ILExecThread * _thread);
  extern ILInt32 _IL_DirMethods_Copy(ILExecThread * _thread, ILString * src, 
ILString * dest);
  extern ILInt32 _IL_DirMethods_Rename(ILExecThread * _thread, ILString * 
old_name, ILString * new_name);
--- 378,381 ----
***************
*** 384,389 ****
  extern ILInt32 _IL_DirMethods_GetLastAccess(ILExecThread * _thread, ILString 
* path, ILInt64 * lastac);
  extern ILInt32 _IL_DirMethods_GetLastModification(ILExecThread * _thread, 
ILString * path, ILInt64 * last_mod);
! extern ILInt32 _IL_DirMethods_GetFilesInDirectory(ILExecThread * _thread, 
ILString * path, System_Array * * files);
  extern ILInt32 _IL_DirMethods_ChangeDirectory(ILExecThread * _thread, 
ILString * name);
  
  extern void _IL_Stdio_StdClose(ILExecThread * _thread, ILInt32 fd);
--- 384,411 ----
  extern ILInt32 _IL_DirMethods_GetLastAccess(ILExecThread * _thread, ILString 
* path, ILInt64 * lastac);
  extern ILInt32 _IL_DirMethods_GetLastModification(ILExecThread * _thread, 
ILString * path, ILInt64 * last_mod);
! extern ILString * _IL_DirMethods_GetCurrentDirectory(ILExecThread * _thread);
  extern ILInt32 _IL_DirMethods_ChangeDirectory(ILExecThread * _thread, 
ILString * name);
+ extern ILInt32 _IL_DirMethods_GetFilesInDirectory(ILExecThread * _thread, 
ILString * path, System_Array * * files);
+ 
+ extern ILString * _IL_FileMethods_GetErrnoMessage(ILExecThread * _thread, 
ILInt32 errno);
+ extern ILBool _IL_FileMethods_ValidatePathname(ILExecThread * _thread, 
ILString * path);
+ extern ILBool _IL_FileMethods_Open(ILExecThread * _thread, ILString * path, 
ILInt32 mode, ILInt32 access, ILInt32 share, ILNativeInt * handle);
+ extern ILInt32 _IL_FileMethods_GetErrno(ILExecThread * _thread);
+ extern ILBool _IL_FileMethods_HasAsync(ILExecThread * _thread);
+ extern ILBool _IL_FileMethods_CanSeek(ILExecThread * _thread, ILNativeInt 
handle);
+ extern ILBool _IL_FileMethods_CheckHandleAccess(ILExecThread * _thread, 
ILNativeInt handle, ILInt32 access);
+ extern ILInt64 _IL_FileMethods_Seek(ILExecThread * _thread, ILNativeInt 
handle, ILInt64 offset, ILInt32 origin);
+ extern ILBool _IL_FileMethods_Write(ILExecThread * _thread, ILNativeInt 
handle, System_Array * buffer, ILInt32 offset, ILInt32 count);
+ extern ILBool _IL_FileMethods_Close(ILExecThread * _thread, ILNativeInt 
handle);
+ extern ILBool _IL_FileMethods_FlushWrite(ILExecThread * _thread, ILNativeInt 
handle);
+ extern ILInt32 _IL_FileMethods_Read(ILExecThread * _thread, ILNativeInt 
handle, System_Array * buffer, ILInt32 offset, ILInt32 count);
+ extern ILBool _IL_FileMethods_SetLength(ILExecThread * _thread, ILNativeInt 
handle, ILInt64 value);
+ extern ILNativeInt _IL_FileMethods_GetInvalidHandle(ILExecThread * _thread);
+ 
+ extern ILBool _IL_RuntimeSecurityManager_CanUseFileHandle(ILExecThread * 
_thread, ILObject * _this, ILNativeInt handle);
+ extern ILBool _IL_RuntimeSecurityManager_CanOpenFile(ILExecThread * _thread, 
ILObject * _this, ILString * path, ILInt32 mode, ILInt32 access, ILInt32 share);
+ 
+ extern ILObject * _IL_Security_GetSecurityManager(ILExecThread * _thread);
+ extern void _IL_Security_SetSecurityManager(ILExecThread * _thread, ILObject 
* mgr);
  
  extern void _IL_Stdio_StdClose(ILExecThread * _thread, ILInt32 fd);
***************
*** 415,439 ****
  extern ILInt32 _IL_TimeMethods_GetUpTime(ILExecThread * _thread);
  
- extern ILString * _IL_FileMethods_GetErrnoMessage(ILExecThread * _thread, 
ILInt32 errno);
- extern ILBool _IL_FileMethods_ValidatePathname(ILExecThread * _thread, 
ILString * path);
- extern ILBool _IL_FileMethods_Open(ILExecThread * _thread, ILString * path, 
ILInt32 mode, ILInt32 access, ILInt32 share, ILNativeInt * handle);
- extern ILInt32 _IL_FileMethods_GetErrno(ILExecThread * _thread);
- extern ILBool _IL_FileMethods_HasAsync(ILExecThread * _thread);
- extern ILBool _IL_FileMethods_CanSeek(ILExecThread * _thread, ILNativeInt 
handle);
- extern ILBool _IL_FileMethods_CheckHandleAccess(ILExecThread * _thread, 
ILNativeInt handle, ILInt32 access);
- extern ILInt64 _IL_FileMethods_Seek(ILExecThread * _thread, ILNativeInt 
handle, ILInt64 offset, ILInt32 origin);
- extern ILBool _IL_FileMethods_Write(ILExecThread * _thread, ILNativeInt 
handle, System_Array * buffer, ILInt32 offset, ILInt32 count);
- extern ILBool _IL_FileMethods_Close(ILExecThread * _thread, ILNativeInt 
handle);
- extern ILBool _IL_FileMethods_FlushWrite(ILExecThread * _thread, ILNativeInt 
handle);
- extern ILInt32 _IL_FileMethods_Read(ILExecThread * _thread, ILNativeInt 
handle, System_Array * buffer, ILInt32 offset, ILInt32 count);
- extern ILBool _IL_FileMethods_SetLength(ILExecThread * _thread, ILNativeInt 
handle, ILInt64 value);
- extern ILNativeInt _IL_FileMethods_GetInvalidHandle(ILExecThread * _thread);
- 
- extern ILBool _IL_RuntimeSecurityManager_CanUseFileHandle(ILExecThread * 
_thread, ILObject * _this, ILNativeInt handle);
- extern ILBool _IL_RuntimeSecurityManager_CanOpenFile(ILExecThread * _thread, 
ILObject * _this, ILString * path, ILInt32 mode, ILInt32 access, ILInt32 share);
- 
- extern ILObject * _IL_Security_GetSecurityManager(ILExecThread * _thread);
- extern void _IL_Security_SetSecurityManager(ILExecThread * _thread, ILObject 
* mgr);
- 
  extern ILString * _IL_InfoMethods_GetRuntimeVersion(ILExecThread * _thread);
  extern ILString * _IL_InfoMethods_GetNetBIOSMachineName(ILExecThread * 
_thread);
--- 437,440 ----
***************
*** 445,465 ****
  extern ILString * _IL_InfoMethods_GetSpecialFolder(ILExecThread * _thread, 
ILInt32 f);
  
- extern ILNativeInt _IL_RegexpMethods_CompileInternal(ILExecThread * _thread, 
ILString * pattern, ILInt32 flags);
- extern ILInt32 _IL_RegexpMethods_ExecInternal(ILExecThread * _thread, 
ILNativeInt compiled, ILString * input, ILInt32 flags);
- extern void _IL_RegexpMethods_FreeInternal(ILExecThread * _thread, 
ILNativeInt compiled);
- 
- extern ILBool _IL_CryptoMethods_IsSemiWeakKey(ILExecThread * _thread, 
System_Array * key, ILInt32 offset);
- extern ILBool _IL_CryptoMethods_IsWeakKey(ILExecThread * _thread, 
System_Array * key, ILInt32 offset);
  extern ILNativeInt _IL_CryptoMethods_EncryptCreate(ILExecThread * _thread, 
ILInt32 algorithm, System_Array * key);
  extern ILNativeInt _IL_CryptoMethods_DecryptCreate(ILExecThread * _thread, 
ILInt32 algorithm, System_Array * key);
  extern void _IL_CryptoMethods_SymmetricFree(ILExecThread * _thread, 
ILNativeInt state);
! extern ILNativeInt _IL_CryptoMethods_HashNew(ILExecThread * _thread, ILInt32 
algorithm);
! extern void _IL_CryptoMethods_HashReset(ILExecThread * _thread, ILNativeInt 
state);
! extern void _IL_CryptoMethods_HashFree(ILExecThread * _thread, ILNativeInt 
state);
! extern void _IL_CryptoMethods_HashUpdate(ILExecThread * _thread, ILNativeInt 
state, System_Array * buffer, ILInt32 offset, ILInt32 count);
! extern void _IL_CryptoMethods_HashFinal(ILExecThread * _thread, ILNativeInt 
state, System_Array * hash);
  extern ILBool _IL_CryptoMethods_AlgorithmSupported(ILExecThread * _thread, 
ILInt32 algorithm);
  extern void _IL_CryptoMethods_GenerateRandom(ILExecThread * _thread, 
System_Array * buf, ILInt32 offset, ILInt32 count);
- extern ILBool _IL_CryptoMethods_SameKey(ILExecThread * _thread, System_Array 
* key1, ILInt32 offset1, System_Array * key2, ILInt32 offset2);
  extern System_Array * _IL_CryptoMethods_GetKey(ILExecThread * _thread, 
ILInt32 algorithm, ILString * name, ILInt32 flag, ILInt32 * result);
  extern System_Array * _IL_CryptoMethods_NumPow(ILExecThread * _thread, 
System_Array * x, System_Array * y, System_Array * modulus);
--- 446,456 ----
  extern ILString * _IL_InfoMethods_GetSpecialFolder(ILExecThread * _thread, 
ILInt32 f);
  
  extern ILNativeInt _IL_CryptoMethods_EncryptCreate(ILExecThread * _thread, 
ILInt32 algorithm, System_Array * key);
  extern ILNativeInt _IL_CryptoMethods_DecryptCreate(ILExecThread * _thread, 
ILInt32 algorithm, System_Array * key);
  extern void _IL_CryptoMethods_SymmetricFree(ILExecThread * _thread, 
ILNativeInt state);
! extern ILBool _IL_CryptoMethods_IsSemiWeakKey(ILExecThread * _thread, 
System_Array * key, ILInt32 offset);
! extern ILBool _IL_CryptoMethods_IsWeakKey(ILExecThread * _thread, 
System_Array * key, ILInt32 offset);
  extern ILBool _IL_CryptoMethods_AlgorithmSupported(ILExecThread * _thread, 
ILInt32 algorithm);
  extern void _IL_CryptoMethods_GenerateRandom(ILExecThread * _thread, 
System_Array * buf, ILInt32 offset, ILInt32 count);
  extern System_Array * _IL_CryptoMethods_GetKey(ILExecThread * _thread, 
ILInt32 algorithm, ILString * name, ILInt32 flag, ILInt32 * result);
  extern System_Array * _IL_CryptoMethods_NumPow(ILExecThread * _thread, 
System_Array * x, System_Array * y, System_Array * modulus);
***************
*** 470,477 ****
--- 461,478 ----
  extern ILBool _IL_CryptoMethods_NumZero(ILExecThread * _thread, System_Array 
* x);
  extern ILBool _IL_CryptoMethods_NumEq(ILExecThread * _thread, System_Array * 
x, System_Array * y);
+ extern ILNativeInt _IL_CryptoMethods_HashNew(ILExecThread * _thread, ILInt32 
algorithm);
+ extern void _IL_CryptoMethods_HashReset(ILExecThread * _thread, ILNativeInt 
state);
+ extern void _IL_CryptoMethods_HashFree(ILExecThread * _thread, ILNativeInt 
state);
+ extern void _IL_CryptoMethods_HashUpdate(ILExecThread * _thread, ILNativeInt 
state, System_Array * buffer, ILInt32 offset, ILInt32 count);
+ extern void _IL_CryptoMethods_HashFinal(ILExecThread * _thread, ILNativeInt 
state, System_Array * hash);
+ extern ILBool _IL_CryptoMethods_SameKey(ILExecThread * _thread, System_Array 
* key1, ILInt32 offset1, System_Array * key2, ILInt32 offset2);
  extern System_Array * _IL_CryptoMethods_NumSub(ILExecThread * _thread, 
System_Array * x, System_Array * y, System_Array * modulus);
  extern void _IL_CryptoMethods_Decrypt(ILExecThread * _thread, ILNativeInt 
state, System_Array * inBuffer, ILInt32 inOffset, System_Array * outBuffer, 
ILInt32 outOffset);
  extern void _IL_CryptoMethods_Encrypt(ILExecThread * _thread, ILNativeInt 
state, System_Array * inBuffer, ILInt32 inOffset, System_Array * outBuffer, 
ILInt32 outOffset);
  extern void _IL_CryptoMethods_StoreKey(ILExecThread * _thread, ILInt32 
algorithm, ILString * name, System_Array * key);
+ 
+ extern ILNativeInt _IL_RegexpMethods_CompileInternal(ILExecThread * _thread, 
ILString * pattern, ILInt32 flags);
+ extern ILInt32 _IL_RegexpMethods_ExecInternal(ILExecThread * _thread, 
ILNativeInt compiled, ILString * input, ILInt32 flags);
+ extern void _IL_RegexpMethods_FreeInternal(ILExecThread * _thread, 
ILNativeInt compiled);
  
  extern ILBool _IL_SocketMethods_Create(ILExecThread * _thread, ILInt32 af, 
ILInt32 st, ILInt32 pt, ILNativeInt * handle);

Index: int_table.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_table.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** int_table.c 1 Dec 2002 18:40:44 -0000       1.37
--- int_table.c 5 Dec 2002 18:49:39 -0000       1.38
***************
*** 254,257 ****
--- 254,314 ----
  #if !defined(HAVE_LIBFFI)
  
+ static void marshal_bp(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *))fn)(*((void * 
*)(avalue[0])));
+ }
+ 
+ #endif
+ 
[...1389 lines suppressed...]
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
+ static void marshal_ipjpi(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, ILNativeUInt, void *, 
ILInt32))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])), *((void 
* *)(avalue[2])), *((ILInt32 *)(avalue[3])));
+ }
+ 
+ #endif
+ 
+ #ifndef _IL_RegexpMethods_suppressed
+ 
+ IL_METHOD_BEGIN(RegexpMethods_Methods)
+       IL_METHOD("CompileInternal", "(oSystem.String;i)j", 
_IL_RegexpMethods_CompileInternal, marshal_jppi)
+       IL_METHOD("ExecInternal", "(joSystem.String;i)i", 
_IL_RegexpMethods_ExecInternal, marshal_ipjpi)
+       IL_METHOD("FreeInternal", "(j)V", _IL_RegexpMethods_FreeInternal, 
marshal_vpj)
  IL_METHOD_END