Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-21 09:27:59 +02:00
Code Activity

Reflection fixes for static values

Browse source
This commit is contained in:
Brian Fiete 2020-07-06 09:55:19 -07:00
parent 78dd56d6c5
commit 6cd66a2182
9 changed files with 165 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BeefLibs/corlib/src/Enum.bf
View file

@ -8,7 +8,7 @@ namespace System
{
for (var field in type.GetFields())
{
if (field.[Friend]mFieldData.[Friend]mConstValue == iVal)
if (field.[Friend]mFieldData.[Friend]mData == iVal)
{
strBuffer.Append(field.Name);
return;
@ -24,7 +24,7 @@ namespace System
for (var field in typeInst.GetFields())
{
if (str.Equals(field.[Friend]mFieldData.mName, ignoreCase))
return .Ok(*((T*)(&field.[Friend]mFieldData.mConstValue)));
return .Ok(*((T*)(&field.[Friend]mFieldData.mData)));
}
return .Err;

128
BeefLibs/corlib/src/Reflection/FieldInfo.bf
View file

@ -24,7 +24,7 @@ namespace System.Reflection
{
get
{
return mFieldData.mDataOffset;
return (int32)mFieldData.mData;
}
}
@ -64,7 +64,7 @@ namespace System.Reflection
}
Type fieldType = Type.[Friend]GetType(mFieldData.mFieldTypeId);
void* fieldDataAddr = ((uint8*)Internal.UnsafeCastToPtr(obj)) + mFieldData.mDataOffset + dataOffsetAdjust;
void* fieldDataAddr = ((uint8*)Internal.UnsafeCastToPtr(obj)) + (int)mFieldData.mData + dataOffsetAdjust;
if (value == null)
{
@ -123,7 +123,7 @@ namespace System.Reflection
Type fieldType = Type.[Friend]GetType(mFieldData.mFieldTypeId);
void* dataAddr = ((uint8*)Internal.UnsafeCastToPtr(obj)) + mFieldData.mDataOffset + dataOffsetAdjust;
void* dataAddr = ((uint8*)Internal.UnsafeCastToPtr(obj)) + (int)mFieldData.mData + dataOffsetAdjust;
if (value.VariantType != fieldType)
return .Err;//("Invalid type");
@ -158,19 +158,37 @@ namespace System.Reflection
{
value = default(TMember);
Type tTarget;
void* targetDataAddr = GetDataPtrAndType(target, out tTarget);
void* targetDataAddr;
if (target == null)
{
if (mFieldData.mFlags.HasFlag(FieldFlags.Const))
{
// Unhandled
return .Err;
}
if (!mFieldData.mFlags.HasFlag(FieldFlags.Static))
return .Err;
targetDataAddr = null;
}
else
{
Type tTarget;
targetDataAddr = GetDataPtrAndType(target, out tTarget);
if (!tTarget.IsSubtypeOf(mTypeInstance))
return .Err; //"Invalid type");
}
Type tMember = typeof(TMember);
targetDataAddr = (uint8*)targetDataAddr + mFieldData.mDataOffset;
targetDataAddr = (uint8*)targetDataAddr + (int)mFieldData.mData;
Type fieldType = Type.[Friend]GetType(mFieldData.mFieldTypeId);
if (tMember.[Friend]mTypeCode == TypeCode.Object)
{
if (!tTarget.IsSubtypeOf(mTypeInstance))
Runtime.FatalError();
value = *(TMember*)targetDataAddr;
}
else if (fieldType.[Friend]mTypeCode == tMember.[Friend]mTypeCode)
@ -189,13 +207,29 @@ namespace System.Reflection
{
Variant value = Variant();
Type tTarget;
void* targetDataAddr = GetDataPtrAndType(target, out tTarget);
void* targetDataAddr;
if (target == null)
{
if (mFieldData.mFlags.HasFlag(FieldFlags.Const))
{
return Variant.Create(FieldType, &mFieldData.mData);
}
if (!tTarget.IsSubtypeOf(mTypeInstance))
Runtime.FatalError("Invalid type");
if (!mFieldData.mFlags.HasFlag(FieldFlags.Static))
return .Err;
targetDataAddr = (uint8*)targetDataAddr + mFieldData.mDataOffset;
targetDataAddr = null;
}
else
{
Type tTarget;
targetDataAddr = GetDataPtrAndType(target, out tTarget);
if (!tTarget.IsSubtypeOf(mTypeInstance))
return .Err; //Invalid type;
}
targetDataAddr = (uint8*)targetDataAddr + (int)mFieldData.mData;
Type fieldType = Type.[Friend]GetType(mFieldData.mFieldTypeId);
@ -220,13 +254,29 @@ namespace System.Reflection
{
Variant value = Variant();
Type tTarget;
void* targetDataAddr = GetDataPtrAndType(target, out tTarget);
void* targetDataAddr;
if (target == null)
{
if (mFieldData.mFlags.HasFlag(FieldFlags.Const))
{
return Variant.Create(FieldType, &mFieldData.mData);
}
if (!tTarget.IsSubtypeOf(mTypeInstance))
Runtime.FatalError("Invalid type");
if (!mFieldData.mFlags.HasFlag(FieldFlags.Static))
return .Err;
targetDataAddr = (uint8*)targetDataAddr + mFieldData.mDataOffset;
targetDataAddr = null;
}
else
{
Type tTarget;
targetDataAddr = GetDataPtrAndType(target, out tTarget);
if (!tTarget.IsSubtypeOf(mTypeInstance))
return .Err; //Invalid type;
}
targetDataAddr = (uint8*)targetDataAddr + (int)mFieldData.mData;
Type fieldType = Type.[Friend]GetType(mFieldData.mFieldTypeId);
@ -239,48 +289,6 @@ namespace System.Reflection
return value;
}
public Result<Variant> GetValue()
{
Variant value = Variant();
//TODO: Assert static
if (mFieldData.mFlags.HasFlag(FieldFlags.Const))
{
return Variant.Create(FieldType, &mFieldData.mConstValue);
}
ThrowUnimplemented();
//Type tTarget;
#unwarn
void* targetDataAddr = (void*)(int)mFieldData.mConstValue;
Type fieldType = Type.[Friend]GetType(mFieldData.mFieldTypeId);
value.[Friend]mStructType = (int)Internal.UnsafeCastToPtr(fieldType);
TypeCode typeCode = fieldType.[Friend]mTypeCode;
if (typeCode == TypeCode.Enum)
typeCode = fieldType.UnderlyingType.[Friend]mTypeCode;
if (typeCode == TypeCode.Int32)
{
*(int32*)&value.[Friend]mData = *(int32*)targetDataAddr;
}
else if (typeCode == TypeCode.Object)
{
value.[Friend]mStructType = 0;
value.[Friend]mData = (int)targetDataAddr;
}
else
{
return .Err;
}
return value;
}
public struct Enumerator : IEnumerator<FieldInfo>
{
BindingFlags mBindingFlags;

8
BeefLibs/corlib/src/Reflection/MethodInfo.bf
View file

@ -105,12 +105,12 @@ namespace System.Reflection
if (fieldType.IsStruct)
{
SplatArg((TypeInstance)fieldType, (uint8*)ptr + fieldData.mDataOffset);
SplatArg((TypeInstance)fieldType, (uint8*)ptr + (int)fieldData.mData);
}
else
{
ffiParamList.Add(FFIType.Get(fieldType, null, null));
ffiArgList.Add((uint8*)ptr + fieldData.mDataOffset);
ffiArgList.Add((uint8*)ptr + (int)fieldData.mData);
}
}
}
@ -387,12 +387,12 @@ namespace System.Reflection
if (fieldType.IsStruct)
{
SplatArg((TypeInstance)fieldType, (uint8*)ptr + fieldData.mDataOffset);
SplatArg((TypeInstance)fieldType, (uint8*)ptr + (int)fieldData.mData);
}
else
{
ffiParamList.Add(FFIType.Get(fieldType, null, null));
ffiArgList.Add((uint8*)ptr + fieldData.mDataOffset);
ffiArgList.Add((uint8*)ptr + (int)fieldData.mData);
}
}
}

3
BeefLibs/corlib/src/Type.bf
View file

@ -607,8 +607,7 @@ namespace System.Reflection
public struct FieldData
{
public String mName;
public int64 mConstValue;
public int32 mDataOffset;
public int64 mData;
public TypeId mFieldTypeId;
public FieldFlags mFlags;
public int32 mCustomAttributesIdx;