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

Only attempt to allocate hot heap when hot swapping is enabled

Browse source
This commit is contained in:
Hunter Bridges 2021-04-14 11:04:54 -07:00
parent 4211c267a6
commit d237c2aba2
6 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
IDE/src/Debugger/DebugManager.bf
View file

@ -140,7 +140,7 @@ namespace IDE.Debugger
static extern bool Debugger_OpenMiniDump(char8* filename); static extern bool Debugger_OpenMiniDump(char8* filename);
[CallingConvention(.Stdcall),CLink] [CallingConvention(.Stdcall),CLink]
static extern bool Debugger_OpenFile(char8* launchPath, char8* targetPath, char8* args, char8* workingDir, void* envBlockPtr, int32 envBlockLen); static extern bool Debugger_OpenFile(char8* launchPath, char8* targetPath, char8* args, char8* workingDir, void* envBlockPtr, int32 envBlockLen, bool hotSwapEnabled);
[CallingConvention(.Stdcall),CLink] [CallingConvention(.Stdcall),CLink]
static extern bool Debugger_Attach(int32 processId, AttachFlags attachFlags); static extern bool Debugger_Attach(int32 processId, AttachFlags attachFlags);
@ -429,7 +429,7 @@ namespace IDE.Debugger
mIsRunningCompiled = isCompiled; mIsRunningCompiled = isCompiled;
mIsRunningWithHotSwap = hotSwapEnabled; mIsRunningWithHotSwap = hotSwapEnabled;
return Debugger_OpenFile(launchPath, targetPath, args, workingDir, envBlock.Ptr, (int32)envBlock.Length); return Debugger_OpenFile(launchPath, targetPath, args, workingDir, envBlock.Ptr, (int32)envBlock.Length, hotSwapEnabled);
} }
public void SetSymSrvOptions(String symCacheDir, String symSrvStr, SymSrvFlags symSrvFlags) public void SetSymSrvOptions(String symCacheDir, String symSrvStr, SymSrvFlags symSrvFlags)

4
IDEHelper/DebugManager.cpp
View file

@ -745,7 +745,7 @@ BF_EXPORT int BF_CALLTYPE Debugger_GetAddrSize()
return gDebugger->GetAddrSize(); return gDebugger->GetAddrSize();
} }
BF_EXPORT bool BF_CALLTYPE Debugger_OpenFile(const char* launchPath, const char* targetPath, const char* args, const char* workingDir, void* envBlockPtr, int envBlockSize) BF_EXPORT bool BF_CALLTYPE Debugger_OpenFile(const char* launchPath, const char* targetPath, const char* args, const char* workingDir, void* envBlockPtr, int envBlockSize, bool hotSwapEnabled)
{ {
BF_ASSERT(gDebugger == NULL); BF_ASSERT(gDebugger == NULL);
@ -775,7 +775,7 @@ BF_EXPORT bool BF_CALLTYPE Debugger_OpenFile(const char* launchPath, const char*
envBlock.Insert(0, (uint8*)envBlockPtr, envBlockSize); envBlock.Insert(0, (uint8*)envBlockPtr, envBlockSize);
} }
gDebugger->OpenFile(launchPath, targetPath, args, workingDir, envBlock); gDebugger->OpenFile(launchPath, targetPath, args, workingDir, envBlock, hotSwapEnabled);
return true; return true;
} }

2
IDEHelper/DebugTarget.cpp
View file

@ -82,7 +82,7 @@ static bool PathEquals(const String& pathA, String& pathB)
void DebugTarget::SetupTargetBinary() void DebugTarget::SetupTargetBinary()
{ {
bool wantsHotHeap = mDebugger->mDbgProcessId == 0; bool wantsHotHeap = (mDebugger->mHotSwapEnabled == true && mDebugger->mDbgProcessId == 0);
#ifdef BF_DBG_32 #ifdef BF_DBG_32
if (wantsHotHeap) if (wantsHotHeap)

2
IDEHelper/Debugger.h
View file

@ -257,7 +257,7 @@ public:
virtual void OutputRawMessage(const StringImpl& msg) = 0; virtual void OutputRawMessage(const StringImpl& msg) = 0;
virtual int GetAddrSize() = 0; virtual int GetAddrSize() = 0;
virtual bool CanOpen(const StringImpl& fileName, DebuggerResult* outResult) = 0; virtual bool CanOpen(const StringImpl& fileName, DebuggerResult* outResult) = 0;
virtual void OpenFile(const StringImpl& launchPath, const StringImpl& targetPath, const StringImpl& args, const StringImpl& workingDir, const Array<uint8>& envBlock) = 0; virtual void OpenFile(const StringImpl& launchPath, const StringImpl& targetPath, const StringImpl& args, const StringImpl& workingDir, const Array<uint8>& envBlock, bool hotSwapEnabled) = 0;
virtual bool Attach(int processId, BfDbgAttachFlags attachFlags) = 0; virtual bool Attach(int processId, BfDbgAttachFlags attachFlags) = 0;
virtual void Run() = 0; virtual void Run() = 0;
virtual void HotLoad(const Array<String>& objectFiles, int hotIdx) = 0; virtual void HotLoad(const Array<String>& objectFiles, int hotIdx) = 0;

3
IDEHelper/WinDebugger.cpp
View file

@ -1003,7 +1003,7 @@ bool WinDebugger::CanOpen(const StringImpl& fileName, DebuggerResult* outResult)
return canRead; return canRead;
} }
void WinDebugger::OpenFile(const StringImpl& launchPath, const StringImpl& targetPath, const StringImpl& args, const StringImpl& workingDir, const Array<uint8>& envBlock) void WinDebugger::OpenFile(const StringImpl& launchPath, const StringImpl& targetPath, const StringImpl& args, const StringImpl& workingDir, const Array<uint8>& envBlock, bool hotSwapEnabled)
{ {
BF_ASSERT(!mIsRunning); BF_ASSERT(!mIsRunning);
mLaunchPath = launchPath; mLaunchPath = launchPath;
@ -1011,6 +1011,7 @@ void WinDebugger::OpenFile(const StringImpl& launchPath, const StringImpl& targe
mArgs = args; mArgs = args;
mWorkingDir = workingDir; mWorkingDir = workingDir;
mEnvBlock = envBlock; mEnvBlock = envBlock;
mHotSwapEnabled = hotSwapEnabled;
mDebugTarget = new DebugTarget(this); mDebugTarget = new DebugTarget(this);
} }

3
IDEHelper/WinDebugger.h
View file

@ -427,6 +427,7 @@ public:
String mTargetPath; String mTargetPath;
String mArgs; String mArgs;
String mWorkingDir; String mWorkingDir;
bool mHotSwapEnabled;
Array<uint8> mEnvBlock; Array<uint8> mEnvBlock;
DebugTarget* mEmptyDebugTarget; DebugTarget* mEmptyDebugTarget;
DebugTarget* mDebugTarget; DebugTarget* mDebugTarget;
@ -617,7 +618,7 @@ public:
virtual void OutputRawMessage(const StringImpl& msg) override; virtual void OutputRawMessage(const StringImpl& msg) override;
virtual int GetAddrSize() override; virtual int GetAddrSize() override;
virtual bool CanOpen(const StringImpl& fileName, DebuggerResult* outResult) override; virtual bool CanOpen(const StringImpl& fileName, DebuggerResult* outResult) override;
virtual void OpenFile(const StringImpl& launchPath, const StringImpl& targetPath, const StringImpl& args, const StringImpl& workingDir, const Array<uint8>& envBlock) override; virtual void OpenFile(const StringImpl& launchPath, const StringImpl& targetPath, const StringImpl& args, const StringImpl& workingDir, const Array<uint8>& envBlock, bool hotSwapEnabled) override;
virtual bool Attach(int processId, BfDbgAttachFlags attachFlags) override; virtual bool Attach(int processId, BfDbgAttachFlags attachFlags) override;
virtual void Run() override; virtual void Run() override;
virtual void HotLoad(const Array<String>& objectFiles, int hotIdx) override; virtual void HotLoad(const Array<String>& objectFiles, int hotIdx) override;