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

Merge remote-tracking branch 'upstream/master' into HighlightCurrentLine

Browse source
This commit is contained in:
blat-blatnik 2022-01-07 01:54:50 +01:00
commit 4e46b7eab3
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
BeefRT/dbg/gc.cpp
View file

@ -1387,17 +1387,7 @@ void BFGC::AdjustStackPtr(intptr& addr, int& size)
bool BFGC::ScanThreads() bool BFGC::ScanThreads()
{ {
BP_ZONE("BFGC::ScanThreads"); BP_ZONE("BFGC::ScanThreads");
if (mStackScanIdx == 0)
{
// 'Prime' register capture
intptr regVals[128];
intptr stackPtr = 0;
BfpThreadResult threadResult;
int regValCount = 128;
BfpThread_GetIntRegisters(BfpThread_GetCurrent(), &stackPtr, regVals, &regValCount, &threadResult);
}
mUsingThreadUnlocked = true; mUsingThreadUnlocked = true;
BF_FULL_MEMORY_FENCE(); BF_FULL_MEMORY_FENCE();
@ -2403,6 +2393,16 @@ void BFGC::PerformCollection()
{ {
BP_ZONE("TriggerCollection"); BP_ZONE("TriggerCollection");
if (mCollectIdx == 0)
{
// 'Prime' register capture
intptr regVals[128];
intptr stackPtr = 0;
BfpThreadResult threadResult;
int regValCount = 128;
BfpThread_GetIntRegisters(BfpThread_GetCurrent(), &stackPtr, regVals, &regValCount, &threadResult);
}
int prevMarkId = mCurMarkId; int prevMarkId = mCurMarkId;
DWORD startTick = BFTickCount(); DWORD startTick = BFTickCount();

6
IDEHelper/Compiler/BfModule.cpp
View file

@ -14480,6 +14480,12 @@ BfIRValue BfModule::AllocLocalVariable(BfType* type, const StringImpl& name, boo
void BfModule::DoAddLocalVariable(BfLocalVariable* localVar) void BfModule::DoAddLocalVariable(BfLocalVariable* localVar)
{ {
while (localVar->mName.StartsWith('@'))
{
localVar->mNamePrefixCount++;
localVar->mName.Remove(0);
}
localVar->mLocalVarIdx = (int)mCurMethodState->mLocals.size(); localVar->mLocalVarIdx = (int)mCurMethodState->mLocals.size();
mCurMethodState->mLocals.push_back(localVar); mCurMethodState->mLocals.push_back(localVar);