[Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h,1.46,1.47 int_table.c,1.48,1.49 lib_emit.c,1.2,1.3

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        int_proto.h int_table.c lib_emit.c 
Log Message:


Add internalcalls for System.Reflection.Emit.AssemblyBuilder.


Index: int_proto.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_proto.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** int_proto.h 17 Mar 2003 10:11:48 -0000      1.46
--- int_proto.h 18 Mar 2003 11:01:04 -0000      1.47
***************
*** 67,70 ****
--- 67,71 ----
  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);
***************
*** 86,90 ****
  extern void _IL_String_CopyToChecked(ILExecThread * _thread, System_String * 
_this, ILInt32 _p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4);
  extern ILInt32 _IL_String_IndexOfAny(ILExecThread * _thread, System_String * 
_this, System_Array * _p1, ILInt32 _p2, ILInt32 _p3);
- extern ILInt32 _IL_String_IndexOf(ILExecThread * _thread, System_String * 
_this, ILUInt16 _p1, ILInt32 _p2, ILInt32 _p3);
  extern ILInt32 _IL_String_GetHashCode(ILExecThread * _thread, System_String * 
_this);
  extern ILInt32 _IL_String_FindInRange(ILExecThread * _thread, System_String * 
_this, ILInt32 _p1, ILInt32 _p2, ILInt32 _p3, System_String * _p4);
--- 87,90 ----
***************
*** 367,370 ****
--- 367,371 ----
  extern ILUInt8 * _IL_ClrResourceStream_ResourceGetAddress(ILExecThread * 
_thread, ILNativeInt _p1, ILInt64 _p2);
  
+ 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);
  

Index: int_table.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_table.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** int_table.c 17 Mar 2003 10:11:48 -0000      1.48
--- int_table.c 18 Mar 2003 11:01:04 -0000      1.49
***************
*** 367,370 ****
--- 367,379 ----
  #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])));
+ }
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
  static void marshal_ppi(void (*fn)(), void *rvalue, void **avalue)
  {
***************
*** 448,460 ****
  #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])));
- }
- 
- #endif
- 
- #if !defined(HAVE_LIBFFI)
- 
  static void marshal_ippiiip(void (*fn)(), void *rvalue, void **avalue)
  {
--- 457,460 ----
***************
*** 499,502 ****
--- 499,503 ----
        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)
***************
*** 518,522 ****
        IL_METHOD("CopyToChecked", "(Ti[cii)V", _IL_String_CopyToChecked, 
marshal_vppipii)
        IL_METHOD("IndexOfAny", "(T[cii)i", _IL_String_IndexOfAny, 
marshal_ipppii)
-       IL_METHOD("IndexOf", "(Tcii)i", _IL_String_IndexOf, marshal_ippSii)
        IL_METHOD("GetHashCode", "(T)i", _IL_String_GetHashCode, marshal_ipp)
        IL_METHOD("FindInRange", "(TiiioSystem.String;)i", 
_IL_String_FindInRange, marshal_ippiiip)
--- 519,522 ----
***************
*** 1830,1833 ****
--- 1830,1842 ----
  #if !defined(HAVE_LIBFFI)
  
+ static void marshal_jppiiiiip(void (*fn)(), void *rvalue, void **avalue)
+ {
+       *((ILNativeUInt *)rvalue) = (*(ILNativeUInt (*)(void *, void *, 
ILInt32, ILInt32, ILInt32, ILInt32, ILInt32, void *))fn)(*((void * 
*)(avalue[0])), *((void * *)(avalue[1])), *((ILInt32 *)(avalue[2])), *((ILInt32 
*)(avalue[3])), *((ILInt32 *)(avalue[4])), *((ILInt32 *)(avalue[5])), 
*((ILInt32 *)(avalue[6])), *((void * *)(avalue[7])));
+ }
+ 
+ #endif
+ 
+ #if !defined(HAVE_LIBFFI)
+ 
  static void marshal_vppji(void (*fn)(), void *rvalue, void **avalue)
  {
***************
*** 1840,1843 ****
--- 1849,1853 ----
  
  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_END

Index: lib_emit.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_emit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lib_emit.c  28 Jun 2002 06:01:08 -0000      1.2
--- lib_emit.c  18 Mar 2003 11:01:04 -0000      1.3
***************
*** 2,6 ****
   * lib_emit.c - Internalcall methods for the "Reflection.Emit" classes.
   *
!  * Copyright (C) 2002  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * lib_emit.c - Internalcall methods for the "Reflection.Emit" classes.
   *
!  * Copyright (C) 2002, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 27,30 ****
--- 27,46 ----
  
  /*
+  * 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 *writer)
+ {
+       /* TODO */
+       *writer = 0;
+       return 0;
+ }
+ 
+ /*
   * private void ClrSetEntryPoint(IntPtr nativeMethod, PEFileKinds fileKind);
   */
***************
*** 44,51 ****
                                                                                
          ILString *name)
  {
!   ILImage *image = ILProgramItem_Image(assembly);
!   ILToken token = ILProgramItem_Token(assembly);
!   const char *str = (const char *)ILStringToAnsi(_thread, name);
!   return (ILNativeInt)ILModuleCreate(image, token, str, NULL);
  }
  
--- 60,67 ----
                                                                                
          ILString *name)
  {
!       ILImage *image = ILProgramItem_Image(assembly);
!       ILToken token = ILProgramItem_Token(assembly);
!       const char *str = (const char *)ILStringToAnsi(_thread, name);
!       return (ILNativeInt)ILModuleCreate(image, token, str, NULL);
  }
  
***************
*** 53,60 ****
  };
  #endif
- 
- 
- 
- 
- 
- 
--- 69,70 ----