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

Separated comptime mixin into Compiler.Mixin and Compiler.MixinRoot

Browse source
This commit is contained in:
Brian Fiete 2022-02-01 16:35:09 -05:00
parent 21366d48ec
commit 6c18ffd607
3 changed files with 71 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
BeefLibs/corlib/src/Compiler.bf
View file

@ -267,7 +267,7 @@ namespace System
static extern void Comptime_EmitAddInterface(int32 typeId, int32 ifaceTypeId); static extern void Comptime_EmitAddInterface(int32 typeId, int32 ifaceTypeId);
static extern void Comptime_EmitMethodEntry(int64 methodHandle, StringView text); static extern void Comptime_EmitMethodEntry(int64 methodHandle, StringView text);
static extern void Comptime_EmitMethodExit(int64 methodHandle, StringView text); static extern void Comptime_EmitMethodExit(int64 methodHandle, StringView text);
static extern void Comptime_EmitMixin(StringView text); static extern void Comptime_EmitMixin(String text);
[Comptime(OnlyFromComptime=true)] [Comptime(OnlyFromComptime=true)]
public static MethodBuilder CreateMethod(Type owner, StringView methodName, Type returnType, MethodFlags methodFlags) public static MethodBuilder CreateMethod(Type owner, StringView methodName, Type returnType, MethodFlags methodFlags)
@ -301,8 +301,15 @@ namespace System
Comptime_EmitMethodExit(methodHandle.mNativeMethodInstance, text); Comptime_EmitMethodExit(methodHandle.mNativeMethodInstance, text);
} }
[Comptime(ConstEval=true)]
public static void Mixin(String text)
{
if (Compiler.IsComptime)
Comptime_EmitMixin(text);
}
[Comptime] [Comptime]
public static void Mixin(StringView text) public static void MixinRoot(String text)
{ {
if (Compiler.IsComptime) if (Compiler.IsComptime)
Comptime_EmitMixin(text); Comptime_EmitMixin(text);

105
IDEHelper/Compiler/CeMachine.cpp
View file

@ -3381,6 +3381,57 @@ bool CeContext::CheckMemory(addr_ce addr, int32 size)
return true; return true;
} }
bool CeContext::GetStringFromAddr(addr_ce strInstAddr, StringImpl& str)
{
if (!CheckMemory(strInstAddr, 0))
return false;
BfTypeInstance* stringTypeInst = (BfTypeInstance*)mCeMachine->mCeModule->ResolveTypeDef(mCeMachine->mCompiler->mStringTypeDef, BfPopulateType_Data);
auto lenByteCount = stringTypeInst->mFieldInstances[0].mResolvedType->mSize;
auto lenOffset = stringTypeInst->mFieldInstances[0].mDataOffset;
auto allocSizeOffset = stringTypeInst->mFieldInstances[1].mDataOffset;
auto ptrOffset = stringTypeInst->mFieldInstances[2].mDataOffset;
uint8* strInst = (uint8*)(strInstAddr + mMemory.mVals);
int32 lenVal = *(int32*)(strInst + lenOffset);
char* charPtr = NULL;
if (lenByteCount == 4)
{
int32 allocSizeVal = *(int32*)(strInst + allocSizeOffset);
if ((allocSizeVal & 0x40000000) != 0)
{
int32 ptrVal = *(int32*)(strInst + ptrOffset);
charPtr = (char*)(ptrVal + mMemory.mVals);
}
else
{
charPtr = (char*)(strInst + ptrOffset);
}
}
else
{
int64 allocSizeVal = *(int64*)(strInst + allocSizeOffset);
if ((allocSizeVal & 0x4000000000000000LL) != 0)
{
int32 ptrVal = *(int32*)(strInst + ptrOffset);
charPtr = (char*)(ptrVal + mMemory.mVals);
}
else
{
charPtr = (char*)(strInst + ptrOffset);
}
}
int32 ptrVal = *(int32*)(strInst + ptrOffset);
if (charPtr != NULL)
str.Insert(str.length(), charPtr, lenVal);
return true;
}
bool CeContext::GetStringFromStringView(addr_ce addr, StringImpl& str) bool CeContext::GetStringFromStringView(addr_ce addr, StringImpl& str)
{ {
int ptrSize = mCeMachine->mCeModule->mSystem->mPtrSize; int ptrSize = mCeMachine->mCeModule->mSystem->mPtrSize;
@ -4748,52 +4799,9 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
else if (checkFunction->mFunctionKind == CeFunctionKind_FatalError) else if (checkFunction->mFunctionKind == CeFunctionKind_FatalError)
{ {
int32 strInstAddr = *(int32*)((uint8*)stackPtr + 0); int32 strInstAddr = *(int32*)((uint8*)stackPtr + 0);
CE_CHECKADDR(strInstAddr, 0);
BfTypeInstance* stringTypeInst = (BfTypeInstance*)ceModule->ResolveTypeDef(mCeMachine->mCompiler->mStringTypeDef, BfPopulateType_Data);
auto lenByteCount = stringTypeInst->mFieldInstances[0].mResolvedType->mSize;
auto lenOffset = stringTypeInst->mFieldInstances[0].mDataOffset;
auto allocSizeOffset = stringTypeInst->mFieldInstances[1].mDataOffset;
auto ptrOffset = stringTypeInst->mFieldInstances[2].mDataOffset;
uint8* strInst = (uint8*)(strInstAddr + memStart);
int32 lenVal = *(int32*)(strInst + lenOffset);
char* charPtr = NULL;
if (lenByteCount == 4)
{
int32 allocSizeVal = *(int32*)(strInst + allocSizeOffset);
if ((allocSizeVal & 0x40000000) != 0)
{
int32 ptrVal = *(int32*)(strInst + ptrOffset);
charPtr = (char*)(ptrVal + memStart);
}
else
{
charPtr = (char*)(strInst + ptrOffset);
}
}
else
{
int64 allocSizeVal = *(int64*)(strInst + allocSizeOffset);
if ((allocSizeVal & 0x4000000000000000LL) != 0)
{
int32 ptrVal = *(int32*)(strInst + ptrOffset);
charPtr = (char*)(ptrVal + memStart);
}
else
{
charPtr = (char*)(strInst + ptrOffset);
}
}
int32 ptrVal = *(int32*)(strInst + ptrOffset);
String error = "Fatal Error: "; String error = "Fatal Error: ";
if (charPtr != NULL) GetStringFromAddr(strInstAddr, error);
error.Insert(error.length(), charPtr, lenVal);
_Fail(error); _Fail(error);
return false; return false;
@ -5067,11 +5075,14 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
} }
else if (checkFunction->mFunctionKind == CeFunctionKind_EmitMixin) else if (checkFunction->mFunctionKind == CeFunctionKind_EmitMixin)
{ {
addr_ce strViewPtr = *(addr_ce*)((uint8*)stackPtr); SetAndRestoreValue<BfMethodInstance*> prevMethodInstance(mCurModule->mCurMethodInstance, mCallerMethodInstance);
SetAndRestoreValue<BfTypeInstance*> prevTypeInstance(mCurModule->mCurTypeInstance, mCallerTypeInstance);
int32 strInstAddr = *(int32*)((uint8*)stackPtr + 0);
String emitStr; String emitStr;
if (!GetStringFromStringView(strViewPtr, emitStr)) if (!GetStringFromAddr(strInstAddr, emitStr))
{ {
_Fail("Invalid StringView"); _Fail("Invalid String");
return false; return false;
} }

1
IDEHelper/Compiler/CeMachine.h
View file

@ -901,6 +901,7 @@ public:
BfType* GetBfType(int typeId); BfType* GetBfType(int typeId);
void PrepareConstStructEntry(CeConstStructData& constStructData); void PrepareConstStructEntry(CeConstStructData& constStructData);
bool CheckMemory(addr_ce addr, int32 size); bool CheckMemory(addr_ce addr, int32 size);
bool GetStringFromAddr(addr_ce strInstAddr, StringImpl& str);
bool GetStringFromStringView(addr_ce addr, StringImpl& str); bool GetStringFromStringView(addr_ce addr, StringImpl& str);
bool GetCustomAttribute(BfCustomAttributes* customAttributes, int attributeTypeId, addr_ce resultAddr); bool GetCustomAttribute(BfCustomAttributes* customAttributes, int attributeTypeId, addr_ce resultAddr);