[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h,1.47,1.48 int_table.
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h,1.47,1.48 int_table.c,1.49,1.50 lib_emit.c,1.3,1.4 |
|
Date: |
Thu, 20 Mar 2003 01:26:22 -0500 |
Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv2377/engine
Modified Files:
int_proto.h int_table.c lib_emit.c
Log Message:
Stub out internalcalls for EventBuilder, PropertyBuilder, and FieldBuilder.
Index: int_proto.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_proto.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** int_proto.h 18 Mar 2003 11:01:04 -0000 1.47
--- int_proto.h 20 Mar 2003 06:26:20 -0000 1.48
***************
*** 369,374 ****
--- 369,387 ----
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_EventBuilder_ClrEventCreate(ILExecThread * _thread,
ILNativeInt _p1, ILString * _p2, ILObject * _p3, ILInt32 _p4);
+ extern void _IL_EventBuilder_ClrEventAddSemantics(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, void * _p3);
+
+ extern ILNativeInt _IL_FieldBuilder_ClrFieldCreate(ILExecThread * _thread,
ILNativeInt _p1, ILString * _p2, ILObject * _p3, ILInt32 _p4);
+ extern void _IL_FieldBuilder_ClrFieldSetConstant(ILExecThread * _thread,
ILNativeInt _p1, ILObject * _p2);
+ extern void _IL_FieldBuilder_ClrFieldSetMarshal(ILExecThread * _thread,
ILNativeInt _p1, System_Array * _p2);
+ extern void _IL_FieldBuilder_ClrFieldSetOffset(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2);
extern ILNativeInt _IL_ModuleBuilder_ClrModuleCreate(ILExecThread * _thread,
ILNativeInt _p1, ILString * _p2);
+
+ extern ILNativeInt _IL_PropertyBuilder_ClrPropertyCreate(ILExecThread *
_thread, ILNativeInt _p1, ILString * _p2, ILInt32 _p3, ILObject * _p4,
System_Array * _p5);
+ extern void _IL_PropertyBuilder_ClrPropertyAddSemantics(ILExecThread *
_thread, ILNativeInt _p1, ILInt32 _p2, void * _p3);
+ extern void _IL_PropertyBuilder_ClrPropertySetConstant(ILExecThread *
_thread, ILNativeInt _p1, ILObject * _p2);
extern ILInt32 _IL_CultureInfo_InternalCultureID(ILExecThread * _thread);
Index: int_table.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_table.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** int_table.c 18 Mar 2003 11:01:04 -0000 1.49
--- int_table.c 20 Mar 2003 06:26:20 -0000 1.50
***************
*** 1851,1854 ****
--- 1851,1902 ----
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_END
+
+ #endif
+
+ #if !defined(HAVE_LIBFFI)
+
+ static void marshal_jpjppi(void (*fn)(), void *rvalue, void **avalue)
+ {
+ *((ILNativeUInt *)rvalue) = (*(ILNativeUInt (*)(void *, ILNativeUInt,
void *, void *, ILInt32))fn)(*((void * *)(avalue[0])), *((ILNativeUInt
*)(avalue[1])), *((void * *)(avalue[2])), *((void * *)(avalue[3])), *((ILInt32
*)(avalue[4])));
+ }
+
+ #endif
+
+ #if !defined(HAVE_LIBFFI)
+
+ static void marshal_vpjip(void (*fn)(), void *rvalue, void **avalue)
+ {
+ (*(void (*)(void *, ILNativeUInt, ILInt32, void *))fn)(*((void *
*)(avalue[0])), *((ILNativeUInt *)(avalue[1])), *((ILInt32 *)(avalue[2])),
*((void * *)(avalue[3])));
+ }
+
+ #endif
+
+ #ifndef _IL_EventBuilder_suppressed
+
+ IL_METHOD_BEGIN(EventBuilder_Methods)
+ IL_METHOD("ClrEventCreate",
"(joSystem.String;oSystem.Type;vSystem.Reflection.EventAttributes;)j",
_IL_EventBuilder_ClrEventCreate, marshal_jpjppi)
+ IL_METHOD("ClrEventAddSemantics",
"(jvSystem.Reflection.MethodSemanticsAttributes;vSystem.Reflection.Emit.MethodToken;)V",
_IL_EventBuilder_ClrEventAddSemantics, marshal_vpjip)
+ IL_METHOD_END
+
+ #endif
+
+ #if !defined(HAVE_LIBFFI)
+
+ static void marshal_vpji(void (*fn)(), void *rvalue, void **avalue)
+ {
+ (*(void (*)(void *, ILNativeUInt, ILInt32))fn)(*((void *
*)(avalue[0])), *((ILNativeUInt *)(avalue[1])), *((ILInt32 *)(avalue[2])));
+ }
+
+ #endif
+
+ #ifndef _IL_FieldBuilder_suppressed
+
+ IL_METHOD_BEGIN(FieldBuilder_Methods)
+ IL_METHOD("ClrFieldCreate",
"(joSystem.String;oSystem.Type;vSystem.Reflection.FieldAttributes;)j",
_IL_FieldBuilder_ClrFieldCreate, marshal_jpjppi)
+ IL_METHOD("ClrFieldSetConstant", "(joSystem.Object;)V",
_IL_FieldBuilder_ClrFieldSetConstant, marshal_vpjp)
+ IL_METHOD("ClrFieldSetMarshal", "(j[B)V",
_IL_FieldBuilder_ClrFieldSetMarshal, marshal_vpjp)
+ IL_METHOD("ClrFieldSetOffset", "(ji)V",
_IL_FieldBuilder_ClrFieldSetOffset, marshal_vpji)
IL_METHOD_END
***************
*** 1872,1875 ****
--- 1920,1942 ----
#endif
+ #if !defined(HAVE_LIBFFI)
+
+ static void marshal_jpjpipp(void (*fn)(), void *rvalue, void **avalue)
+ {
+ *((ILNativeUInt *)rvalue) = (*(ILNativeUInt (*)(void *, ILNativeUInt,
void *, ILInt32, void *, void *))fn)(*((void * *)(avalue[0])), *((ILNativeUInt
*)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32 *)(avalue[3])), *((void *
*)(avalue[4])), *((void * *)(avalue[5])));
+ }
+
+ #endif
+
+ #ifndef _IL_PropertyBuilder_suppressed
+
+ IL_METHOD_BEGIN(PropertyBuilder_Methods)
+ IL_METHOD("ClrPropertyCreate",
"(joSystem.String;vSystem.Reflection.PropertyAttributes;oSystem.Type;[oSystem.Type;)j",
_IL_PropertyBuilder_ClrPropertyCreate, marshal_jpjpipp)
+ IL_METHOD("ClrPropertyAddSemantics",
"(jvSystem.Reflection.MethodSemanticsAttributes;vSystem.Reflection.Emit.MethodToken;)V",
_IL_PropertyBuilder_ClrPropertyAddSemantics, marshal_vpjip)
+ IL_METHOD("ClrPropertySetConstant", "(joSystem.Object;)V",
_IL_PropertyBuilder_ClrPropertySetConstant, marshal_vpjp)
+ IL_METHOD_END
+
+ #endif
+
#ifndef _IL_CultureInfo_suppressed
***************
*** 2505,2508 ****
--- 2572,2581 ----
{"Enum", "System", Enum_Methods},
#endif
+ #ifndef _IL_EventBuilder_suppressed
+ {"EventBuilder", "System.Reflection.Emit", EventBuilder_Methods},
+ #endif
+ #ifndef _IL_FieldBuilder_suppressed
+ {"FieldBuilder", "System.Reflection.Emit", FieldBuilder_Methods},
+ #endif
#ifndef _IL_FieldInfo_suppressed
{"FieldInfo", "System.Reflection", FieldInfo_Methods},
***************
*** 2552,2555 ****
--- 2625,2631 ----
#ifndef _IL_Object_suppressed
{"Object", "System", Object_Methods},
+ #endif
+ #ifndef _IL_PropertyBuilder_suppressed
+ {"PropertyBuilder", "System.Reflection.Emit", PropertyBuilder_Methods},
#endif
#ifndef _IL_RegexpMethods_suppressed
Index: lib_emit.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_emit.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** lib_emit.c 18 Mar 2003 11:01:04 -0000 1.3
--- lib_emit.c 20 Mar 2003 06:26:20 -0000 1.4
***************
*** 26,29 ****
--- 26,31 ----
#endif
+ #ifdef IL_CONFIG_REFLECTION
+
/*
* private static IntPtr ClrAssemblyCreate(String name, int v1, int v2,
***************
*** 54,57 ****
--- 56,142 ----
/*
+ * internal static int ClrGetItemToken(IntPtr item);
+ */
+ ILInt32 _IL_AssemblyBuilder_ClrGetItemToken(ILExecThread *_thread,
+
ILNativeInt item)
+ {
+ if(item)
+ {
+ return ILProgramItem_Token((ILProgramItem *)item);
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ /*
+ * private static IntPtr ClrEventCreate(IntPtr classInfo, String name,
+ *
Type type, EventAttributes attrs);
+ */
+ ILNativeInt _IL_EventBuilder_ClrEventCreate(ILExecThread *_thread,
+
ILNativeInt classInfo,
+
ILString *name, ILObject *type,
+
ILInt32 attrs)
+ {
+ /* TODO */
+ return 0;
+ }
+
+ /*
+ * private static ClrEventAddSemantics(IntPtr eventInfo,
+ *
MethodSemanticsAttributes attr,
+ *
MethodToken token);
+ */
+ void _IL_EventBuilder_ClrEventAddSemantics(ILExecThread *_thread,
+
ILNativeInt eventInfo,
+
ILInt32 attr, void *token)
+ {
+ /* TODO */
+ }
+
+ /*
+ * private static IntPtr ClrFieldCreate(IntPtr classInfo, String name,
+ *
Type type, FieldAttributes attrs);
+ */
+ ILNativeInt _IL_FieldBuilder_ClrFieldCreate(ILExecThread *_thread,
+
ILNativeInt classInfo,
+
ILString *name, ILObject *type,
+
ILInt32 attrs)
+ {
+ /* TODO */
+ return 0;
+ }
+
+ /*
+ * private static void ClrFieldSetConstant(IntPtr item, Object value);
+ */
+ void _IL_FieldBuilder_ClrFieldSetConstant(ILExecThread *_thread,
+
ILNativeInt item,
+
ILObject *value)
+ {
+ /* TODO */
+ }
+
+ /*
+ * private static void ClrFieldSetMarshal(IntPtr item, byte[] data);
+ */
+ void _IL_FieldBuilder_ClrFieldSetMarshal(ILExecThread *_thread,
+
ILNativeInt item,
+
System_Array *data)
+ {
+ /* TODO */
+ }
+
+ /*
+ * private static void ClrFieldSetOffset(IntPtr item, int offset);
+ */
+ void _IL_FieldBuilder_ClrFieldSetOffset(ILExecThread *_thread,
+
ILNativeInt item, ILInt32 offset)
+ {
+ /* TODO */
+ }
+
+ /*
* private IntPtr ClrModuleCreate(IntPtr assembly, String name);
*/
***************
*** 65,68 ****
--- 150,195 ----
return (ILNativeInt)ILModuleCreate(image, token, str, NULL);
}
+
+ /*
+ * private static IntPtr ClrPropertyCreate(IntPtr classInfo, String name,
+ *
PropertyAttributes attrs,
+ *
Type returnType,
+ *
Type[] paramTypes);
+ */
+ ILNativeInt _IL_PropertyBuilder_ClrPropertyCreate(ILExecThread *_thread,
+
ILNativeInt classInfo,
+
ILString *name,
+
ILInt32 attrs,
+
ILObject *returnType,
+
System_Array *paramTypes)
+ {
+ /* TODO */
+ return 0;
+ }
+
+ /*
+ * private static void ClrPropertyAddSemantics(IntPtr item,
+ *
MethodSemanticsAttributes attr,
+ *
MethodToken token);
+ */
+ void _IL_PropertyBuilder_ClrPropertyAddSemantics(ILExecThread *_thread,
+
ILNativeInt item,
+
ILInt32 attr,
+
void *token)
+ {
+ /* TODO */
+ }
+
+ /*
+ * private static void ClrPropertySetConstant(IntPtr item, Object value);
+ */
+ void _IL_PropertyBuilder_ClrPropertySetConstant(ILExecThread *_thread,
+
ILNativeInt item,
+
ILObject *value)
+ {
+ /* TODO */
+ }
+
+ #endif /* IL_CONFIG_REFLECTION */
#ifdef __cplusplus
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h,1.47,1.48 int_table.c,1.49,1.50 lib_emit.c,1.3,1.4,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Reflection/Emit AssemblyBuilder.cs,1.3,1.4 EventBuilder.cs,1.2,1.3 FieldBuilder.cs,1.2,1.3 ModuleBuilder.cs,1.4,1.5 PropertyBuilder.cs,1.2,1.3 TypeBuilder.cs,1.3,1.4 UnmanagedMarshal.cs,1.2,1.3
- Next by Date:
[Dotgnu-pnet-commits] CVS: pnet ChangeLog,1.2255,1.2256
- Previous by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Reflection/Emit AssemblyBuilder.cs,1.3,1.4 EventBuilder.cs,1.2,1.3 FieldBuilder.cs,1.2,1.3 ModuleBuilder.cs,1.4,1.5 PropertyBuilder.cs,1.2,1.3 TypeBuilder.cs,1.3,1.4 UnmanagedMarshal.cs,1.2,1.3
- Next by thread:
[Dotgnu-pnet-commits] CVS: pnet ChangeLog,1.2255,1.2256
- Index(es):