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

Win32 debugging fixes, more work on custom compile commands

Browse source 
Fixed working dir for 'launch'
Fixed attaching to process - stack trace wasn't updating properly
Fixed more custom compile stuff, and BeefySysLib bin destination
Fixed linking issues related to Bfp* and Bp* exports in both BeefRT and BeefySysLib
Fixed a crash with conditional breakpoints
Fixed release mode IDE issues (related to hot swap breakpoints)
Fixed hotswapping type data with LLVM builds
Fixed 'Pause' state processing Running_ToTempBreakpoint for ScriptManager
Fixed Win32 step out when there's an ESP adjustment at the return site
Made step-out skip over "unimportant" instructions at return site
This commit is contained in:
Brian Fiete 2019-08-29 14:19:07 -07:00
parent 09016c8dc0
commit a367b8165f
60 changed files with 1131 additions and 1065 deletions
Download patch file Download diff file Expand all files Collapse all files

125
IDE/src/ScriptManager.bf
View file

@ -186,6 +186,7 @@ namespace IDE
{
DeleteAndClearItems!(mCmdList);
mFailed = false;
mCurCmd = null;
}
public void QueueCommands(StreamReader streamReader, StringView filePath, CmdFlags flags)
@ -466,6 +467,9 @@ namespace IDE
methodName = cmd;
}
if (mFailed)
return;
Target curTarget = mRoot;
for (var cmdPart in methodName.Split('.'))
{
@ -574,6 +578,16 @@ namespace IDE
return gApp.mPlatformName;
else if (token == "config")
return gApp.mConfigName;
else if (token == "optlevel")
{
var workspaceOptions = gApp.GetCurWorkspaceOptions();
if (workspaceOptions != null)
{
String str = new:tempAlloc .();
workspaceOptions.mBfOptimizationLevel.ToString(str);
return str;
}
}
return null;
}
@ -665,7 +679,7 @@ namespace IDE
if (doExec)
{
Exec(mCurCmd.mCmd);
mCurCmd.mExecIdx++;
mCurCmd?.mExecIdx++;
}
if (mCmdList.IsEmpty)
@ -888,7 +902,7 @@ namespace IDE
return false;
}
if (gApp.mBfResolveCompiler.IsPerformingBackgroundOperation())
if ((gApp.mBfResolveCompiler != null) && (gApp.mBfResolveCompiler.IsPerformingBackgroundOperation()))
return false;
if (gApp.[Friend]mDeferredOpen != .None)
return false;
@ -910,6 +924,9 @@ namespace IDE
if (!gApp.[Friend]mExecutionInstances.IsEmpty)
return false;
if (gApp.mDebugger == null)
return true;
if ((!gApp.AreTestsRunning()) && (!gApp.mDebugger.HasPendingDebugLoads()) &&
((gApp.mExecutionPaused) || (!gApp.mDebugger.mIsRunning)))
{
@ -929,6 +946,9 @@ namespace IDE
return false;
}
if (runState == .Running_ToTempBreakpoint)
return false;
Debug.Assert((runState == .NotStarted) || (runState == .Paused) || (runState == .Running_ToTempBreakpoint) ||
(runState == .Exception) || (runState == .Breakpoint) || (runState == .Terminated));
/*if (runState == .Paused)
@ -1133,6 +1153,62 @@ namespace IDE
}
}
public Project GetProject()
{
if (mScriptManager.mProjectName == null)
{
mScriptManager.Fail("Only usable in the context of a project");
return null;
}
let project = gApp.mWorkspace.FindProject(mScriptManager.mProjectName);
if (project == null)
{
mScriptManager.Fail("Unable to find project '{}'", mScriptManager.mProjectName);
return null;
}
return project;
}
[IDECommand]
public void CopyToDependents(String srcPath)
{
let depProject = GetProject();
if (depProject == null)
return;
for (let checkProject in gApp.mWorkspace.mProjects)
{
if (checkProject.HasDependency(depProject.mProjectName))
{
String fileName = scope .();
Path.GetFileName(srcPath, fileName);
List<String> targetPaths = scope .();
defer ClearAndDeleteItems(targetPaths);
let workspaceOptions = gApp.GetCurWorkspaceOptions();
let options = gApp.GetCurProjectOptions(checkProject);
gApp.[Friend]GetTargetPaths(checkProject, workspaceOptions, options, targetPaths);
if (!targetPaths.IsEmpty)
{
String targetDirPath = scope .();
Path.GetDirectoryPath(targetPaths[0], targetDirPath);
String destPath = scope .();
Path.GetAbsolutePath(fileName, targetDirPath, destPath);
if (File.CopyIfNewer(srcPath, destPath) case .Err)
{
mScriptManager.Fail("Failed to copy file '{}' to '{}'", srcPath, destPath);
return;
}
}
}
}
}
[IDECommand]
public void ExecuteRaw(String cmd)
{
@ -1353,6 +1429,49 @@ namespace IDE
ScriptManager.sActiveManager.Fail("Failed to find stack frame containing string '{}'", str);
}
public bool AssertRunning()
{
if (!gApp.mDebugger.mIsRunning)
{
mScriptManager.Fail("Expected target to be running");
return false;
}
return true;
}
public bool AssertDebuggerPaused()
{
if (!gApp.mDebugger.mIsRunning)
{
mScriptManager.Fail("Expected target to be running");
return false;
}
if (!gApp.mDebugger.IsPaused())
{
mScriptManager.Fail("Expected target to be paused");
return false;
}
return true;
}
[IDECommand]
public void StepInto()
{
if (!AssertDebuggerPaused())
return;
gApp.[Friend]StepInto();
}
[IDECommand]
public void StepOver()
{
if (!AssertDebuggerPaused())
return;
gApp.[Friend]StepOver();
}
[IDECommand]
public void SelectThread(String threadName)
{
@ -1948,7 +2067,7 @@ namespace IDE
[IDECommand]
public void Stop()
{
ScriptManager.sActiveManager.Clear();
mScriptManager.Clear();
}
[IDECommand]