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

addr_ce pointer-size fixes

Browse source
This commit is contained in:
Brian Fiete 2021-02-02 10:46:21 -08:00
parent b916273a97
commit cb877b1860
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
IDEHelper/Compiler/CeMachine.cpp
View file

@ -3530,7 +3530,11 @@ bool CeContext::WriteConstant(BfModule* module, addr_ce addr, BfConstant* consta
if ((constant->mConstType == BfConstType_TypeOf) || (constant->mConstType == BfConstType_TypeOf_WithData)) if ((constant->mConstType == BfConstType_TypeOf) || (constant->mConstType == BfConstType_TypeOf_WithData))
{ {
auto constTypeOf = (BfTypeOf_Const*)constant; auto constTypeOf = (BfTypeOf_Const*)constant;
CE_GETC(addr_ce) = GetReflectType(constTypeOf->mType->mTypeId); addr_ce typeAddr = GetReflectType(constTypeOf->mType->mTypeId);
if (mCeMachine->mCeModule->mSystem->mPtrSize == 4)
CE_GETC(int32) = typeAddr;
else
CE_GETC(int64) = typeAddr;
return true; return true;
} }
@ -4990,7 +4994,7 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
int32 typeId = CE_GETINST(int32); int32 typeId = CE_GETINST(int32);
auto reflectType = GetReflectType(typeId); auto reflectType = GetReflectType(typeId);
_FixVariables(); _FixVariables();
*(addr_ce*)(framePtr + frameOfs) = reflectType; CeSetAddrVal(framePtr + frameOfs, reflectType, ptrSize);
} }
break; break;
case CeOp_GetString: case CeOp_GetString:
@ -5004,8 +5008,7 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
_FixVariables(); _FixVariables();
ceStringEntry.mBindExecuteId = mExecuteId; ceStringEntry.mBindExecuteId = mExecuteId;
} }
CeSetAddrVal(framePtr + frameOfs, ceStringEntry.mStringAddr, ptrSize);
*(addr_ce*)(framePtr + frameOfs) = ceStringEntry.mStringAddr;
} }
break; break;
case CeOp_Malloc: case CeOp_Malloc:
@ -5015,7 +5018,7 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
CE_CHECKALLOC(size); CE_CHECKALLOC(size);
uint8* mem = CeMalloc(size); uint8* mem = CeMalloc(size);
_FixVariables(); _FixVariables();
*(addr_ce*)(framePtr + frameOfs) = mem - memStart; CeSetAddrVal(framePtr + frameOfs, mem - memStart, ptrSize);
} }
break; break;
case CeOp_Free: case CeOp_Free: