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

Fixed hotswap target memory allocation

Browse source
This commit is contained in:
Brian Fiete 2023-02-20 14:46:08 -05:00
parent d405104757
commit 3dbab0f42b
2 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

36
IDEHelper/WinDebugger.cpp
View file

@ -13065,7 +13065,7 @@ void WinDebugger::ReserveHotTargetMemory(int size)
#endif #endif
} }
BfLogDbg("ReserveHotTargetMemory %p %d", hotTargetMemory.mPtr, hotTargetMemory.mSize); BfLogDbg("ReserveHotTargetMemory %p %d\n", hotTargetMemory.mPtr, hotTargetMemory.mSize);
int err = GetLastError(); int err = GetLastError();
mHotTargetMemory.push_back(hotTargetMemory); mHotTargetMemory.push_back(hotTargetMemory);
} }
@ -13078,16 +13078,34 @@ addr_target WinDebugger::AllocHotTargetMemory(int size, bool canExecute, bool ca
else if (canExecute) else if (canExecute)
prot = PAGE_EXECUTE_READ; prot = PAGE_EXECUTE_READ;
auto hotTargetMemory = (HotTargetMemory*)&mHotTargetMemory.back();
if (hotTargetMemory->mPtr == 0)
{
Fail("Failed to allocate memory for hot loading");
return 0;
}
size = (size + (mPageSize - 1)) & ~(mPageSize - 1); size = (size + (mPageSize - 1)) & ~(mPageSize - 1);
*outAllocSize = size; *outAllocSize = size;
HotTargetMemory* hotTargetMemory = NULL;
bool foundHotTargetMemory = false;
for (int i = mHotTargetMemory.mSize - 1; i >= BF_MAX(mHotTargetMemory.mSize - 32, 0); i--)
{
hotTargetMemory = &mHotTargetMemory[i];
if (hotTargetMemory->mPtr == 0)
{
Fail("Failed to allocate memory for hot loading");
return 0;
}
if (hotTargetMemory->GetSizeLeft() >= size)
{
foundHotTargetMemory = true;
break;
}
}
if (!foundHotTargetMemory)
{
ReserveHotTargetMemory(size);
foundHotTargetMemory = true;
hotTargetMemory = &mHotTargetMemory.back();
}
BF_ASSERT(hotTargetMemory->mOffset + size <= hotTargetMemory->mSize); BF_ASSERT(hotTargetMemory->mOffset + size <= hotTargetMemory->mSize);
addr_target result = hotTargetMemory->mPtr + hotTargetMemory->mOffset; addr_target result = hotTargetMemory->mPtr + hotTargetMemory->mOffset;

6
IDEHelper/WinDebugger.h
View file

@ -301,6 +301,12 @@ public:
addr_target mPtr; addr_target mPtr;
int mOffset; int mOffset;
int mSize; int mSize;
public:
int GetSizeLeft()
{
return mSize - mOffset;
}
}; };
#define WD_MEMCACHE_SIZE 8*1024 #define WD_MEMCACHE_SIZE 8*1024