+#ifdef ECERE_STATIC
+public import static "ecere"
+public import static "ec"
+#else
+public import "ecere"
+public import "ec"
+#endif
+
import "ide"
import "process"
import "debugFindCtx"
import "debugTools"
-//#define GDB_DEBUG_CONSOLE
-
-import "PathBox"
+#ifdef _DEBUG
+#define GDB_DEBUG_CONSOLE
+#endif
-extern char * strrchr(char * s, char c);
+extern char * strrchr(const char * s, int c);
#define uint _uint
+#define strlen _strlen
#include <stdarg.h>
#include <unistd.h>
#include <sys/time.h> // Required on Apple...
#endif
#undef uint
+#undef strlen
-//bool eString_PathInsidePath(char * to, char * path)
-bool eString_PathInsideOf(char * path, char * of)
+char * PrintNow()
{
- if(!path[0] || !of[0])
- return false; // What to do here? Ever used?
- else
+ int c;
+ char * s[6];
+ char * time;
+ DateTime now;
+ now.GetLocalTime();
+ for(c=0; c<6; c++)
+ s[c] = new char[8];
+ sprintf(s[0], "%04d", now.year);
+ sprintf(s[1], "%02d", now.month+1);
+ sprintf(s[2], "%02d", now.day);
+ sprintf(s[3], "%02d", now.hour);
+ sprintf(s[4], "%02d", now.minute);
+ sprintf(s[5], "%02d", now.second);
+ time = PrintString("*", s[0], s[1], s[2], "-", s[3], s[4], s[5], "*");
+ for(c=0; c<6; c++)
+ delete s[c];
+ return time;
+}
+
+// use =0 to disable printing of specific channels
+#ifdef _DEBUG
+static enum dplchan { none, gdbProtoIgnored=0/*1*/, gdbProtoUnknown=2, gdbOutput=3/*3*/, gdbCommand=4/*4*/, debuggerCall=5, debuggerProblem=6, debuggerTemp=7 };
+#else
+static enum dplchan { none, gdbProtoIgnored=0, gdbProtoUnknown=0, gdbOutput=0, gdbCommand=0, debuggerCall=0, debuggerProblem=0, debuggerTemp=0 };
+#endif
+static char * _dpct[] = {
+ null,
+ "GDB Protocol Ignored",
+ "GDB Protocol ***Unknown***",
+ "GDB Output",
+ "GDB Command",
+ ""/*Debugger Call*/,
+ "Debugger ***Problem***",
+ "-----> Temporary Message",
+ null
+};
+
+// TODO if(strlen(item.value) < MAX_F_STRING)
+
+#define _dpl2(...) __dpl2(__FILE__, __LINE__, ##__VA_ARGS__)
+static void __dpl2(char * file, int line, char ** channels, int channel, int indent, typed_object object, ...)
+{
+ bool chan = channel && channels && channels[channel];
+ if(chan || !channels)
{
- char ofPart[MAX_FILENAME], ofRest[MAX_LOCATION];
- char pathPart[MAX_FILENAME], pathRest[MAX_LOCATION];
- strcpy(ofRest, of);
- strcpy(pathRest, path);
- for(; ofRest[0] && pathRest[0];)
- {
- SplitDirectory(ofRest, ofPart, ofRest);
- SplitDirectory(pathRest, pathPart, pathRest);
- if(fstrcmp(pathPart, ofPart))
- return false;
- }
- if(!ofRest[0] && !pathRest[0]) // paths are identical - should return false or true? (changed to false)
- return false;
- else if(!pathRest[0]) // not inside of, it's the other way around
- return false;
- return true;
+ char string[MAX_F_STRING];
+ int len;
+ char * time = PrintNow();
+ va_list args;
+ //ide.outputView.debugBox.Logf();
+ Logf("%s %s:% 5d: %s%s", time, file, line, chan ? channels[channel] : "", chan && channels[channel][0] ? ": " : "");
+ va_start(args, object);
+ len = PrintStdArgsToBuffer(string, sizeof(string), object, args);
+ Log(string);
+ va_end(args);
+ Log("\n");
+ delete time;
}
}
+#define _dpl(...) __dpl(__FILE__, __LINE__, ##__VA_ARGS__)
+static void __dpl(char * file, int line, int indent, char * format, ...)
+{
+ va_list args;
+ char string[MAX_F_STRING];
+ int c;
+ char * time = PrintNow();
+ //static File f = null;
+ va_start(args, format);
+ vsnprintf(string, sizeof(string), format, args);
+ string[sizeof(string)-1] = 0;
+ /*if(!f)
+ {
+ char * time = PrintNow();
+ char * logName;
+ logName = PrintString(time, ".log");
+ delete time;
+ f = FileOpen(logName, write);
+ delete logName;
+ }*/
+ /*f.Printf("%s %s:% 5d: ", time, file, line);
+ for(c = 0; c<indent; c++)
+ f.Putc(' ');
+ f.Printf("%s\n", string);*/
+ Logf("%s %s:% 5d: ", time, file, line);
+ for(c = 0; c<indent; c++)
+ Log(" ");
+ Logf("%s\n", string);
+ va_end(args);
+ delete time;
+}
+
public char * StripQuotes2(char * string, char * output)
{
int c;
if(escaped || ch != '\"')
{
output[d++] = ch;
- if(ch == '\\')
- escaped ^= true;
+ escaped = !escaped && ch == '\\';
}
else
quoted = false;
{
uint level = 0;
- bool quoted = false; //bool escaped = false;
- char * start = string;
+ bool quoted = false, escaped = false;
+ char * start = string, ch;
- for(; *string; string++)
+ for(; (ch = *string); string++)
{
if(!start)
start = string;
+
if(quoted)
{
- if(*string == '\"')
+ if(escaped || ch != '\"')
+ escaped = !escaped && ch == '\\';
+ else
quoted = false;
}
- else if(*string == '\"')
+ else if(ch == '\"')
quoted = true;
- else if(*string == '{' || *string == '[' || *string == '(' || *string == '<')
+ else if(ch == '{' || ch == '[' || ch == '(' || ch == '<')
level++;
- else if(*string == '}' || *string == ']' || *string == ')' || *string == '>')
+ else if(ch == '}' || ch == ']' || ch == ')' || ch == '>')
level--;
- else if(*string == seperator && !level)
+ else if(ch == seperator && !level)
{
tokens.Add(start);
*string = '\0';
return false;
}
-static void DebuggerProtocolUnknown(char * message, char * gdbOutput)
+static bool CheckCommandAvailable(const char * command)
{
-#ifdef _DEBUG_GDB_PROTOCOL
- ide.outputView.debugBox.Logf("Debugger Protocol Error: %s (%s)\n", message, gdbOutput);
+ bool available = false;
+ int c, count;
+ char * name = new char[MAX_FILENAME];
+ char * pathVar = new char[maxPathLen];
+ char * paths[128];
+ GetEnvironment("PATH", pathVar, maxPathLen);
+ count = TokenizeWith(pathVar, sizeof(paths) / sizeof(char *), paths, pathListSep, false);
+ strcpy(name, command);
+#ifdef __WIN32__
+ {
+ int e;
+ const char * extensions[] = { "exe", "com", "bat", null };
+ for(e=0; extensions[e]; e++)
+ {
+ ChangeExtension(name, extensions[e], name);
+#endif
+ for(c=0; c<count; c++)
+ {
+ FileListing fl { paths[c] };
+ while(fl.Find())
+ {
+ if(fl.stats.attribs.isFile && !fstrcmp(fl.name, name))
+ {
+ available = true;
+ break;
+ }
+ }
+ if(available) break;
+ }
+#ifdef __WIN32__
+ if(available) break;
+ }
+ }
#endif
+ delete name;
+ delete pathVar;
+ return available;
}
// define GdbGetLineSize = 1638400;
char progFifoDir[MAX_LOCATION];
#endif
-enum DebuggerState { none, prompt, loaded, running, stopped, terminated };
-enum DebuggerEvent { none, hit, breakEvent, signal, stepEnd, functionEnd, exit };
+enum DebuggerState { none, prompt, loaded, running, stopped, terminated, error };
+enum DebuggerEvent
+{
+ none, hit, breakEvent, signal, stepEnd, functionEnd, exit, valgrindStartPause;
+
+ property bool canBeMonitored { get { return (this == hit || this == breakEvent || this == signal || this == stepEnd || this == functionEnd); } };
+};
enum DebuggerAction { none, internal, restart, stop, selectFrame }; //, bpValidation
-enum BreakpointType { none, internalMain, internalWinMain, internalModulesLoaded, user, runToCursor };
+enum DebuggerReason
+{
+ unknown, endSteppingRange, functionFinished, signalReceived, breakpointHit
+ //watchpointTrigger, readWatchpointTrigger, accessWatchpointTrigger, watchpointScope, locationReached,
+ //exited, exitedNormally, exitedSignalled;
+};
+enum BreakpointType
+{
+ none, internalMain, internalWinMain, internalModulesLoaded, user, runToCursor, internalModuleLoad;
+
+ property bool isInternal { get { return (this == internalMain || this == internalWinMain || this == internalModulesLoaded || this == internalModuleLoad); } };
+ property bool isUser { get { return (this == user || this == runToCursor); } };
+};
enum DebuggerEvaluationError { none, symbolNotFound, memoryCantBeRead, unknown };
+enum DebuggerUserAction { none, start, resume, _break, stop, restart, selectThread, selectFrame, stepInto, stepOver, stepOut, runToCursor };
FileDialog debuggerFileDialog { type = selectDir };
+static DualPipe vgTargetHandle;
+static File vgLogFile;
+static char vgLogPath[MAX_LOCATION];
static DualPipe gdbHandle;
static DebugEvaluationData eval { };
static int targetProcessId;
static bool gdbReady;
+static bool breakpointError;
class Debugger
{
bool targeted;
bool symbols;
bool modules;
- //bool breakpointsInserted;
bool sentKill;
bool sentBreakInsert;
bool ignoreBreakpoints;
- bool userBreakOnInternBreak;
+ bool userBreakOnInternalBreakpoint;
+ //bool runToCursorDebugStart;
bool signalOn;
+ bool needReset;
//bool watchesInit;
+ bool usingValgrind;
int ideProcessId;
int gdbProcessId;
char * targetDir;
char * targetFile;
+ DebuggerUserAction userAction;
DebuggerState state;
DebuggerEvent event;
DebuggerAction breakType;
List<Breakpoint> sysBPs { };
Breakpoint bpRunToCursor;
- //Breakpoint bpStep;
- Breakpoint bpHit;
OldList stackFrames;
+ CompilerConfig currentCompiler;
ProjectConfig prjConfig;
+ int bitDepth;
CodeEditor codeEditor;
+ ValgrindLogThread vgLogThread { debugger = this };
+ ValgrindTargetThread vgTargetThread { debugger = this };
GdbThread gdbThread { debugger = this };
Timer gdbTimer
{
bool monitor = false;
DebuggerEvent curEvent = event;
GdbDataStop stopItem = this.stopItem;
+ Breakpoint bpUser = null;
+ Breakpoint bpInternal = null;
+
if(!gdbReady)
return false;
-
+
event = none;
if(this.stopItem)
this.stopItem = null;
if(curEvent && curEvent != exit)
{
#ifdef _DEBUG
- printf("No stop item\n");
+ _dpl(0, "No stop item");
#endif
}
}
-
switch(breakType)
{
case restart:
breakType = none;
- Restart();
+ Restart(currentCompiler, prjConfig, bitDepth, usingValgrind);
break;
case stop:
breakType = none;
}
//case bpValidation:
// breakType = none;
- // GdbCommand(false, "-break-info %d", bpItem.number);
+ // GdbCommand(false, "-break-info %s", bpItem.number);
// break;
}
-
+
if(curEvent == none)
return false;
-
+
switch (curEvent)
{
case breakEvent:
break;
case hit:
{
- Breakpoint bp = null;
-
- for(i : ide.workspace.breakpoints; i.bp && i.bp.number == stopItem.bkptno)
- {
- bp = i;
- break;
- }
- if(!bp)
+ bool isInternal;
+ Breakpoint bp = stopItem ? GetBreakpointById(stopItem.bkptno, &isInternal) : null;
+ if(bp && bp.inserted && bp.bp.addr)
{
- for(i : sysBPs; i.bp && i.bp.number == stopItem.bkptno)
+ if(bp.type.isInternal)
+ bpInternal = bp;
+ else
+ bpUser = bp;
+ if(stopItem && stopItem.frame)
{
- bp = i;
- break;
+ if(bpInternal && bpRunToCursor && bpRunToCursor.inserted && !strcmp(bpRunToCursor.bp.addr, bp.bp.addr))
+ bpUser = bpRunToCursor;
+ else
+ {
+ for(item : (bpInternal ? ide.workspace.breakpoints : sysBPs); item.inserted)
+ {
+ if(item.bp && item.bp.addr && !strcmp(item.bp.addr, bp.bp.addr))
+ {
+ if(bpInternal)
+ bpUser = item;
+ else
+ bpInternal = item;
+ break;
+ }
+ }
+ }
}
+ else
+ _dpl2(_dpct, dplchan::debuggerProblem, 0, "Invalid stopItem!");
+ if(bpUser && strcmp(stopItem.frame.addr, bpUser.bp.addr))
+ bpUser = null;
}
- bpHit = bp;
-
- if(!(!userBreakOnInternBreak &&
- bp && (bp.type == internalMain || bp.type == internalWinMain || bp.type == internalModulesLoaded)))
+ else
+ _dpl2(_dpct, dplchan::debuggerProblem, 0, "Breakpoint bkptno(", stopItem.bkptno, ") invalid or not found!");
+ if(bpUser && bpUser.type == runToCursor)
+ ignoreBreakpoints = false;
+ if((bpUser && !ignoreBreakpoints) || (bpInternal && userBreakOnInternalBreakpoint))
monitor = true;
hitThread = stopItem.threadid;
}
case stepEnd:
case functionEnd:
monitor = true;
+ ignoreBreakpoints = false;
+ break;
+ case valgrindStartPause:
+ GdbExecContinue(true);
break;
case exit:
HideDebuggerViews();
break;
}
-
+
if(monitor)
{
activeThread = stopItem.threadid;
WatchesCodeEditorLinkInit();
EvaluateWatches();
}
-
- switch(curEvent)
+
+ if(curEvent == signal)
{
- case signal:
- {
- char * s;
- signalOn = true;
- ide.outputView.debugBox.Logf("Signal received: %s - %s\n", stopItem.name, stopItem.meaning);
- ide.outputView.debugBox.Logf(" %s:%d\n", (s = CopySystemPath(stopItem.frame.file)), stopItem.frame.line);
- delete s;
- }
- case stepEnd:
- case functionEnd:
- case breakEvent:
- // Why was SelectFrame missing here?
- SelectFrame(activeFrameLevel);
- GoToStackFrameLine(activeFrameLevel, curEvent == signal || curEvent == stepEnd /*false*/);
- ide.Activate();
- ide.Update(null);
- if(curEvent == signal)
- ide.outputView.Show();
- if(curEvent == signal || curEvent == breakEvent)
- {
- if(curEvent == breakEvent)
- ide.threadsView.Show();
- ide.callStackView.Show();
- }
- ide.ShowCodeEditor();
- if(curEvent == breakEvent)
- ide.callStackView.Activate();
- break;
- case hit:
- EventHit(stopItem);
- break;
+ char * s;
+ signalOn = true;
+ ide.outputView.debugBox.Logf($"Signal received: %s - %s\n", stopItem.name, stopItem.meaning);
+ ide.outputView.debugBox.Logf(" %s:%d\n", (s = CopySystemPath(stopItem.frame.file)), stopItem.frame.line);
+ ide.outputView.Show();
+ ide.callStackView.Show();
+ delete s;
}
-
- if(curEvent == DebuggerEvent::breakEvent || curEvent == stepEnd || curEvent == functionEnd)
- ignoreBreakpoints = false;
-
+ else if(curEvent == breakEvent)
+ {
+ ide.threadsView.Show();
+ ide.callStackView.Show();
+ ide.callStackView.Activate();
+ }
+
+ if(monitor && curEvent.canBeMonitored)
+ {
+ SelectFrame(activeFrameLevel);
+ GoToStackFrameLine(activeFrameLevel, true);
+ ide.ShowCodeEditor();
+ ideMainFrame.Activate(); // TOFIX: ide.Activate() is not reliable (app inactive)
+ ide.Update(null);
+ }
+
+ if(curEvent == hit)
+ EventHit(stopItem, bpInternal, bpUser);
+
if(stopItem)
{
stopItem.Free();
delete stopItem;
}
+ if(userBreakOnInternalBreakpoint)
+ userBreakOnInternalBreakpoint = false;
return false;
}
};
void ChangeState(DebuggerState value)
{
+ bool same = value == state;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ChangeState (", state, same ? " *** == *** " : " -> ", value, ")");
state = value;
- if(ide) ide.AdjustDebugMenus();
+ if(!same && ide) ide.AdjustDebugMenus();
}
void CleanUp()
{
- // Stop(); // Don't need to call Stop here, because ~ProjectView() will call it explicitly.
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::CleanUp");
stackFrames.Free(Frame::Free);
sentKill = false;
sentBreakInsert = false;
ignoreBreakpoints = false;
- userBreakOnInternBreak = false;
+ userBreakOnInternalBreakpoint = false;
+ //runToCursorDebugStart = false;
signalOn = false;
activeFrameLevel = 0;
activeFrame = 0;
bpRunToCursor = null;
- bpHit = null;
+ delete currentCompiler;
prjConfig = null;
codeEditor = null;
Debugger()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::constructor");
ideProcessId = Process_GetCurrentProcessId();
- sysBPs.Add(Breakpoint { type = internalMain, enabled = true, level = -1 });
+ sysBPs.Add(Breakpoint { type = internalMain, function = "main", enabled = true, level = -1 });
#if defined(__WIN32__)
- sysBPs.Add(Breakpoint { type = internalWinMain, enabled = true, level = -1 });
+ sysBPs.Add(Breakpoint { type = internalWinMain, function = "WinMain", enabled = true, level = -1 });
#endif
sysBPs.Add(Breakpoint { type = internalModulesLoaded, enabled = true, level = -1 });
-
+ sysBPs.Add(Breakpoint { type = internalModuleLoad, function = "InternalModuleLoadBreakpoint", enabled = true, level = -1 });
}
~Debugger()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::destructor");
+ sysBPs.Free();
Stop();
CleanUp();
}
void Resume()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::Resume");
+ userAction = resume;
GdbExecContinue(true);
}
void Break()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::Break");
+ userAction = _break;
if(state == running)
{
if(targetProcessId)
- {
- //ide.AdjustDebugMenus();
GdbDebugBreak(false);
- }
}
}
void Stop()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::Stop");
+ userAction = stop;
switch(state)
{
case running:
break;
case stopped:
GdbAbortExec();
+ HideDebuggerViews();
+ GdbExit();
+ break;
case loaded:
GdbExit();
break;
}
}
- void Restart()
+ void Restart(CompilerConfig compiler, ProjectConfig config, int bitDepth, bool useValgrind)
{
- switch(state)
- {
- case running:
- if(targetProcessId)
- {
- breakType = restart;
- GdbDebugBreak(false);
- }
- break;
- case stopped:
- GdbAbortExec();
- case none:
- case terminated:
- if(!GdbInit())
- break;
- case loaded:
- GdbExecRun();
- break;
- }
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::Restart");
+ userAction = restart;
+ if(StartSession(compiler, config, bitDepth, useValgrind, true, false, false/*, false*/) == loaded)
+ GdbExecRun();
}
bool GoToCodeLine(char * location)
{
CodeLocation codloc;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GoToCodeLine(", location, ")");
codloc = CodeLocation::ParseCodeLocation(location);
if(codloc)
{
- CodeEditor editor = (CodeEditor)ide.OpenFile(codloc.absoluteFile, normal, true, null, no, normal);
+ CodeEditor editor = (CodeEditor)ide.OpenFile(codloc.absoluteFile, normal, true, null, no, normal, false);
if(editor)
{
EditBox editBox = editor.editBox;
bool GoToStackFrameLine(int stackLevel, bool askForLocation)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GoToStackFrameLine(", stackLevel, ", ", askForLocation, ")");
if(ide)
{
char filePath[MAX_LOCATION];
{
char * s;
char title[MAX_LOCATION];
-
- sprintf(title, "Provide source file location for %s", (s = CopySystemPath(frame.file)));
+ snprintf(title, sizeof(title), $"Provide source file location for %s", (s = CopySystemPath(frame.file)));
+ title[sizeof(title)-1] = 0;
delete s;
if(SourceDirDialog(title, ide.workspace.projectDir, frame.file, sourceDir))
{
}
}
if(frame.absoluteFile)
- editor = (CodeEditor)ide.OpenFile(frame.absoluteFile, normal, true, null, no, normal);
+ editor = (CodeEditor)ide.OpenFile(frame.absoluteFile, normal, true, null, no, normal, false);
ide.Update(null);
if(editor && frame.line)
{
void SelectThread(int thread)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::SelectThread(", thread, ")");
+ userAction = selectThread;
if(state == stopped)
{
if(thread != activeThread)
void SelectFrame(int frame)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::SelectFrame(", frame, ")");
+ userAction = selectFrame; // not always user action, right? doesn't matter for now.
if(state == stopped)
{
if(frame != activeFrameLevel || !codeEditor || !codeEditor.visible)
bool returnedExitCode = false;
char verboseExitCode[128];
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::HandleExit(", reason, ", ", code, ")");
ChangeState(loaded); // this state change seems to be superfluous, might be in case of gdb crash
targetProcessId = 0;
if(code)
- sprintf(verboseExitCode, " with exit code %s", code);
+ {
+ snprintf(verboseExitCode, sizeof(verboseExitCode), $" with exit code %s", code);
+ verboseExitCode[sizeof(verboseExitCode)-1] = 0;
+ }
else
verboseExitCode[0] = '\0';
}
}
- //ide.AdjustDebugMenus();
-
#if defined(__unix__)
- progThread.terminate = true;
- if(fifoFile)
+ if(!usingValgrind)
{
- fifoFile.CloseInput();
- app.Unlock();
- progThread.Wait();
- app.Lock();
- delete fifoFile;
- }
+ progThread.terminate = true;
+ if(fifoFile)
+ {
+ fifoFile.CloseInput();
+ app.Unlock();
+ progThread.Wait();
+ app.Lock();
+ delete fifoFile;
+ }
+ }
#endif
{
char program[MAX_LOCATION];
GetSystemPathBuffer(program, targetFile);
if(!reason)
- ide.outputView.debugBox.Logf("The program %s has exited%s.\n", program, verboseExitCode);
+ ide.outputView.debugBox.Logf($"The program %s has exited%s.\n", program, verboseExitCode);
else if(!strcmp(reason, "exited-normally"))
- ide.outputView.debugBox.Logf("The program %s has exited normally%s.\n", program, verboseExitCode);
+ ide.outputView.debugBox.Logf($"The program %s has exited normally%s.\n", program, verboseExitCode);
else if(!strcmp(reason, "exited"))
- ide.outputView.debugBox.Logf("The program %s has exited%s.\n", program, verboseExitCode);
+ ide.outputView.debugBox.Logf($"The program %s has exited%s.\n", program, verboseExitCode);
else if(!strcmp(reason, "exited-signalled"))
- ide.outputView.debugBox.Logf("The program %s has exited with a signal%s.\n", program, verboseExitCode);
+ ide.outputView.debugBox.Logf($"The program %s has exited with a signal%s.\n", program, verboseExitCode);
else
- ide.outputView.debugBox.Logf("The program %s has exited (gdb provided an unknown reason)%s.\n", program, verboseExitCode);
+ ide.outputView.debugBox.Logf($"The program %s has exited (gdb provided an unknown reason)%s.\n", program, verboseExitCode);
}
ide.Update(null);
}
- void Start()
+ DebuggerState StartSession(CompilerConfig compiler, ProjectConfig config, int bitDepth, bool useValgrind, bool restart, bool userBreakOnInternalBreakpoint, bool ignoreBreakpoints/*, bool runToCursorDebugStart*/)
{
- ide.outputView.debugBox.Clear();
- switch(state)
+ DebuggerState result = none;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::StartSession(restart(", restart, "), userBreakOnInternalBreakpoint(", userBreakOnInternalBreakpoint, "), ignoreBreakpoints(", ignoreBreakpoints, ")"/*, runToCursorDebugStart(", runToCursorDebugStart, ")"*/);
+ if(restart && state == running && targetProcessId)
{
- case none:
- case terminated:
- if(!GdbInit())
- break;
- case loaded:
- GdbExecRun();
- break;
+ breakType = DebuggerAction::restart;
+ GdbDebugBreak(false);
+ }
+ else
+ {
+ if(restart && state == stopped)
+ GdbAbortExec();
+ if(needReset && state == loaded)
+ GdbExit(); // this reset is to get a clean state with all the breakpoints until a better state can be maintained on program exit
+ result = state;
+ if(result == none || result == terminated)
+ {
+ ide.outputView.ShowClearSelectTab(debug);
+ ide.outputView.debugBox.Logf($"Starting debug mode\n");
+
+ for(bp : sysBPs)
+ {
+ bp.hits = 0;
+ bp.breaks = 0;
+ }
+ for(bp : ide.workspace.breakpoints)
+ {
+ bp.hits = 0;
+ bp.breaks = 0;
+ }
+
+ //this.runToCursorDebugStart = runToCursorDebugStart;
+
+ if(GdbInit(compiler, config, bitDepth, useValgrind))
+ result = state;
+ else
+ result = error;
+ }
+ this.ignoreBreakpoints = ignoreBreakpoints;
+ this.userBreakOnInternalBreakpoint = userBreakOnInternalBreakpoint;
+ if(result == loaded || result == stopped)
+ GdbBreakpointsDelete(false, (userAction == stepOver || userAction == stepOut), ignoreBreakpoints);
}
+ return result;
}
- void StepInto()
+ void Start(CompilerConfig compiler, ProjectConfig config, int bitDepth, bool useValgrind)
{
- switch(state)
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::Start()");
+ userAction = start;
+ if(StartSession(compiler, config, bitDepth, useValgrind, true, false, false/*, false*/) == loaded)
+ GdbExecRun();
+ }
+
+ void StepInto(CompilerConfig compiler, ProjectConfig config, int bitDepth, bool useValgrind)
+ {
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::StepInto()");
+ userAction = stepInto;
+ switch(StartSession(compiler, config, bitDepth, useValgrind, false, true, false/*, false*/))
{
- case none:
- case terminated:
- if(!GdbInit())
- break;
- case loaded:
- ide.outputView.ShowClearSelectTab(debug);
- ide.outputView.debugBox.Logf("Starting debug mode\n");
- userBreakOnInternBreak = true;
- GdbExecRun();
- break;
- case stopped:
- GdbExecStep();
- break;
+ case loaded: GdbExecRun(); break;
+ case stopped: GdbExecStep(); break;
}
}
- void StepOver(bool ignoreBkpts)
+ void StepOver(CompilerConfig compiler, ProjectConfig config, int bitDepth, bool useValgrind, bool ignoreBreakpoints)
{
- switch(state)
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::StepOver()");
+ userAction = stepOver;
+ switch(StartSession(compiler, config, bitDepth, useValgrind, false, true, ignoreBreakpoints/*, false*/))
{
- case none:
- case terminated:
- if(!GdbInit())
- break;
- case loaded:
- ide.outputView.ShowClearSelectTab(debug);
- ide.outputView.debugBox.Logf("Starting debug mode\n");
- ignoreBreakpoints = ignoreBkpts;
- userBreakOnInternBreak = true;
- GdbExecRun();
- break;
- case stopped:
- ignoreBreakpoints = ignoreBkpts;
- if(ignoreBreakpoints)
- GdbBreakpointsDelete(true);
- GdbExecNext();
- break;
+ case loaded: GdbExecRun(); break;
+ case stopped: GdbExecNext(); break;
}
}
- void StepOut(bool ignoreBkpts)
+ void StepOut(bool ignoreBreakpoints)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::StepOut()");
+ userAction = stepOut;
if(state == stopped)
{
- ignoreBreakpoints = ignoreBkpts;
- if(ignoreBreakpoints)
- GdbBreakpointsDelete(true);
- GdbExecFinish();
+ this.ignoreBreakpoints = ignoreBreakpoints;
+ GdbBreakpointsDelete(true, true, ignoreBreakpoints);
+ if(frameCount > 1)
+ GdbExecFinish();
+ else
+ GdbExecContinue(true);
}
}
- void RunToCursor(char * absoluteFilePath, int lineNumber, bool ignoreBkpts)
+ void RunToCursor(CompilerConfig compiler, ProjectConfig config, int bitDepth, bool useValgrind, char * absoluteFilePath, int lineNumber, bool ignoreBreakpoints, bool atSameLevel)
{
char relativeFilePath[MAX_LOCATION];
- DebuggerState oldState = state;
- ignoreBreakpoints = ignoreBkpts;
- if(!ide.projectView.GetRelativePath(absoluteFilePath, relativeFilePath))
+ DebuggerState st = state;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::RunToCursor()");
+ userAction = runToCursor;
+ //if(st == loaded)
+ //{
+ // ide.outputView.ShowClearSelectTab(debug);
+ // ide.outputView.debugBox.Logf($"Starting debug mode\n");
+ //}
+ if(!ide.projectView.project.GetRelativePath(absoluteFilePath, relativeFilePath))
strcpy(relativeFilePath, absoluteFilePath);
- switch(state)
+
+ if(bpRunToCursor && bpRunToCursor.inserted && symbols)
{
- case none:
- case terminated:
- Start();
- case stopped:
- case loaded:
- if(symbols)
- {
- if(state == loaded)
- {
- ide.outputView.ShowClearSelectTab(debug);
- ide.outputView.debugBox.Logf("Starting debug mode\n");
- }
- RunToCursorPrepare(absoluteFilePath, relativeFilePath, lineNumber);
- sentBreakInsert = true;
- GdbCommand(false, "-break-insert %s:%d", relativeFilePath, lineNumber);
- bpRunToCursor.bp = bpItem;
- bpItem = null;
- bpRunToCursor.inserted = (bpRunToCursor.bp.number != 0);
- ValidateBreakpoint(bpRunToCursor);
- }
- break;
+ UnsetBreakpoint(bpRunToCursor);
+ delete bpRunToCursor;
}
- switch(oldState)
+
+ bpRunToCursor = Breakpoint { };
+ bpRunToCursor.absoluteFilePath = absoluteFilePath;
+ bpRunToCursor.relativeFilePath = relativeFilePath;
+ bpRunToCursor.line = lineNumber;
+ bpRunToCursor.type = runToCursor;
+ bpRunToCursor.enabled = true;
+ bpRunToCursor.level = atSameLevel ? frameCount - activeFrameLevel -1 : -1;
+
+ switch(StartSession(compiler, config, bitDepth, useValgrind, false, false, ignoreBreakpoints/*, true*/))
{
case loaded:
- if(ignoreBreakpoints)
- GdbBreakpointsDelete(false);
GdbExecRun();
break;
case stopped:
- if(ignoreBreakpoints)
- GdbBreakpointsDelete(false);
GdbExecContinue(true);
break;
}
-
}
void GetCallStackCursorLine(bool * error, int * lineCursor, int * lineTopFrame)
{
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GetCallStackCursorLine()");
if(activeFrameLevel == -1)
{
*error = false;
else
{
*error = signalOn && activeThread == signalThread;
- *lineCursor = activeFrameLevel + 1;
+ *lineCursor = activeFrameLevel - ((frameCount > 192 && activeFrameLevel > 191) ? frameCount - 192 - 1 : 0) + 1;
*lineTopFrame = activeFrameLevel ? 1 : 0;
}
}
char * absoluteFilePath = GetSlashPathBuffer(winFilePath, fileName);
int count = 0;
Iterator<Breakpoint> it { ide.workspace.breakpoints };
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GetMarginIconsLineNumbers()");
while(it.Next() && count < max)
{
Breakpoint bp = it.data;
void ChangeWatch(DataRow row, char * expression)
{
Watch wh = (Watch)row.tag;
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ChangeWatch(", expression, ")");
if(wh)
{
delete wh.expression;
else if(expression)
{
wh = Watch { };
- row.tag = (int)wh;
+ row.tag = (int64)wh;
ide.workspace.watches.Add(wh);
wh.row = row;
wh.expression = CopyString(expression);
char * absoluteFilePath = GetSlashPathBuffer(winFilePath, fileName);
Link bpLink, next;
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::MoveIcons()");
for(bpLink = ide.workspace.breakpoints.first; bpLink; bpLink = next)
{
Breakpoint bp = (Breakpoint)bpLink.data;
bool retry;
String srcDir = null;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::SourceDirDialog()");
debuggerFileDialog.text = title;
debuggerFileDialog.currentDirectory = startDir;
debuggerFileDialog.master = ide;
strcpy(sourceDir, debuggerFileDialog.filePath);
if(!fstrcmp(ide.workspace.projectDir, sourceDir) &&
MessageBox { type = yesNo, master = ide,
- contents = "This is the project directory.\nWould you like to try again?",
- text = "Invalid Source Directory" }.Modal() == no)
+ contents = $"This is the project directory.\nWould you like to try again?",
+ text = $"Invalid Source Directory" }.Modal() == no)
return false;
else
{
if(srcDir &&
MessageBox { type = yesNo, master = ide,
- contents = "This source directory is already specified.\nWould you like to try again?",
- text = "Invalid Source Directory" }.Modal() == no)
+ contents = $"This source directory is already specified.\nWould you like to try again?",
+ text = $"Invalid Source Directory" }.Modal() == no)
return false;
else
{
result = FileExists(file);
if(!result &&
MessageBox { type = yesNo, master = ide,
- contents = "Unable to locate source file.\nWould you like to try again?",
- text = "Invalid Source Directory" }.Modal() == no)
+ contents = $"Unable to locate source file.\nWould you like to try again?",
+ text = $"Invalid Source Directory" }.Modal() == no)
return false;
}
else
void AddSourceDir(char * sourceDir)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::AddSourceDir(", sourceDir, ")");
ide.workspace.sourceDirs.Add(CopyString(sourceDir));
ide.workspace.Save();
char sourceDir[MAX_LOCATION];
Breakpoint bp = null;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ToggleBreakpoint(", fileName, ":", lineNumber, ")");
strcpy(absolutePath, absoluteFilePath);
for(i : ide.workspace.breakpoints; i.type == user && i.absoluteFilePath && !fstrcmp(i.absoluteFilePath, absolutePath) && i.line == lineNumber)
{
else
{
// FIXED: This is how it should have been... Source locations are only for files not in project
- // if(eString_PathInsideOf(absolutePath, ide.workspace.projectDir))
+ // if(IsPathInsideOf(absolutePath, ide.workspace.projectDir))
// MakePathRelative(absolutePath, ide.workspace.projectDir, relativePath);
bool result = false;
if(prj)
result = prj.GetRelativePath(absolutePath, relativePath);
else
- ide.projectView.GetRelativePath(absolutePath, relativePath);
- //if(ide.projectView.GetRelativePath(absolutePath, relativePath));
+ result = ide.projectView.project.GetRelativePath(absolutePath, relativePath);
+ //if(ide.projectView.project.GetRelativePath(absolutePath, relativePath));
//else
if(!result)
{
char title[MAX_LOCATION];
char directory[MAX_LOCATION];
StripLastDirectory(absolutePath, directory);
- sprintf(title, "Provide source files location directory for %s", absolutePath);
+ snprintf(title, sizeof(title), $"Provide source files location directory for %s", absolutePath);
+ title[sizeof(title)-1] = 0;
while(true)
{
String srcDir = null;
for(dir : ide.workspace.sourceDirs)
{
- if(eString_PathInsideOf(absolutePath, dir))
+ if(IsPathInsideOf(absolutePath, dir))
{
MakePathRelative(absoluteFilePath, dir, relativePath);
srcDir = dir;
if(SourceDirDialog(title, directory, null, sourceDir))
{
- if(eString_PathInsideOf(absolutePath, sourceDir))
+ if(IsPathInsideOf(absolutePath, sourceDir))
{
AddSourceDir(sourceDir);
MakePathRelative(absoluteFilePath, sourceDir, relativePath);
break;
}
else if(MessageBox { type = yesNo, master = ide,
- contents = "You must provide a valid source directory in order to place a breakpoint in this file.\nWould you like to try again?",
- text = "Invalid Source Directory" }.Modal() == no)
+ contents = $"You must provide a valid source directory in order to place a breakpoint in this file.\nWould you like to try again?",
+ text = $"Invalid Source Directory" }.Modal() == no)
return;
}
else if(MessageBox { type = yesNo, master = ide,
- contents = "You must provide a source directory in order to place a breakpoint in this file.\nWould you like to try again?",
- text = "No Source Directory Provided" }.Modal() == no)
+ contents = $"You must provide a source directory in order to place a breakpoint in this file.\nWould you like to try again?",
+ text = $"No Source Directory Provided" }.Modal() == no)
return;
}
}
ide.workspace.bpCount++;
bp = { line = lineNumber, type = user, enabled = true, level = -1 };
ide.workspace.breakpoints.Add(bp);
- bp.absoluteFilePath = CopyString(absolutePath);
- bp.relativeFilePath = CopyString(relativePath);
+ bp.absoluteFilePath = absolutePath;
+ bp.relativeFilePath = relativePath;
ide.breakpointsView.AddBreakpoint(bp);
}
GdbDebugBreak(true);
case stopped:
case loaded:
- if(symbols)
- {
- sentBreakInsert = true;
- GdbCommand(false, "-break-insert %s:%d", bp.relativeFilePath, bp.line);
- bp.bp = bpItem;
- bpItem = null;
- bp.inserted = (bp.bp && bp.bp.number != 0);
- ValidateBreakpoint(bp);
- }
+ SetBreakpoint(bp, false);
break;
}
if(oldState == running)
void UpdateRemovedBreakpoint(Breakpoint bp)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::UpdateRemovedBreakpoint()");
if(targeted && bp.inserted)
{
DebuggerState oldState = state;
GdbDebugBreak(true);
case stopped:
case loaded:
- if(symbols)
- GdbCommand(false, "-break-delete %d", bp.bp.number);
+ UnsetBreakpoint(bp);
break;
}
if(oldState == running)
DebugListItem item { };
Argument arg;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ParseFrame()");
TokenizeList(string, ',', frameTokens);
for(i = 0; i < frameTokens.count; i++)
{
if(!strcmp(item.name, "level"))
frame.level = atoi(item.value);
else if(!strcmp(item.name, "addr"))
- frame.addr = CopyString(item.value);
+ frame.addr = item.value;
else if(!strcmp(item.name, "func"))
- frame.func = CopyString(item.value);
+ frame.func = item.value;
else if(!strcmp(item.name, "args"))
{
if(!strcmp(item.value, "[]"))
if(!strcmp(item.name, "name"))
{
StripQuotes(item.value, item.value);
- arg.name = CopyString(item.value);
+ arg.name = item.value;
}
else if(!strcmp(item.name, "value"))
{
StripQuotes(item.value, item.value);
- arg.value = CopyString(item.value);
+ arg.val = item.value;
}
else
- DebuggerProtocolUnknown("Unknown frame args item name", item.name);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "frame args item (", item.name, "=", item.value, ") is unheard of");
}
- else
- DebuggerProtocolUnknown("Bad frame args item", "");
+ else
+ _dpl(0, "Bad frame args item");
}
argumentTokens.RemoveAll();
}
else if(!strcmp(item.name, "from"))
frame.from = item.value;
else if(!strcmp(item.name, "file"))
- {
frame.file = item.value;
- frame.absoluteFile = ide.workspace.GetAbsolutePathFromRelative(frame.file);
- }
else if(!strcmp(item.name, "line"))
frame.line = atoi(item.value);
else if(!strcmp(item.name, "fullname"))
- {
- // New GDB is giving us a full name... Any reason why we coudln't figure it out ourselves?
- }
+ frame.absoluteFile = item.value;
+ /*{
+ // GDB 6.3 on OS X is giving "fullname" and "dir", all in absolute, but file name only in 'file'
+ String path = ide.workspace.GetPathWorkspaceRelativeOrAbsolute(item.value);
+ if(strcmp(frame.file, path))
+ {
+ frame.file = path;
+ frame.absoluteFile = ide.workspace.GetAbsolutePathFromRelative(frame.file);
+ }
+ delete path;
+ }*/
else
- DebuggerProtocolUnknown("Unknown frame member name", item.name);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "frame member (", item.name, "=", item.value, ") is unheard of");
}
else
- DebuggerProtocolUnknown("Bad frame", "");
+ _dpl(0, "Bad frame");
}
delete frameTokens;
delete item;
}
- void ShowDebuggerViews()
- {
- ide.outputView.Show();
- ide.outputView.SelectTab(debug);
- ide.threadsView.Show();
- ide.callStackView.Show();
- ide.watchesView.Show();
- ide.Update(null);
- }
-
- void HideDebuggerViews()
+ Breakpoint GetBreakpointById(int id, bool * isInternal)
{
- ide.RepositionWindows(true);
+ Breakpoint bp = null;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GetBreakpointById(", id, ")");
+ if(isInternal)
+ *isInternal = false;
+ if(id)
+ {
+ for(i : sysBPs; i.bp && i.bp.id == id)
+ {
+ if(isInternal)
+ *isInternal = true;
+ bp = i;
+ break;
+ }
+ if(!bp && bpRunToCursor && bpRunToCursor.bp && bpRunToCursor.bp.id == id)
+ bp = bpRunToCursor;
+ if(!bp)
+ {
+ for(i : ide.workspace.breakpoints; i.bp && i.bp.id == id)
+ {
+ bp = i;
+ break;
+ }
+ }
+ }
+ return bp;
}
- void ::GdbCommand(bool focus, char * format, ...)
+ GdbDataBreakpoint ParseBreakpoint(char * string, Array<char *> outTokens)
{
- if(gdbHandle)
+ int i;
+ GdbDataBreakpoint bp { };
+ DebugListItem item { };
+ Array<char *> bpTokens { minAllocSize = 16 };
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ParseBreakpoint()");
+ string = StripCurlies(string);
+ TokenizeList(string, ',', bpTokens);
+ for(i = 0; i < bpTokens.count; i++)
{
- char string[MAX_F_STRING];
-
- va_list args;
- va_start(args, format);
- vsprintf(string, format, args);
- va_end(args);
-
- gdbReady = false;
- ide.debugger.serialSemaphore.TryWait();
-
-
-#ifdef GDB_DEBUG_CONSOLE
- Log(string); Log("\n");
-#endif
+ if(TokenizeListItem(bpTokens[i], item))
+ {
+ StripQuotes(item.value, item.value);
+ if(!strcmp(item.name, "number"))
+ {
+ if(!strchr(item.value, '.'))
+ bp.id = atoi(item.value);
+ bp.number = item.value;
+ }
+ else if(!strcmp(item.name, "type"))
+ bp.type = item.value;
+ else if(!strcmp(item.name, "disp"))
+ bp.disp = item.value;
+ else if(!strcmp(item.name, "enabled"))
+ bp.enabled = (!strcmpi(item.value, "y"));
+ else if(!strcmp(item.name, "addr"))
+ {
+ if(outTokens && !strcmp(item.value, "<MULTIPLE>"))
+ {
+ int c = 1;
+ Array<GdbDataBreakpoint> bpArray = bp.multipleBPs = { };
+ while(outTokens.count > ++c)
+ {
+ GdbDataBreakpoint multBp = ParseBreakpoint(outTokens[c], null);
+ bpArray.Add(multBp);
+ }
+ }
+ else
+ bp.addr = item.value;
+ }
+ else if(!strcmp(item.name, "func"))
+ bp.func = item.value;
+ else if(!strcmp(item.name, "file"))
+ bp.file = item.value;
+ else if(!strcmp(item.name, "fullname"))
+ bp.fullname = item.value;
+ else if(!strcmp(item.name, "line"))
+ bp.line = atoi(item.value);
+ else if(!strcmp(item.name, "at"))
+ bp.at = item.value;
+ else if(!strcmp(item.name, "times"))
+ bp.times = atoi(item.value);
+ else if(!strcmp(item.name, "original-location") || !strcmp(item.name, "thread-groups"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "breakpoint member (", item.name, "=", item.value, ") is ignored");
+ else
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "breakpoint member (", item.name, "=", item.value, ") is unheard of");
+ }
+ }
+ return bp;
+ }
+
+ void ShowDebuggerViews()
+ {
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ShowDebuggerViews()");
+ ide.outputView.Show();
+ ide.outputView.SelectTab(debug);
+ ide.threadsView.Show();
+ ide.callStackView.Show();
+ ide.watchesView.Show();
+ ide.Update(null);
+ }
+
+ void HideDebuggerViews()
+ {
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::HideDebuggerViews()");
+ ide.RepositionWindows(true);
+ }
+
+ void ::GdbCommand(bool focus, char * format, ...)
+ {
+ if(gdbHandle)
+ {
+ // TODO: Improve this limit
+ static char string[MAX_F_STRING*4];
+ va_list args;
+ va_start(args, format);
+ vsnprintf(string, sizeof(string), format, args);
+ string[sizeof(string)-1] = 0;
+ va_end(args);
+
+ gdbReady = false;
+ ide.debugger.serialSemaphore.TryWait();
+
+#ifdef GDB_DEBUG_CONSOLE
+ _dpl2(_dpct, dplchan::gdbCommand, 0, string);
+#endif
#ifdef GDB_DEBUG_OUTPUT
ide.outputView.gdbBox.Logf("cmd: %s\n", string);
#endif
if(ide.gdbDialog)
ide.gdbDialog.AddCommand(string);
#endif
- gdbHandle.Printf("%s\n", string);
-
+
+ strcat(string,"\n");
+ gdbHandle.Puts(string);
+
if(focus)
Process_ShowWindows(targetProcessId);
bool ValidateBreakpoint(Breakpoint bp)
{
- if(modules)
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ValidateBreakpoint()");
+ if(modules && bp.line && bp.bp)
{
if(bp.bp.line != bp.line)
{
if(!bp.bp.line)
{
#ifdef _DEBUG
+ //here
ide.outputView.debugBox.Logf("WOULD HAVE -- Invalid breakpoint disabled: %s:%d\n", bp.relativeFilePath, bp.line);
#endif
- if(bp.inserted)
- {
- //GdbCommand(false, "-break-delete %d", bp.bp.number);
- //bp.inserted = false;
- }
+ //UnsetBreakpoint(bp);
//bp.enabled = false;
return false;
}
else
{
+ //here
ide.outputView.debugBox.Logf("Debugger Error: ValidateBreakpoint error\n");
bp.line = bp.bp.line;
}
return true;
}
- static void GdbInsertInternalBreakpoint()
+ void GdbBreakpointsInsert()
{
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbBreakpointsInsert()");
if(symbols)
{
- //if(!breakpointsInserted)
+ if(userAction != stepOut && (userAction != stepOver || state == loaded))
{
- DirExpression objDir = ide.project.objDir;
- for(bp : sysBPs)
+ DirExpression objDir = ide.project.GetObjDir(currentCompiler, prjConfig, bitDepth);
+ for(bp : sysBPs; !bp.inserted)
{
- if(!bp.inserted)
+ bool insert = false;
+ if(bp.type == internalModulesLoaded)
{
- if(bp.type == internalMain)
+ char path[MAX_LOCATION];
+ char name[MAX_LOCATION];
+ char fixedModuleName[MAX_FILENAME];
+ char line[16384];
+ int lineNumber;
+ bool moduleLoadBlock = false;
+ File f;
+ ReplaceSpaces(fixedModuleName, ide.project.moduleName);
+ snprintf(name, sizeof(name),"%s.main.ec", fixedModuleName);
+ name[sizeof(name)-1] = 0;
+ strcpy(path, ide.workspace.projectDir);
+ PathCatSlash(path, objDir.dir);
+ PathCatSlash(path, name);
+ f = FileOpen(path, read);
+ if(f)
{
- sentBreakInsert = true;
- GdbCommand(false, "-break-insert main");
- bp.bp = bpItem;
- bpItem = null;
- bp.inserted = (bp.bp && bp.bp.number != 0);
- }
-#if defined(__WIN32__)
- else if(bp.type == internalWinMain)
- {
- sentBreakInsert = true;
- GdbCommand(false, "-break-insert WinMain");
- bp.bp = bpItem;
- bpItem = null;
- bp.inserted = (bp.bp && bp.bp.number != 0);
+ for(lineNumber = 1; !f.Eof(); lineNumber++)
+ {
+ if(f.GetLine(line, sizeof(line) - 1))
+ {
+ bool moduleLoadLine;
+ TrimLSpaces(line, line);
+ moduleLoadLine = !strncmp(line, "eModule_Load", strlen("eModule_Load"));
+ if(!moduleLoadBlock && moduleLoadLine)
+ moduleLoadBlock = true;
+ else if(moduleLoadBlock && !moduleLoadLine && strlen(line) > 0)
+ break;
+ }
+ }
+ if(!f.Eof())
+ {
+ char relative[MAX_LOCATION];
+ bp.absoluteFilePath = path;
+ MakePathRelative(path, ide.workspace.projectDir, relative);
+ bp.relativeFilePath = relative;
+ bp.line = lineNumber;
+ insert = true;
+ }
+ delete f;
}
-#endif
- else if(bp.type == internalModulesLoaded)
+ }
+ else if(bp.type == internalModuleLoad)
+ {
+ if(modules)
{
- char path[MAX_LOCATION];
- char name[MAX_LOCATION];
- char fixedModuleName[MAX_FILENAME];
- char line[16384];
- int lineNumber;
- bool moduleLoadBlock = false;
- File f;
- ReplaceSpaces(fixedModuleName, ide.project.moduleName);
- sprintf(name, "%s.main.ec", fixedModuleName);
- strcpy(path, ide.workspace.projectDir);
- PathCatSlash(path, objDir.dir);
- PathCatSlash(path, name);
- f = FileOpen(path, read);
- if(f)
+ for(prj : ide.workspace.projects)
{
- for(lineNumber = 1; !f.Eof(); lineNumber++)
+ if(!strcmp(prj.moduleName, "ecere"))
{
- if(f.GetLine(line, sizeof(line) - 1))
+ ProjectNode node = prj.topNode.Find("instance.c", false);
+ if(node)
{
- bool moduleLoadLine;
- TrimLSpaces(line, line);
- moduleLoadLine = !strncmp(line, "eModule_Load", strlen("eModule_Load"));
- if(!moduleLoadBlock && moduleLoadLine)
- moduleLoadBlock = true;
- else if(moduleLoadBlock && !moduleLoadLine && strlen(line) > 0)
- break;
+ char path[MAX_LOCATION];
+ char relative[MAX_LOCATION];
+ node.GetFullFilePath(path);
+ bp.absoluteFilePath = path;
+ MakePathRelative(path, prj.topNode.path, relative);
+ bp.relativeFilePath = relative;
+ insert = true;
+ break;
}
}
- if(!f.Eof())
- {
- char relative[MAX_LOCATION];
- bp.absoluteFilePath = CopyString(path);
- MakePathRelative(path, ide.workspace.projectDir, relative);
- delete bp.relativeFilePath;
- bp.relativeFilePath = CopyString(relative);
- bp.line = lineNumber;
- sentBreakInsert = true;
- GdbCommand(false, "-break-insert %s:%d", bp.relativeFilePath, lineNumber);
- bp.bp = bpItem;
- bpItem = null;
- bp.inserted = (bp.bp && bp.bp.number != 0);
- ValidateBreakpoint(bp);
- }
- delete f;
}
- break;
}
}
+ else
+ insert = true;
+ if(insert)
+ SetBreakpoint(bp, false);
}
delete objDir;
}
+
+ if(bpRunToCursor && !bpRunToCursor.inserted)
+ SetBreakpoint(bpRunToCursor, false);
+
+ if(!ignoreBreakpoints)
+ {
+ for(bp : ide.workspace.breakpoints; !bp.inserted && bp.type == user)
+ {
+ if(bp.enabled)
+ {
+ if(!SetBreakpoint(bp, false))
+ SetBreakpoint(bp, true);
+ }
+ else
+ {
+#ifdef _DEBUG
+ if(bp.bp)
+ _dpl(0, "problem");
+#endif
+ bp.bp = GdbDataBreakpoint { };
+ }
+ }
+ }
}
}
- void GdbBreakpointsInsert()
+ void UnsetBreakpoint(Breakpoint bp)
+ {
+ char * s; _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::UnsetBreakpoint(", s=bp.CopyLocationString(false), ")"); delete s;
+ if(symbols && bp.inserted)
+ {
+ GdbCommand(false, "-break-delete %s", bp.bp.number);
+ bp.inserted = false;
+ bp.bp = { };
+ }
+ }
+
+ bool SetBreakpoint(Breakpoint bp, bool removePath)
{
+ char * s; _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::SetBreakpoint(", s=bp.CopyLocationString(false), ", ", removePath ? "**** removePath(true) ****" : "", ")"); delete s;
+ breakpointError = false;
if(symbols)
{
- //if(!breakpointsInserted)
+ char * location = bp.CopyLocationString(removePath);
+ sentBreakInsert = true;
+ GdbCommand(false, "-break-insert %s", location);
+ delete location;
+ if(!breakpointError)
{
- //if(!ignoreBreakpoints)
- //breakpointsInserted = true;
- for(bp : ide.workspace.breakpoints)
+ if(bpItem && bpItem.multipleBPs && bpItem.multipleBPs.count)
{
- if(!bp.inserted && bp.type == user)
+ int count = 0;
+ GdbDataBreakpoint first = null;
+ for(n : bpItem.multipleBPs)
{
- if(!ignoreBreakpoints && bp.enabled)
+ if(!fstrcmp(n.fullname, bp.absoluteFilePath))
{
- sentBreakInsert = true;
- GdbCommand(false, "-break-insert %s:%d", bp.relativeFilePath, bp.line);
- bp.bp = bpItem;
- bpItem = null;
- bp.inserted = (bp.bp && bp.bp.number != 0);
- bp.hits = 0;
- ValidateBreakpoint(bp);
+ count++;
+ if(!first)
+ first = n;
}
else
{
-#ifdef _DEBUG
- if(bp.bp)
- printf("problem\n");
-#endif
- bp.bp = GdbDataBreakpoint { };
+ if(n.enabled)
+ {
+ GdbCommand(false, "-break-disable %s", n.number);
+ n.enabled = false;
+ }
+ else
+ _dpl2(_dpct, dplchan::debuggerProblem, 0, "Debugger::SetBreakpoint -- error breakpoint already disabled.");
}
}
+ if(first)
+ {
+ bpItem.addr = first.addr;
+ bpItem.func = first.func;
+ bpItem.file = first.file;
+ bpItem.fullname = first.fullname;
+ bpItem.line = first.line;
+ //bpItem.thread-groups = first.thread-groups;
+ bpItem.multipleBPs.Free();
+ delete bpItem.multipleBPs;
+ }
+ else if(count == 0)
+ _dpl2(_dpct, dplchan::debuggerProblem, 0, "Debugger::SetBreakpoint -- error multiple breakpoints all disabled.");
+ else
+ _dpl2(_dpct, dplchan::debuggerProblem, 0, "Debugger::SetBreakpoint -- error multiple breakpoints in exact same file not supported.");
}
- if(bpRunToCursor && !bpRunToCursor.inserted)
- {
- sentBreakInsert = true;
- GdbCommand(false, "-break-insert %s:%d", bpRunToCursor.relativeFilePath, bpRunToCursor.line);
- bpRunToCursor.bp = bpItem;
- bpItem = null;
- bpRunToCursor.inserted = (bpRunToCursor.bp && bpRunToCursor.bp.number != 0);
- ValidateBreakpoint(bpRunToCursor);
- }
+ bp.bp = bpItem;
+ bpItem = null;
+ bp.inserted = (bp.bp && bp.bp.number && strcmp(bp.bp.number, "0"));
+ if(bp.inserted)
+ ValidateBreakpoint(bp);
+ /*if(bp == bpRunToCursor)
+ runToCursorDebugStart = false;*/
}
}
+ return !breakpointError;
}
- void GdbBreakpointsDelete(bool deleteRunToCursor)
+ void GdbBreakpointsDelete(bool deleteRunToCursor, bool deleteInternalBreakpoints, bool deleteUserBreakpoints)
{
- //breakpointsInserted = false;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbBreakpointsDelete(deleteRunToCursor(", deleteRunToCursor, "))");
if(symbols)
{
- for(bp : ide.workspace.breakpoints)
+ if(deleteInternalBreakpoints)
{
- if(bp.bp)
- GdbCommand(false, "-break-delete %d", bp.bp.number);
- bp.inserted = false;
- bp.bp = bpItem;
- //check here (reply form -break-delete, returns bpitem?)
- bpItem = null;
+ for(bp : sysBPs)
+ UnsetBreakpoint(bp);
}
- if(deleteRunToCursor && bpRunToCursor)
+ if(deleteUserBreakpoints)
{
- GdbCommand(false, "-break-delete %d", bpRunToCursor.bp.number);
- bpRunToCursor.inserted = false;
- bpRunToCursor.bp = bpItem;
- //check here (reply form -break-delete, returns bpitem?)
- bpItem = null;
+ for(bp : ide.workspace.breakpoints)
+ UnsetBreakpoint(bp);
}
+ if(deleteRunToCursor && bpRunToCursor)
+ UnsetBreakpoint(bpRunToCursor);
}
}
void GdbGetStack()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbGetStack()");
activeFrame = null;
stackFrames.Free(Frame::Free);
GdbCommand(false, "-stack-info-depth");
if(!frameCount)
GdbCommand(false, "-stack-info-depth 192");
if(frameCount && frameCount <= 192)
- GdbCommand(false, "-stack-list-frames 0 191");
+ GdbCommand(false, "-stack-list-frames 0 %d", Min(frameCount-1, 191));
else
{
- GdbCommand(false, "-stack-list-frames 0 95");
+ GdbCommand(false, "-stack-list-frames 0 %d", Min(frameCount-1, 95));
GdbCommand(false, "-stack-list-frames %d %d", Max(frameCount - 96, 96), frameCount - 1);
}
GdbCommand(false, "");
bool GdbTargetSet()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbTargetSet()");
if(!targeted)
{
char escaped[MAX_LOCATION];
if(!symbols)
return true;
- for(prj : ide.workspace.projects)
+ if(usingValgrind)
{
- if(prj == ide.workspace.projects.firstIterator.data)
- continue;
-
- //PrintLn("THIS: ", (String)prj.topNode.path);
- GdbCommand(false, "-environment-directory \"%s\"", prj.topNode.path);
- //GdbCommand(false, ""); // why this empty GDB command
+ const char *vgdbCommand = "/usr/bin/vgdb"; // TODO: vgdb command config option
+ //GdbCommand(false, "-target-select remote | %s --pid=%d", "vgdb", targetProcessId);
+ printf("target remote | %s --pid=%d\n", vgdbCommand, targetProcessId);
+ GdbCommand(false, "target remote | %s --pid=%d", vgdbCommand, targetProcessId); // TODO: vgdb command config option
}
- for(dir : ide.workspace.sourceDirs)
+ /*for(prj : ide.workspace.projects; prj != ide.workspace.projects.firstIterator.data)
+ GdbCommand(false, "-environment-directory \"%s\"", prj.topNode.path);*/
+
+ for(dir : ide.workspace.sourceDirs; dir && dir[0])
{
- GdbCommand(false, "-environment-directory \"%s\"", dir);
- //GdbCommand(false, ""); // why this empty GDB command
+ bool interference = false;
+ for(prj : ide.workspace.projects)
+ {
+ if(!fstrcmp(prj.topNode.path, dir))
+ {
+ interference = true;
+ break;
+ }
+ }
+ if(!interference && dir[0])
+ GdbCommand(false, "-environment-directory \"%s\"", dir);
}
- GdbInsertInternalBreakpoint();
+
targeted = true;
}
return true;
}
- void GdbTargetRelease()
+ /*void GdbTargetRelease()
{
if(targeted)
{
- GdbBreakpointsDelete(true);
+ GdbBreakpointsDelete(true, true, true);
GdbCommand(false, "file"); //GDB/MI Missing Implementation -target-detach
targeted = false;
symbols = true;
}
- }
+ }*/
void GdbDebugBreak(bool internal)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbDebugBreak()");
if(targetProcessId)
{
if(internal)
breakType = DebuggerAction::internal;
- if(ide)
- {
- //ide.AdjustDebugMenus();
- ide.Update(null);
- }
+ if(ide) ide.Update(null);
app.Unlock();
if(Process_Break(targetProcessId)) //GdbCommand(false, "-exec-interrupt");
serialSemaphore.Wait();
{
ChangeState(loaded);
targetProcessId = 0;
- //ide.AdjustDebugMenus();
}
app.Lock();
}
void GdbExecRun()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbExecRun()");
GdbTargetSet();
GdbExecCommon();
ShowDebuggerViews();
- GdbCommand(true, "-exec-run");
+ if(usingValgrind)
+ GdbCommand(true, "-exec-continue");
+ else
+ GdbCommand(true, "-exec-run");
}
void GdbExecContinue(bool focus)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbExecContinue()");
GdbExecCommon();
GdbCommand(focus, "-exec-continue");
}
void GdbExecNext()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbExecNext()");
GdbExecCommon();
GdbCommand(true, "-exec-next");
}
void GdbExecStep()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbExecStep()");
GdbExecCommon();
GdbCommand(true, "-exec-step");
}
void GdbExecFinish()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbExecFinish()");
GdbExecCommon();
GdbCommand(true, "-exec-finish");
}
void GdbExecCommon()
{
- ClearBreakDisplay();
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbExecCommon()");
GdbBreakpointsInsert();
}
#ifdef GDB_DEBUG_GUI
void SendGDBCommand(char * command)
{
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::SendGDBCommand()");
DebuggerState oldState = state;
switch(state)
{
void ClearBreakDisplay()
{
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ClearBreakDisplay()");
activeThread = 0;
activeFrameLevel = -1;
hitThread = 0;
- bpHit = null;
signalThread = 0;
signalOn = false;
frameCount = 0;
bool GdbAbortExec()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbAbortExec()");
sentKill = true;
GdbCommand(false, "-interpreter-exec console \"kill\""); // should use -exec-abort -- GDB/MI implementation incomplete
return true;
}
- bool GdbInit()
+ bool GdbInit(CompilerConfig compiler, ProjectConfig config, int bitDepth, bool useValgrind)
{
bool result = true;
char oldDirectory[MAX_LOCATION];
char tempPath[MAX_LOCATION];
- char command[MAX_LOCATION];
- char oldPath[MAX_LOCATION * 65];
+ char command[MAX_F_STRING*4];
Project project = ide.project;
- DirExpression targetDirExp = project.targetDir;
+ DirExpression targetDirExp = project.GetTargetDir(compiler, config, bitDepth);
+ PathBackup pathBackup { };
- GetEnvironment("PATH", oldPath, sizeof(oldPath));
-
- prjConfig = project.config;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbInit()");
+ if(currentCompiler != compiler)
+ {
+ delete currentCompiler;
+ currentCompiler = compiler;
+ incref currentCompiler;
+ }
+ prjConfig = config;
+ this.bitDepth = bitDepth;
+ usingValgrind = useValgrind;
ChangeState(loaded);
sentKill = false;
sentBreakInsert = false;
+ breakpointError = false;
+ ignoreBreakpoints = false;
symbols = true;
targeted = false;
modules = false;
- //breakpointsInserted = false;
+ needReset = false;
ide.outputView.ShowClearSelectTab(debug);
- ide.outputView.debugBox.Logf("Starting debug mode\n");
+ ide.outputView.debugBox.Logf($"Starting debug mode\n");
-#ifdef GDB_DEBUG_CONSOLE
- Log("Starting GDB"); Log("\n");
-#endif
#ifdef GDB_DEBUG_OUTPUT
ide.outputView.gdbBox.Logf("run: Starting GDB\n");
#endif
PathCatSlash(tempPath, targetDirExp.dir);
delete targetDir;
targetDir = CopyString(tempPath);
- project.CatTargetFileName(tempPath);
+ project.CatTargetFileName(tempPath, compiler, config);
delete targetFile;
targetFile = CopyString(tempPath);
else
ChangeWorkingDir(ide.workspace.projectDir);
- ide.SetPath(true);
+ ide.SetPath(true, compiler, config, bitDepth);
// TODO: This pollutes the environment, but at least it works
// It shouldn't really affect the IDE as the PATH gets restored and other variables set for testing will unlikely cause problems
SetEnvironment(e.name, e.string);
}
- sprintf(command, "gdb -n -silent --interpreter=mi2"); //-async //\"%s\"
- gdbTimer.Start();
- gdbHandle = DualPipeOpen(PipeOpenMode { output = 1, error = 2, input = 1 }, command);
- if(!gdbHandle)
+ if(usingValgrind)
+ {
+ char * clArgs = ide.workspace.commandLineArgs;
+ const char *valgrindCommand = "valgrind"; // TODO: valgrind command config option //TODO: valgrind options
+ ValgrindLeakCheck vgLeakCheck = ide.workspace.vgLeakCheck;
+ int vgRedzoneSize = ide.workspace.vgRedzoneSize;
+ bool vgTrackOrigins = ide.workspace.vgTrackOrigins;
+ vgLogFile = CreateTemporaryFile(vgLogPath, "ecereidevglog");
+ if(vgLogFile)
+ {
+ incref vgLogFile;
+ vgLogThread.Create();
+ }
+ else
+ {
+ ide.outputView.debugBox.Logf($"Debugger Fatal Error: Couldn't open temporary log file for Valgrind output\n");
+ result = false;
+ }
+ if(result && !CheckCommandAvailable(valgrindCommand))
+ {
+ ide.outputView.debugBox.Logf($"Debugger Fatal Error: Command %s for Valgrind is not available.\n", valgrindCommand);
+ result = false;
+ }
+ if(result)
+ {
+ char * vgRedzoneSizeFlag = vgRedzoneSize == -1 ? "" : PrintString(" --redzone-size=", vgRedzoneSize);
+ sprintf(command, "%s --vgdb=yes --vgdb-error=0 --log-file=%s --leak-check=%s%s --track-origins=%s %s%s%s",
+ valgrindCommand, vgLogPath, (char*)vgLeakCheck, vgRedzoneSizeFlag, vgTrackOrigins ? "yes" : "no", targetFile, clArgs ? " " : "", clArgs ? clArgs : "");
+ if(vgRedzoneSize != -1)
+ delete vgRedzoneSizeFlag;
+ vgTargetHandle = DualPipeOpen(PipeOpenMode { output = true, /*error = true, */input = true }, command);
+ if(!vgTargetHandle)
+ {
+ ide.outputView.debugBox.Logf($"Debugger Fatal Error: Couldn't start Valgrind\n");
+ result = false;
+ }
+ }
+ if(result)
+ {
+ incref vgTargetHandle;
+ vgTargetThread.Create();
+
+ targetProcessId = vgTargetHandle.GetProcessID();
+ waitingForPID = false;
+ if(!targetProcessId)
+ {
+ ide.outputView.debugBox.Logf($"Debugger Fatal Error: Couldn't get Valgrind process ID\n");
+ result = false;
+ }
+ }
+ if(result)
+ {
+ app.Unlock();
+ serialSemaphore.Wait();
+ app.Lock();
+ }
+ }
+
+ if(result)
{
- ide.outputView.debugBox.Logf("Debugger Fatal Error: Couldn't start GDB\n");
- result = false;
+ strcpy(command,
+ (compiler.targetPlatform == win32 && bitDepth == 64) ? "x86_64-w64-mingw32-gdb" :
+ (compiler.targetPlatform == win32 && bitDepth == 32) ? "i686-w64-mingw32-gdb" :
+ "gdb");
+ if(!CheckCommandAvailable(command))
+ {
+ ide.outputView.debugBox.Logf($"Debugger Fatal Error: Command %s for GDB is not available.\n", command);
+ result = false;
+ }
+ else
+ {
+ strcat(command, " -n -silent --interpreter=mi2"); //-async //\"%s\"
+ gdbTimer.Start();
+ gdbHandle = DualPipeOpen(PipeOpenMode { output = true, /*error = true, */input = true }, command);
+ if(!gdbHandle)
+ {
+ ide.outputView.debugBox.Logf($"Debugger Fatal Error: Couldn't start GDB\n");
+ result = false;
+ }
+ }
}
if(result)
{
gdbProcessId = gdbHandle.GetProcessID();
if(!gdbProcessId)
{
- ide.outputView.debugBox.Logf("Debugger Fatal Error: Couldn't get GDB process ID\n");
+ ide.outputView.debugBox.Logf($"Debugger Fatal Error: Couldn't get GDB process ID\n");
result = false;
}
- if(result)
- {
- app.Unlock();
- serialSemaphore.Wait();
- app.Lock();
+ }
+ if(result)
+ {
+ app.Unlock();
+ serialSemaphore.Wait();
+ app.Lock();
+
+ GdbCommand(false, "-gdb-set verbose off");
+ //GdbCommand(false, "-gdb-set exec-done-display on");
+ GdbCommand(false, "-gdb-set step-mode off");
+ GdbCommand(false, "-gdb-set unwindonsignal on");
+ //GdbCommand(false, "-gdb-set shell on");
+ GdbCommand(false, "set print elements 992");
+ GdbCommand(false, "-gdb-set backtrace limit 100000");
- if(!GdbTargetSet())
+ if(!GdbTargetSet())
+ {
+ //ChangeState(terminated);
+ result = false;
+ }
+ }
+ if(result)
+ {
+#if defined(__unix__)
+ {
+ CreateTemporaryDir(progFifoDir, "ecereide");
+ strcpy(progFifoPath, progFifoDir);
+ PathCat(progFifoPath, "ideprogfifo");
+ if(!mkfifo(progFifoPath, 0600))
{
- //ChangeState(terminated);
- //ide.AdjustDebugMenus();
- result = false;
+ //fileCreated = true;
}
-
- if(result)
+ else
{
-#if defined(__unix__)
- {
- CreateTemporaryDir(progFifoDir, "ecereide");
- strcpy(progFifoPath, progFifoDir);
- PathCat(progFifoPath, "ideprogfifo");
- if(!mkfifo(progFifoPath, 0600))
- {
- //fileCreated = true;
- }
- else
- {
- //app.Lock();
- ide.outputView.debugBox.Logf("err: Unable to create FIFO %s\n", progFifoPath);
- //app.Unlock();
- }
- }
+ //app.Lock();
+ ide.outputView.debugBox.Logf(createFIFOMsg, progFifoPath);
+ //app.Unlock();
+ }
+ }
- progThread.terminate = false;
- progThread.Create();
+ if(!usingValgrind)
+ {
+ progThread.terminate = false;
+ progThread.Create();
+ }
#endif
-
+
#if defined(__WIN32__)
- GdbCommand(false, "-gdb-set new-console on");
+ GdbCommand(false, "-gdb-set new-console on");
#endif
-
- GdbCommand(false, "-gdb-set verbose off");
- //GdbCommand(false, "-gdb-set exec-done-display on");
- GdbCommand(false, "-gdb-set step-mode off");
- GdbCommand(false, "-gdb-set unwindonsignal on");
- //GdbCommand(false, "-gdb-set shell on");
- GdbCommand(false, "set print elements 992");
- GdbCommand(false, "-gdb-set backtrace limit 100000");
#if defined(__unix__)
- GdbCommand(false, "-inferior-tty-set %s", progFifoPath);
+ if(!usingValgrind)
+ GdbCommand(false, "-inferior-tty-set %s", progFifoPath);
#endif
- GdbCommand(false, "-gdb-set args %s", ide.workspace.commandLineArgs ? ide.workspace.commandLineArgs : "");
- /*
- for(e : ide.workspace.environmentVars)
- {
- GdbCommand(false, "set environment %s=%s", e.name, e.string);
- }
- */
- }
+ if(!usingValgrind)
+ GdbCommand(false, "-gdb-set args %s", ide.workspace.commandLineArgs ? ide.workspace.commandLineArgs : "");
+ /*
+ for(e : ide.workspace.environmentVars)
+ {
+ GdbCommand(false, "set environment %s=%s", e.name, e.string);
}
+ */
}
ChangeWorkingDir(oldDirectory);
- SetEnvironment("PATH", oldPath);
+
+ delete pathBackup;
if(!result)
GdbExit();
void GdbExit()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbExit()");
if(gdbHandle && gdbProcessId)
{
GdbCommand(false, "-gdb-exit");
gdbTimer.Stop();
ChangeState(terminated); // this state change seems to be superfluous, is it safety for something?
prjConfig = null;
+ needReset = false;
if(ide.workspace)
+ {
for(bp : ide.workspace.breakpoints)
+ {
bp.inserted = false;
+ delete bp.bp;
+ }
+ }
for(bp : sysBPs)
+ {
bp.inserted = false;
+ delete bp.bp;
+ }
if(bpRunToCursor)
+ {
bpRunToCursor.inserted = false;
+ delete bpRunToCursor.bp;
+ }
- ide.outputView.debugBox.Logf("Debugging stopped\n");
+ ide.outputView.debugBox.Logf($"Debugging stopped\n");
ClearBreakDisplay();
- //ide.AdjustDebugMenus();
ide.Update(null);
#if defined(__unix__)
- if(FileExists(progFifoPath)) //fileCreated)
+ if(!usingValgrind && FileExists(progFifoPath)) //fileCreated)
{
progThread.terminate = true;
if(fifoFile)
void WatchesCodeEditorLinkInit()
{
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::WatchesCodeEditorLinkInit()");
/*
char tempPath[MAX_LOCATION];
char path[MAX_LOCATION];
//void MakeFilePathProjectRelative(char * path, char * relativePath)
- if(!ide.projectView.GetRelativePath(activeFrame.file, tempPath))
+ if(!ide.projectView.project.GetRelativePath(activeFrame.file, tempPath))
strcpy(tempPath, activeFrame.file);
strcpy(path, ide.workspace.projectDir);
PathCat(path, tempPath);
- codeEditor = (CodeEditor)ide.OpenFile(path, Normal, false, null, no);
+ codeEditor = (CodeEditor)ide.OpenFile(path, Normal, false, null, no, normal, false);
if(!codeEditor)
{
for(srcDir : ide.workspace.sourceDirs)
{
strcpy(path, srcDir);
PathCat(path, tempPath);
- codeEditor = (CodeEditor)ide.OpenFile(path, Normal, false, null, no);
+ codeEditor = (CodeEditor)ide.OpenFile(path, Normal, false, null, no, normal, false);
if(codeEditor) break;
}
}
*/
- if(activeFrame && !activeFrame.absoluteFile && activeFrame.file)
- activeFrame.absoluteFile = ide.workspace.GetAbsolutePathFromRelative(activeFrame.file);
+ /*if(activeFrame && !activeFrame.absoluteFile && activeFrame.file)
+ activeFrame.absoluteFile = ide.workspace.GetAbsolutePathFromRelative(activeFrame.file);*/
if(!activeFrame || !activeFrame.absoluteFile)
codeEditor = null;
else
- codeEditor = (CodeEditor)ide.OpenFile(activeFrame.absoluteFile, normal, false, null, no, normal);
+ codeEditor = (CodeEditor)ide.OpenFile(activeFrame.absoluteFile, normal, false, null, no, normal, false);
if(codeEditor)
{
codeEditor.inUseDebug = true;
void WatchesCodeEditorLinkRelease()
{
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::WatchesCodeEditorLinkRelease()");
//if(watchesInit)
{
if(codeEditor)
{
bool result = false;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ResolveWatch()");
wh.Reset();
/*delete wh.value;
{
char watchmsg[MAX_F_STRING];
if(state == stopped && !codeEditor)
- wh.value = CopyString("No source file found for selected frame");
+ wh.value = CopyString($"No source file found for selected frame");
//if(codeEditor && state == stopped || state != stopped)
else
{
if(exp && !parseError)
{
+ char expString[4096];
+ expString[0] = 0;
+ PrintExpression(exp, expString);
+
if(GetPrivateModule())
{
if(codeEditor)
if(wh.type)
wh.type.refCount++;
DebugComputeExpression(exp);
+ if(ExpressionIsError(exp))
+ {
+ GDBFallBack(exp, expString);
+ }
/*if(exp.hasAddress)
{
switch(exp.type)
{
case symbolErrorExp:
- sprintf(watchmsg, "Symbol \"%s\" not found", exp.identifier.string);
+ snprintf(watchmsg, sizeof(watchmsg), $"Symbol \"%s\" not found", exp.identifier.string);
break;
case structMemberSymbolErrorExp:
// todo get info as in next case (ExpClassMemberSymbolError)
- sprintf(watchmsg, "Error: Struct member not found for \"%s\"", wh.expression);
+ snprintf(watchmsg, sizeof(watchmsg), $"Error: Struct member not found for \"%s\"", wh.expression);
break;
case classMemberSymbolErrorExp:
{
{
char string[256] = "";
Symbol classSym;
- PrintType(type, string, false, true);
+ PrintTypeNoConst(type, string, false, true);
classSym = FindClass(string);
_class = classSym ? classSym.registered : null;
}
if(_class)
- sprintf(watchmsg, "Member \"%s\" not found in class \"%s\"", memberID ? memberID.string : "", _class.name);
+ snprintf(watchmsg, sizeof(watchmsg), $"Member \"%s\" not found in class \"%s\"", memberID ? memberID.string : "", _class.name);
else
- sprintf(watchmsg, "Member \"%s\" not found in unregistered class? (Should never get this message)", memberID ? memberID.string : "");
+ snprintf(watchmsg, sizeof(watchmsg), "Member \"%s\" not found in unregistered class? (Should never get this message)", memberID ? memberID.string : "");
}
else
- sprintf(watchmsg, "Member \"%s\" not found in no type? (Should never get this message)", memberID ? memberID.string : "");
+ snprintf(watchmsg, sizeof(watchmsg), "Member \"%s\" not found in no type? (Should never get this message)", memberID ? memberID.string : "");
}
break;
case memoryErrorExp:
- sprintf(watchmsg, "Memory can't be read at %s", (exp.type == constantExp) ? exp.constant : null);
+ // Need to ensure when set to memoryErrorExp, constant is set
+ snprintf(watchmsg, sizeof(watchmsg), $"Memory can't be read at %s", /*(exp.type == constantExp) ? */exp.constant /*: null*/);
break;
case dereferenceErrorExp:
- sprintf(watchmsg, "Dereference failure for \"%s\"", wh.expression);
+ snprintf(watchmsg, sizeof(watchmsg), $"Dereference failure for \"%s\"", wh.expression);
break;
case unknownErrorExp:
- sprintf(watchmsg, "Unknown error for \"%s\"", wh.expression);
+ snprintf(watchmsg, sizeof(watchmsg), $"Unknown error for \"%s\"", wh.expression);
break;
case noDebuggerErrorExp:
- sprintf(watchmsg, "Debugger required for symbol evaluation in \"%s\"", wh.expression);
+ snprintf(watchmsg, sizeof(watchmsg), $"Debugger required for symbol evaluation in \"%s\"", wh.expression);
break;
case debugStateErrorExp:
- sprintf(watchmsg, "Incorrect debugger state for symbol evaluation in \"%s\"", wh.expression);
+ snprintf(watchmsg, sizeof(watchmsg), $"Incorrect debugger state for symbol evaluation in \"%s\"", wh.expression);
break;
case 0:
- sprintf(watchmsg, "Null type for \"%s\"", wh.expression);
+ snprintf(watchmsg, sizeof(watchmsg), $"Null type for \"%s\"", wh.expression);
break;
case constantExp:
case stringExp:
if(exp.expType.kind != arrayType || exp.hasAddress)
{
- uint address;
+ uint64 address;
char * string;
char value[4196];
int len;
sprintf(temp, "(char*)%s", exp.constant);*/
//evaluation = Debugger::EvaluateExpression(temp, &evalError);
- address = strtoul(exp.constant, null, 0);
- //printf("%x\n", address);
- sprintf(value, "0x%08x ", address);
+ // address = strtoul(exp.constant, null, 0);
+ address = _strtoui64(exp.constant, null, 0);
+ //_dpl(0, "0x", address);
+ // snprintf(value, sizeof(value), "0x%08x ", address);
+
+ if(address > 0xFFFFFFFFLL)
+ snprintf(value, sizeof(value), (GetRuntimePlatform() == win32) ? "0x%016I64x " : "0x%016llx ", address);
+ else
+ snprintf(value, sizeof(value), (GetRuntimePlatform() == win32) ? "0x%08I64x " : "0x%08llx ", address);
+ value[sizeof(value)-1] = 0;
if(!address)
- strcat(value, "Null string");
+ strcat(value, $"Null string");
else
{
int size = 4096;
}
else if(string)
{
- strcat(value, "Empty string");
+ strcat(value, $"Empty string");
delete string;
}
else
- strcat(value, "Couldn't read memory");
+ strcat(value, $"Couldn't read memory");
}
wh.value = CopyString(value);
}
if(item)
wh.value = CopyString(item.name);
else
- wh.value = CopyString("Invalid Enum Value");
- result = (bool)atoi(exp.constant);
+ wh.value = CopyString($"Invalid Enum Value");
+ result = true;
}
else if(wh.type && (wh.type.kind == charType || (wh.type.kind == classType && wh.type._class &&
wh.type._class.registered && !strcmp(wh.type._class.registered.fullName, "ecere::com::unichar"))) )
}
else
{
- value = strtoul(exp.constant, null, 0);
+ value = (uint)strtoul(exp.constant, null, 0);
signedValue = (int)value;
}
}
charString[0] = 0;
UTF32toUTF8Len(&value, 1, charString, 5);
if(value == '\0')
- sprintf(string, "\'\\0' (0)");
+ snprintf(string, sizeof(string), "\'\\0' (0)");
else if(value == '\t')
- sprintf(string, "\'\\t' (%d)", value);
+ snprintf(string, sizeof(string), "\'\\t' (%d)", value);
else if(value == '\n')
- sprintf(string, "\'\\n' (%d)", value);
+ snprintf(string, sizeof(string), "\'\\n' (%d)", value);
else if(value == '\r')
- sprintf(string, "\'\\r' (%d)", value);
+ snprintf(string, sizeof(string), "\'\\r' (%d)", value);
else if(wh.type.kind == charType && wh.type.isSigned)
- sprintf(string, "\'%s\' (%d)", charString, signedValue);
+ snprintf(string, sizeof(string), "\'%s\' (%d)", charString, signedValue);
else if(value > 256 || wh.type.kind != charType)
{
if(value > 0x10FFFF || !GetCharCategory(value))
- sprintf(string, "Invalid Unicode Keypoint (0x%08X)", value);
+ snprintf(string, sizeof(string), $"Invalid Unicode Keypoint (0x%08X)", value);
else
- sprintf(string, "\'%s\' (U+%04X)", charString, value);
+ snprintf(string, sizeof(string), "\'%s\' (U+%04X)", charString, value);
}
else
- sprintf(string, "\'%s\' (%d)", charString, value);
+ snprintf(string, sizeof(string), "\'%s\' (%d)", charString, value);
+ string[sizeof(string)-1] = 0;
wh.value = CopyString(string);
result = true;
else
{
wh.value = CopyString(exp.constant);
- result = (bool)atoi(exp.constant);
+ result = true;
}
break;
default:
if(exp.hasAddress)
{
- wh.value = PrintHexUInt(exp.address);
- result = (bool)exp.address;
+ wh.value = PrintHexUInt64(exp.address);
+ result = true;
}
else
{
char tempString[256];
- sprintf(watchmsg, "Evaluation failed for \"%s\" of type \"%s\"", wh.expression,
- exp.type.OnGetString(tempString, null, null));
+ if(exp.member.memberType == propertyMember)
+ snprintf(watchmsg, sizeof(watchmsg), $"Missing property evaluation support for \"%s\"", wh.expression);
+ else
+ snprintf(watchmsg, sizeof(watchmsg), $"Evaluation failed for \"%s\" of type \"%s\"", wh.expression,
+ exp.type.OnGetString(tempString, null, null));
}
break;
}
}
else
- sprintf(watchmsg, "Invalid expression: \"%s\"", wh.expression);
+ snprintf(watchmsg, sizeof(watchmsg), $"Invalid expression: \"%s\"", wh.expression);
if(exp) FreeExpression(exp);
//else
// wh.value = CopyString("No source file found for selected frame");
+ watchmsg[sizeof(watchmsg)-1] = 0;
if(!wh.value)
wh.value = CopyString(watchmsg);
}
void EvaluateWatches()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::EvaluateWatches()");
for(wh : ide.workspace.watches)
ResolveWatch(wh);
}
char * ::GdbEvaluateExpression(char * expression)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbEvaluateExpression(", expression, ")");
eval.active = true;
eval.error = none;
GdbCommand(false, "-data-evaluate-expression \"%s\"", expression);
}
// to be removed... use GdbReadMemory that returns a byte array instead
- char * ::GdbReadMemoryString(uint address, int size, char format, int rows, int cols)
+ char * ::GdbReadMemoryString(uint64 address, int size, char format, int rows, int cols)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbReadMemoryString(", address, ")");
eval.active = true;
eval.error = none;
- GdbCommand(false, "-data-read-memory 0x%08x %c, %d, %d, %d", address, format, size, rows, cols);
+#ifdef _DEBUG
+ if(!size)
+ _dpl(0, "GdbReadMemoryString called with size = 0!");
+#endif
+ // GdbCommand(false, "-data-read-memory 0x%08x %c, %d, %d, %d", address, format, size, rows, cols);
+ if(GetRuntimePlatform() == win32)
+ GdbCommand(false, "-data-read-memory 0x%016I64x %c, %d, %d, %d", address, format, size, rows, cols);
+ else
+ GdbCommand(false, "-data-read-memory 0x%016llx %c, %d, %d, %d", address, format, size, rows, cols);
if(eval.active)
ide.outputView.debugBox.Logf("Debugger Error: GdbReadMemoryString\n");
return eval.result;
}
- byte * ::GdbReadMemory(uint address, int bytes)
+ byte * ::GdbReadMemory(uint64 address, int bytes)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbReadMemory(", address, ")");
eval.active = true;
eval.error = none;
- GdbCommand(false, "-data-read-memory 0x%08x %c, 1, 1, %d", address, 'u', bytes);
+ //GdbCommand(false, "-data-read-memory 0x%08x %c, 1, 1, %d", address, 'u', bytes);
+ if(GetRuntimePlatform() == win32)
+ GdbCommand(false, "-data-read-memory 0x%016I64x %c, 1, 1, %d", address, 'u', bytes);
+ else
+ GdbCommand(false, "-data-read-memory 0x%016llx %c, 1, 1, %d", address, 'u', bytes);
+#ifdef _DEBUG
+ if(!bytes)
+ _dpl(0, "GdbReadMemory called with bytes = 0!");
+#endif
if(eval.active)
ide.outputView.debugBox.Logf("Debugger Error: GdbReadMemory\n");
else if(eval.result && strcmp(eval.result, "N/A"))
return null;
}
- void EventHit(GdbDataStop stopItem)
+ void EventHit(GdbDataStop stopItem, Breakpoint bpInternal, Breakpoint bpUser)
{
- bool conditionMet = true;
- Breakpoint bp = bpHit;
-
- if(!bp && bpRunToCursor)
+ char * s1 = null; char * s2 = null;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::EventHit(",
+ "bpInternal(", bpInternal ? s1=bpInternal.CopyLocationString(false) : null, "), ",
+ "bpUser(", bpUser ? s2=bpUser.CopyLocationString(false) : null, ")) -- ",
+ "ignoreBreakpoints(", ignoreBreakpoints, "), ",
+ "hitCursorBreakpoint(", bpUser && bpUser.type == runToCursor, ")");
+ delete s1; delete s2;
+
+ if(bpUser && stopItem.frame.line && bpUser.line != stopItem.frame.line)
{
- bp = bpRunToCursor;
- if(symbols)
- GdbCommand(false, "-break-delete %d", bp.bp.number);
+ // updating user breakpoint on hit location difference
+ // todo, print something?
+ bpUser.line = stopItem.frame.line;
+ ide.breakpointsView.UpdateBreakpoint(bpUser.row);
+ ide.workspace.Save();
}
-
- if(bp)
+ if(bpInternal)
{
- if(bp.type == user && bp.line != stopItem.frame.line)
+ bpInternal.hits++;
+ if(bpInternal.type == internalModulesLoaded)
+ modules = true;
+ if(!bpUser && !userBreakOnInternalBreakpoint)
{
- bp.line = stopItem.frame.line;
- ide.breakpointsView.UpdateBreakpoint(bp.row);
- ide.workspace.Save();
+ if(userAction == stepOut)//if(prevStopItem.reason == functionFinished)
+ StepOut(ignoreBreakpoints);
+ else
+ GdbExecContinue(false);
}
-
- switch(bp.type)
+ }
+ if(bpUser)
+ {
+ bool conditionMet = true;
+ if(bpUser.condition)
+ conditionMet = ResolveWatch(bpUser.condition);
+ bpUser.hits++;
+ if(!ignoreBreakpoints && (bpUser.level == -1 || bpUser.level == frameCount-1) && conditionMet)
{
- case internalMain:
- case internalWinMain:
- GdbBreakpointsInsert();
- if(userBreakOnInternBreak)
- {
- userBreakOnInternBreak = false;
- // Why was SelectFrame missing here?
- SelectFrame(activeFrameLevel);
- GoToStackFrameLine(activeFrameLevel, true);
- //ide.AdjustDebugMenus();
- ide.Activate();
- ide.Update(null);
- }
- else
- GdbExecContinue(false);
- break;
- case internalModulesLoaded:
- modules = true;
- GdbBreakpointsInsert();
+ if(!bpUser.ignore)
+ bpUser.breaks++;
+ else
+ {
+ bpUser.ignore--;
GdbExecContinue(false);
- break;
- case user:
- case runToCursor:
- if(bp.condition)
- conditionMet = ResolveWatch(bp.condition);
- if(conditionMet && (bp.level == -1 || bp.level == frameCount))
- {
- bp.hits++;
- if(bp.hits > bp.ignore)
- {
- ignoreBreakpoints = false;
- // Why was SelectFrame missing here?
- SelectFrame(activeFrameLevel);
- GoToStackFrameLine(activeFrameLevel, true);
- //ide.AdjustDebugMenus();
- ide.Activate();
- ide.Update(null);
- if(bp.type == BreakpointType::runToCursor)
- {
- delete bpRunToCursor;
- bpRunToCursor = null;
- }
- }
- else
- {
- /*bp.ignore--;
- ide.breakpointsView.UpdateBreakpoint(bp.row);*/
- GdbExecContinue(false);
- }
- }
- else
- GdbExecContinue(false);
- break;
+ }
+ }
+ else
+ GdbExecContinue(false);
+ ide.breakpointsView.UpdateBreakpoint(bpUser.row);
+ if(bpUser == bpRunToCursor)
+ {
+ UnsetBreakpoint(bpUser);
+ delete bpRunToCursor;
}
}
- else
- ide.outputView.debugBox.Logf("Debugger Error: Breakpoint hit could not match breakpoint instance\n");
+
+ if(!bpUser && !bpInternal)
+ GdbExecContinue(false);
+ }
+
+ void ValgrindTargetThreadExit()
+ {
+ ide.outputView.debugBox.Logf($"ValgrindTargetThreadExit\n");
+ if(vgTargetHandle)
+ {
+ vgTargetHandle.Wait();
+ delete vgTargetHandle;
+ }
+ HandleExit(null, null);
}
void GdbThreadExit()
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbThreadExit()");
if(state != terminated)
{
ChangeState(terminated);
targetProcessId = 0;
ClearBreakDisplay();
- //ide.AdjustDebugMenus();
+ if(vgLogFile)
+ delete vgLogFile;
if(gdbHandle)
{
serialSemaphore.Release();
gdbHandle.Wait();
delete gdbHandle;
- ide.outputView.debugBox.Logf("Debugger Fatal Error: GDB lost\n");
- ide.outputView.debugBox.Logf("Debugging stopped\n");
+ ide.outputView.debugBox.Logf($"Debugger Fatal Error: GDB lost\n");
+ ide.outputView.debugBox.Logf($"Debugging stopped\n");
ide.Update(null);
+ HideDebuggerViews();
}
//ChangeState(terminated);
}
#if defined(GDB_DEBUG_CONSOLE) || defined(GDB_DEBUG_GUI)
#ifdef GDB_DEBUG_CONSOLE
- Log(output); Log("\n");
+ _dpl2(_dpct, dplchan::gdbOutput, 0, output);
#endif
#ifdef GDB_DEBUG_OUTPUT
{
if(strstr(output, "No debugging symbols found") || strstr(output, "(no debugging symbols found)"))
{
symbols = false;
- ide.outputView.debugBox.Logf("Target doesn't contain debug information!\n");
+ ide.outputView.debugBox.Logf($"Target doesn't contain debug information!\n");
ide.Update(null);
}
break;
}
}
else
- DebuggerProtocolUnknown("Unknown kill reply", item.name);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "kill reply (", item.name, "=", item.value, ") is unheard of");
}
else
HandleExit(null, null);
sentBreakInsert = false;
#ifdef _DEBUG
if(bpItem)
- printf("problem\n");
+ _dpl(0, "problem");
#endif
- bpItem = GdbDataBreakpoint { };
- item.value = StripCurlies(item.value);
- TokenizeList(item.value, ',', subTokens);
- for(i = 0; i < subTokens.count; i++)
- {
- if(TokenizeListItem(subTokens[i], item))
- {
- StripQuotes(item.value, item.value);
- if(!strcmp(item.name, "number"))
- bpItem.number = atoi(item.value);
- else if(!strcmp(item.name, "type"))
- bpItem.type = CopyString(item.value);
- else if(!strcmp(item.name, "disp"))
- bpItem.disp = CopyString(item.value);
- else if(!strcmp(item.name, "enabled"))
- bpItem.enabled = (!strcmpi(item.value, "y"));
- else if(!strcmp(item.name, "addr"))
- bpItem.addr = CopyString(item.value);
- else if(!strcmp(item.name, "func"))
- bpItem.func = CopyString(item.value);
- else if(!strcmp(item.name, "file"))
- bpItem.file = item.value;
- else if(!strcmp(item.name, "line"))
- bpItem.line = atoi(item.value);
- else if(!strcmp(item.name, "at"))
- bpItem.at = CopyString(item.value);
- else if(!strcmp(item.name, "times"))
- bpItem.times = atoi(item.value);
- }
- }
+ bpItem = ParseBreakpoint(item.value, outTokens);
//breakType = bpValidation;
- //app.SignalEvent();
- subTokens.RemoveAll();
}
- else if(!strcmp(item.name, "BreakpointTable"))
- ide.outputView.debugBox.Logf("Debugger Error: Command reply BreakpointTable not handled\n");
else if(!strcmp(item.name, "depth"))
{
StripQuotes(item.value, item.value);
item.value = StripCurlies(item.value);
ParseFrame(frame, item.value);
if(frame.file && frame.from)
- DebuggerProtocolUnknown("Unexpected frame file and from members present", "");
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "unexpected frame file and from members present");
if(frame.file)
{
char * s;
}
ide.callStackView.Logf("%3d ", frame.level);
if(!strncmp(frame.func, "__ecereMethod_", strlen("__ecereMethod_")))
- ide.callStackView.Logf("%s Method, %s:%d\n", &frame.func[strlen("__ecereMethod_")], (s = CopySystemPath(frame.file)), frame.line);
+ ide.callStackView.Logf($"%s Method, %s:%d\n", &frame.func[strlen("__ecereMethod_")], (s = CopySystemPath(frame.file)), frame.line);
else if(!strncmp(frame.func, "__ecereProp_", strlen("__ecereProp_")))
- ide.callStackView.Logf("%s Property, %s:%d\n", &frame.func[strlen("__ecereProp_")], (s = CopySystemPath(frame.file)), frame.line);
+ ide.callStackView.Logf($"%s Property, %s:%d\n", &frame.func[strlen("__ecereProp_")], (s = CopySystemPath(frame.file)), frame.line);
else if(!strncmp(frame.func, "__ecereConstructor_", strlen("__ecereConstructor_")))
- ide.callStackView.Logf("%s Constructor, %s:%d\n", &frame.func[strlen("__ecereConstructor_")], (s = CopySystemPath(frame.file)), frame.line);
+ ide.callStackView.Logf($"%s Constructor, %s:%d\n", &frame.func[strlen("__ecereConstructor_")], (s = CopySystemPath(frame.file)), frame.line);
else if(!strncmp(frame.func, "__ecereDestructor_", strlen("__ecereDestructor_")))
- ide.callStackView.Logf("%s Destructor, %s:%d\n", &frame.func[strlen("__ecereDestructor_")], (s = CopySystemPath(frame.file)), frame.line);
+ ide.callStackView.Logf($"%s Destructor, %s:%d\n", &frame.func[strlen("__ecereDestructor_")], (s = CopySystemPath(frame.file)), frame.line);
else
- ide.callStackView.Logf("%s Function, %s:%d\n", frame.func, (s = CopySystemPath(frame.file)), frame.line);
+ ide.callStackView.Logf($"%s Function, %s:%d\n", frame.func, (s = CopySystemPath(frame.file)), frame.line);
delete s;
}
else
if(frame.from)
{
char * s;
- ide.callStackView.Logf("inside %s, %s\n", frame.func, (s = CopySystemPath(frame.from)));
+ ide.callStackView.Logf($"inside %s, %s\n", frame.func, (s = CopySystemPath(frame.from)));
delete s;
}
else if(frame.func)
ide.callStackView.Logf("%s\n", frame.func);
else
- ide.callStackView.Logf("unknown source\n");
+ ide.callStackView.Logf($"unknown source\n");
}
}
else
- DebuggerProtocolUnknown("Unknown stack content", item.name);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "stack content (", item.name, "=", item.value, ") is unheard of");
}
}
if(activeFrameLevel == -1)
ide.threadsView.Logf("%3d \n", value);
}
else
- DebuggerProtocolUnknown("Unknown threads content", item.name);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "threads content (", item.name, "=", item.value, ") is unheard of");
}
if(!i)
break;
else if(!strcmp(item.name, "next-row"))
{
StripQuotes(item.value, item.value);
- eval.nextBlockAddress = strtoul(item.value, null, 0);
+ eval.nextBlockAddress = _strtoui64(item.value, null, 0);
}
else if(!strcmp(item.name, "memory"))
{
}
}
}
- else if(!strcmp(item.name, "source-path"))
- {
- }
+ else if(!strcmp(item.name, "source-path") || !strcmp(item.name, "BreakpointTable"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "command reply (", item.name, "=", item.value, ") is ignored");
else
- DebuggerProtocolUnknown("Unknown command reply", item.name);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "command reply (", item.name, "=", item.value, ") is unheard of");
}
}
else if(!strcmp(outTokens[0], "^running"))
{
waitingForPID = true;
setWaitingForPID = true;
+ ClearBreakDisplay();
}
else if(!strcmp(outTokens[0], "^exit"))
{
ChangeState(terminated);
- //ide.AdjustDebugMenus();
// ide.outputView.debugBox.Logf("Exit\n");
- //ide.Update(null);
+ // ide.Update(null);
gdbReady = true;
serialSemaphore.Release();
}
if(sentBreakInsert)
{
sentBreakInsert = false;
-#ifdef _DEBUG
- if(bpItem)
- printf("problem\n");
-#endif
- bpItem = GdbDataBreakpoint { };
+ breakpointError = true;
}
if(outTokens.count > 1 && TokenizeListItem(outTokens[1], item))
{
ChangeState(loaded);
targetProcessId = 0;
- //ide.AdjustDebugMenus();
}
else if(!strcmp(item.value, "Function \\\"WinMain\\\" not defined."))
{
{
ChangeState(loaded);
targetProcessId = 0;
- //ide.AdjustDebugMenus();
}
else if(strstr(item.value, "No such file or directory."))
{
ChangeState(loaded);
targetProcessId = 0;
- //ide.AdjustDebugMenus();
+ }
+ else if(strstr(item.value, "During startup program exited with code "))
+ {
+ ChangeState(loaded);
+ targetProcessId = 0;
}
else
{
}
}
else
- DebuggerProtocolUnknown("Unknown error content", item.name);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "error content (", item.name, "=", item.value, ") is unheard of");
}
else
- DebuggerProtocolUnknown("Unknown result-record", outTokens[0]);
-
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "result-record: ", outTokens[0]);
outTokens.RemoveAll();
break;
case '+':
- DebuggerProtocolUnknown("Unknown status-async-output", outTokens[0]);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "status-async-output: ", outTokens[0]);
break;
case '=':
- if(TokenizeList(output, ',', outTokens) && !strcmp(outTokens[0], "=thread-group-created")) //=thread-group-created,id="7611"
- ;
- else if(!strcmp(outTokens[0], "=thread-created")) //=thread-created,id="1",group-id="7611"
- ;
- else if(!strcmp(outTokens[0], "=library-loaded")) //=library-loaded,id="/lib/ld-linux.so.2",target-name="/lib/ld-linux.so.2",host-name="/lib/ld-linux.so.2",symbols-loaded="0"
- ;
- else
- DebuggerProtocolUnknown("Unknown notify-async-output", outTokens[0]);
+ if(TokenizeList(output, ',', outTokens))
+ {
+ if(!strcmp(outTokens[0], "=library-loaded"))
+ FGODetectLoadedLibraryForAddedProjectIssues(outTokens);
+ else if(!strcmp(outTokens[0], "=thread-group-created") || !strcmp(outTokens[0], "=thread-group-added") ||
+ !strcmp(outTokens[0], "=thread-group-started") || !strcmp(outTokens[0], "=thread-group-exited") ||
+ !strcmp(outTokens[0], "=thread-created") || !strcmp(outTokens[0], "=thread-exited") ||
+ !strcmp(outTokens[0], "=cmd-param-changed") || !strcmp(outTokens[0], "=library-unloaded") ||
+ !strcmp(outTokens[0], "=breakpoint-modified"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, outTokens[0], outTokens.count>1 ? outTokens[1] : "",
+ outTokens.count>2 ? outTokens[2] : "", outTokens.count>3 ? outTokens[3] : "",
+ outTokens.count>4 ? outTokens[4] : "", outTokens.count>5 ? outTokens[5] : "",
+ outTokens.count>6 ? outTokens[6] : "", outTokens.count>7 ? outTokens[7] : "",
+ outTokens.count>8 ? outTokens[8] : "", outTokens.count>9 ? outTokens[9] : "");
+ else
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "notify-async-output: ", outTokens[0]);
+ }
outTokens.RemoveAll();
break;
case '*':
}
else if(!strcmp(outTokens[0], "*stopped"))
{
+ int tk;
ChangeState(stopped);
-
- if(outTokens.count > 1 && TokenizeListItem(outTokens[1], item))
+
+ for(tk = 1; tk < outTokens.count; tk++)
{
- if(!strcmp(item.name, "reason"))
+ if(TokenizeListItem(outTokens[tk], item))
{
- char * reason = item.value;
- StripQuotes(reason, reason);
- if(!strcmp(reason, "exited-normally") || !strcmp(reason, "exited") || !strcmp(reason, "exited-signalled"))
+ if(!strcmp(item.name, "reason"))
{
- char * exitCode;
- if(outTokens.count > 2 && TokenizeListItem(outTokens[2], item2))
+ char * reason = item.value;
+ StripQuotes(reason, reason);
+ if(!strcmp(reason, "exited-normally") || !strcmp(reason, "exited") || !strcmp(reason, "exited-signalled"))
{
- StripQuotes(item2.value, item2.value);
- if(!strcmp(item2.name, "exit-code"))
- exitCode = item2.value;
+ char * exitCode;
+ if(outTokens.count > tk+1 && TokenizeListItem(outTokens[tk+1], item2))
+ {
+ tk++;
+ StripQuotes(item2.value, item2.value);
+ if(!strcmp(item2.name, "exit-code"))
+ exitCode = item2.value;
+ else
+ exitCode = null;
+ }
else
exitCode = null;
+ HandleExit(reason, exitCode);
+ needReset = true;
}
- else
- exitCode = null;
- HandleExit(reason, exitCode);
- }
- else if(!strcmp(reason, "breakpoint-hit"))
- {
- #ifdef _DEBUG
- if(stopItem)
- printf("problem\n");
- #endif
- stopItem = GdbDataStop { };
-
- for(i = 2; i < outTokens.count; i++)
+ else if(!strcmp(reason, "breakpoint-hit"))
{
- TokenizeListItem(outTokens[i], item);
- StripQuotes(item.value, item.value);
- if(!strcmp(item.name, "bkptno"))
- stopItem.bkptno = atoi(item.value);
- else if(!strcmp(item.name, "thread-id"))
- stopItem.threadid = atoi(item.value);
- else if(!strcmp(item.name, "frame"))
+ #ifdef _DEBUG
+ if(stopItem)
+ _dpl(0, "problem");
+ #endif
+ stopItem = GdbDataStop { };
+ stopItem.reason = breakpointHit;
+
+ for(i = tk+1; i < outTokens.count; i++)
{
- item.value = StripCurlies(item.value);
- ParseFrame(stopItem.frame, item.value);
+ TokenizeListItem(outTokens[i], item);
+ StripQuotes(item.value, item.value);
+ if(!strcmp(item.name, "bkptno"))
+ stopItem.bkptno = atoi(item.value);
+ else if(!strcmp(item.name, "thread-id"))
+ stopItem.threadid = atoi(item.value);
+ else if(!strcmp(item.name, "frame"))
+ {
+ item.value = StripCurlies(item.value);
+ ParseFrame(stopItem.frame, item.value);
+ }
+ else if(!strcmp(item.name, "disp") || !strcmp(item.name, "stopped-threads") || !strcmp(item.name, "core"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "(", item.name, "=", item.value, ")");
+ else
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "Unknown breakpoint hit item name (", item.name, "=", item.value, ")");
}
- else
- DebuggerProtocolUnknown("Unknown breakpoint hit item name", item.name);
- }
- event = hit;
- }
- else if(!strcmp(reason, "end-stepping-range"))
- {
- #ifdef _DEBUG
- if(stopItem)
- printf("problem\n");
- #endif
- stopItem = GdbDataStop { };
-
- for(i = 2; i < outTokens.count; i++)
+ event = hit;
+ }
+ else if(!strcmp(reason, "end-stepping-range"))
{
- TokenizeListItem(outTokens[i], item);
- StripQuotes(item.value, item.value);
- if(!strcmp(item.name, "thread-id"))
- stopItem.threadid = atoi(item.value);
- else if(!strcmp(item.name, "frame"))
+ #ifdef _DEBUG
+ if(stopItem)
+ _dpl(0, "problem");
+ #endif
+ stopItem = GdbDataStop { };
+ stopItem.reason = endSteppingRange;
+
+ for(i = tk+1; i < outTokens.count; i++)
{
- item.value = StripCurlies(item.value);
- ParseFrame(stopItem.frame, item.value);
+ TokenizeListItem(outTokens[i], item);
+ StripQuotes(item.value, item.value);
+ if(!strcmp(item.name, "thread-id"))
+ stopItem.threadid = atoi(item.value);
+ else if(!strcmp(item.name, "frame"))
+ {
+ item.value = StripCurlies(item.value);
+ ParseFrame(stopItem.frame, item.value);
+ }
+ else if(!strcmp(item.name, "reason") || !strcmp(item.name, "bkptno"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "(", item.name, "=", item.value, ")");
+ else
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "Unknown end of stepping range item name (", item.name, "=", item.value, ")");
}
- else if(!strcmp(item.name, "reason"))
- ;
- else if(!strcmp(item.name, "bkptno"))
- ;
- else
- DebuggerProtocolUnknown("Unknown end of stepping range item name", item.name);
- }
- event = stepEnd;
- //ide.AdjustDebugMenus();
- ide.Update(null);
- }
- else if(!strcmp(reason, "function-finished"))
- {
- #ifdef _DEBUG
- if(stopItem)
- printf("problem\n");
- #endif
- stopItem = GdbDataStop { };
- stopItem.reason = CopyString(reason);
-
- for(i = 2; i < outTokens.count; i++)
+ event = stepEnd;
+ ide.Update(null);
+ }
+ else if(!strcmp(reason, "function-finished"))
{
- TokenizeListItem(outTokens[i], item);
- StripQuotes(item.value, item.value);
- if(!strcmp(item.name, "thread-id"))
- stopItem.threadid = atoi(item.value);
- else if(!strcmp(item.name, "frame"))
+ #ifdef _DEBUG
+ if(stopItem)
+ _dpl(0, "problem");
+ #endif
+ stopItem = GdbDataStop { };
+ stopItem.reason = functionFinished;
+
+ for(i = tk+1; i < outTokens.count; i++)
{
- item.value = StripCurlies(item.value);
- ParseFrame(stopItem.frame, item.value);
+ TokenizeListItem(outTokens[i], item);
+ StripQuotes(item.value, item.value);
+ if(!strcmp(item.name, "thread-id"))
+ stopItem.threadid = atoi(item.value);
+ else if(!strcmp(item.name, "frame"))
+ {
+ item.value = StripCurlies(item.value);
+ ParseFrame(stopItem.frame, item.value);
+ }
+ else if(!strcmp(item.name, "gdb-result-var"))
+ stopItem.gdbResultVar = CopyString(item.value);
+ else if(!strcmp(item.name, "return-value"))
+ stopItem.returnValue = CopyString(item.value);
+ else
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "Unknown function finished item name (", item.name, "=", item.value, ")");
}
- else if(!strcmp(item.name, "gdb-result-var"))
- stopItem.gdbResultVar = CopyString(item.value);
- else if(!strcmp(item.name, "return-value"))
- stopItem.returnValue = CopyString(item.value);
- else
- DebuggerProtocolUnknown("Unknown function finished item name", item.name);
- }
- event = functionEnd;
- //ide.AdjustDebugMenus();
- ide.Update(null);
- }
- else if(!strcmp(reason, "signal-received"))
- {
- #ifdef _DEBUG
- if(stopItem)
- printf("problem\n");
- #endif
- stopItem = GdbDataStop { };
- stopItem.reason = CopyString(reason);
-
- for(i = 2; i < outTokens.count; i++)
+ event = functionEnd;
+ ide.Update(null);
+ }
+ else if(!strcmp(reason, "signal-received"))
{
- TokenizeListItem(outTokens[i], item);
- StripQuotes(item.value, item.value);
- if(!strcmp(item.name, "signal-name"))
- stopItem.name = CopyString(item.value);
- else if(!strcmp(item.name, "signal-meaning"))
- stopItem.meaning = CopyString(item.value);
- else if(!strcmp(item.name, "thread-id"))
- stopItem.threadid = atoi(item.value);
- else if(!strcmp(item.name, "frame"))
+ #ifdef _DEBUG
+ if(stopItem)
+ _dpl(0, "problem");
+ #endif
+ stopItem = GdbDataStop { };
+ stopItem.reason = signalReceived;
+
+ for(i = tk+1; i < outTokens.count; i++)
{
- item.value = StripCurlies(item.value);
- ParseFrame(stopItem.frame, item.value);
+ TokenizeListItem(outTokens[i], item);
+ StripQuotes(item.value, item.value);
+ if(!strcmp(item.name, "signal-name"))
+ stopItem.name = CopyString(item.value);
+ else if(!strcmp(item.name, "signal-meaning"))
+ stopItem.meaning = CopyString(item.value);
+ else if(!strcmp(item.name, "thread-id"))
+ stopItem.threadid = atoi(item.value);
+ else if(!strcmp(item.name, "frame"))
+ {
+ item.value = StripCurlies(item.value);
+ ParseFrame(stopItem.frame, item.value);
+ }
+ else
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "Unknown signal reveived item name (", item.name, "=", item.value, ")");
+ }
+ if(!strcmp(stopItem.name, "SIGTRAP"))
+ {
+ switch(breakType)
+ {
+ case internal:
+ breakType = none;
+ break;
+ case restart:
+ case stop:
+ break;
+ default:
+ event = breakEvent;
+ }
}
else
- DebuggerProtocolUnknown("Unknown signal reveived item name", item.name);
- }
- if(!strcmp(stopItem.name, "SIGTRAP"))
- {
- switch(breakType)
{
- case internal:
- breakType = none;
- break;
- case restart:
- case stop:
- break;
- default:
- event = breakEvent;
- //ide.AdjustDebugMenus(); ide.Update(null);
+ event = signal;
}
}
+ else if(!strcmp(reason, "watchpoint-trigger"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "Reason watchpoint trigger not handled");
+ else if(!strcmp(reason, "read-watchpoint-trigger"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "Reason read watchpoint trigger not handled");
+ else if(!strcmp(reason, "access-watchpoint-trigger"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "Reason access watchpoint trigger not handled");
+ else if(!strcmp(reason, "watchpoint-scope"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "Reason watchpoint scope not handled");
+ else if(!strcmp(reason, "location-reached"))
+ _dpl2(_dpct, dplchan::gdbProtoIgnored, 0, "Reason location reached not handled");
else
- {
- event = signal;
- //ide.AdjustDebugMenus(); ide.Update(null);
- }
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "Unknown reason: ", reason);
}
- else if(!strcmp(reason, "watchpoint-trigger"))
- DebuggerProtocolUnknown("Reason watchpoint trigger not handled", "");
- else if(!strcmp(reason, "read-watchpoint-trigger"))
- DebuggerProtocolUnknown("Reason read watchpoint trigger not handled", "");
- else if(!strcmp(reason, "access-watchpoint-trigger"))
- DebuggerProtocolUnknown("Reason access watchpoint trigger not handled", "");
- else if(!strcmp(reason, "watchpoint-scope"))
- DebuggerProtocolUnknown("Reason watchpoint scope not handled", "");
- else if(!strcmp(reason, "location-reached"))
- DebuggerProtocolUnknown("Reason location reached not handled", "");
else
- DebuggerProtocolUnknown("Unknown reason", reason);
+ {
+ PrintLn(output);
+ }
}
}
+ if(usingValgrind && event == none && !stopItem)
+ event = valgrindStartPause;
app.SignalEvent();
}
}
else
- DebuggerProtocolUnknown("Unknown exec-async-output", outTokens[0]);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, "Unknown exec-async-output: ", outTokens[0]);
outTokens.RemoveAll();
break;
case '(':
int oldProcessID = targetProcessId;
GetLastDirectory(targetFile, exeFile);
- while(true)
+ while(!targetProcessId/*true*/)
{
targetProcessId = Process_GetChildExeProcessId(gdbProcessId, exeFile);
if(targetProcessId || gdbHandle.Peek()) break;
}
if(targetProcessId)
- {
ChangeState(running);
- //ide.AdjustDebugMenus(); ide.Update(null);
- }
else if(!oldProcessID)
{
- ide.outputView.debugBox.Logf("Debugger Error: No target process ID\n");
+ ide.outputView.debugBox.Logf($"Debugger Error: No target process ID\n");
// TO VERIFY: The rest of this block has not been thoroughly tested in this particular location
gdbHandle.Printf("-gdb-exit\n");
gdbTimer.Stop();
bp.inserted = false;
if(bpRunToCursor)
bpRunToCursor.inserted = false;
-
- ide.outputView.debugBox.Logf("Debugging stopped\n");
+
+ ide.outputView.debugBox.Logf($"Debugging stopped\n");
ClearBreakDisplay();
- //ide.AdjustDebugMenus(); ide.Update(null);
#if defined(__unix__)
- if(FileExists(progFifoPath)) //fileCreated)
+ if(!usingValgrind && FileExists(progFifoPath)) //fileCreated)
{
progThread.terminate = true;
if(fifoFile)
serialSemaphore.Release();
}
else
- DebuggerProtocolUnknown("Unknown prompt", output);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, $"Unknown prompt", output);
break;
case '&':
}
break;
default:
- DebuggerProtocolUnknown("Unknown output", output);
+ _dpl2(_dpct, dplchan::gdbProtoUnknown, 0, $"Unknown output: ", output);
}
if(!setWaitingForPID)
waitingForPID = false;
delete item2;
}
- void RunToCursorPrepare(char * absoluteFilePath, char * relativeFilePath, int lineNumber)
+ // From GDB Output functions
+ void FGODetectLoadedLibraryForAddedProjectIssues(Array<char *> outTokens)
{
- if(bpRunToCursor)
+ char path[MAX_LOCATION] = "";
+ char file[MAX_FILENAME] = "";
+ bool symbolsLoaded;
+ DebugListItem item { };
+ //_dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::FGODetectLoadedLibraryForAddedProjectIssues()");
+ for(token : outTokens)
{
- //bpRunToCursor.Free();
- bpRunToCursor = Breakpoint { };
+ if(TokenizeListItem(token, item))
+ {
+ if(!strcmp(item.name, "target-name"))
+ {
+ StripQuotes(item.value, path);
+ MakeSystemPath(path);
+ GetLastDirectory(path, file);
+ }
+ else if(!strcmp(item.name, "symbols-loaded"))
+ {
+ symbolsLoaded = (atoi(item.value) == 1);
+ }
+ }
}
- else
- bpRunToCursor = Breakpoint { };
+ delete item;
+ if(path[0] && file[0])
+ {
+ for(prj : ide.workspace.projects; prj != ide.workspace.projects.firstIterator.data)
+ {
+ bool match;
+ char * dot;
+ char prjTargetPath[MAX_LOCATION];
+ char prjTargetFile[MAX_FILENAME];
+ DirExpression targetDirExp = prj.GetTargetDir(currentCompiler, prj.config, bitDepth);
+ strcpy(prjTargetPath, prj.topNode.path);
+ PathCat(prjTargetPath, targetDirExp.dir);
+ prjTargetFile[0] = '\0';
+ prj.CatTargetFileName(prjTargetFile, currentCompiler, prj.config);
+ PathCat(prjTargetPath, prjTargetFile);
+ MakeSystemPath(prjTargetPath);
+
+ match = !fstrcmp(prjTargetFile, file);
+ if(!match && (dot = strstr(prjTargetFile, ".so.")))
+ {
+ char * dot3 = strstr(dot+4, ".");
+ if(dot3)
+ {
+ dot3[0] = '\0';
+ match = !fstrcmp(prjTargetFile, file);
+ }
+ if(!match)
+ {
+ dot[3] = '\0';
+ match = !fstrcmp(prjTargetFile, file);
+ }
+ }
+ if(match)
+ {
+ // TODO: nice visual feedback to better warn user. use some ide notification system or other means.
+ /* -- this is disabled because we can't trust gdb's symbols-loaded="0" field for =library-loaded (http://sourceware.org/bugzilla/show_bug.cgi?id=10693)
+ if(!symbolsLoaded)
+ ide.outputView.debugBox.Logf($"Attention! No symbols for loaded library %s matched to the %s added project.\n", path, prj.topNode.name);
+ */
+ match = !fstrcmp(prjTargetPath, path);
+ if(!match && (dot = strstr(prjTargetPath, ".so.")))
+ {
+ char * dot3 = strstr(dot+4, ".");
+ if(dot3)
+ {
+ dot3[0] = '\0';
+ match = !fstrcmp(prjTargetPath, path);
+ }
+ if(!match)
+ {
+ dot[3] = '\0';
+ match = !fstrcmp(prjTargetPath, path);
+ }
+ }
+ if(!match)
+ ide.outputView.debugBox.Logf($"Loaded library %s doesn't match the %s target of the %s added project.\n", path, prjTargetPath, prj.topNode.name);
+ break;
+ }
+ }
+ }
+ }
- if(absoluteFilePath)
- bpRunToCursor.absoluteFilePath = CopyString(absoluteFilePath);
- if(relativeFilePath)
- bpRunToCursor.relativeFilePath = CopyString(relativeFilePath);
- bpRunToCursor.line = lineNumber;
- bpRunToCursor.type = runToCursor;
- bpRunToCursor.enabled = true;
- bpRunToCursor.condition = null;
- bpRunToCursor.ignore = 0;
- bpRunToCursor.level = -1;
+ void FGOBreakpointModified(Array<char *> outTokens)
+ {
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::FGOBreakpointModified() -- TODO only if needed: support breakpoint modified");
+#if 0
+ DebugListItem item { };
+ if(outTokens.count > 1 && TokenizeListItem(outTokens[1], item))
+ {
+ if(!strcmp(item.name, "bkpt"))
+ {
+ GdbDataBreakpoint modBp = ParseBreakpoint(item.value, outTokens);
+ delete modBp;
+ }
+ }
+#endif
}
+
ExpressionType ::DebugEvalExpTypeError(char * result)
{
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::DebugEvalExpTypeError()");
if(result)
return dummyExp;
switch(eval.error)
char * ::EvaluateExpression(char * expression, ExpressionType * error)
{
char * result;
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::EvaluateExpression(", expression, ")");
if(ide.projectView && ide.debugger.state == stopped)
{
result = GdbEvaluateExpression(expression);
return result;
}
- char * ::ReadMemory(uint address, int size, char format, ExpressionType * error)
+ char * ::ReadMemory(uint64 address, int size, char format, ExpressionType * error)
{
// check for state
char * result = GdbReadMemoryString(address, size, format, 1, 1);
+ _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::ReadMemory(", address, ")");
if(!result || !strcmp(result, "N/A"))
*error = memoryErrorExp;
else
}
}
+class ValgrindLogThread : Thread
+{
+ Debugger debugger;
+
+ unsigned int Main()
+ {
+ static char output[4096];
+ Array<char> dynamicBuffer { minAllocSize = 4096 };
+ File oldValgrindHandle = vgLogFile;
+ incref oldValgrindHandle;
+
+ app.Lock();
+ while(debugger.state != terminated && vgLogFile)
+ {
+ int result;
+ app.Unlock();
+ result = vgLogFile.Read(output, 1, sizeof(output));
+ app.Lock();
+ if(debugger.state == terminated || !vgLogFile/* || vgLogFile.Eof()*/)
+ break;
+ if(result)
+ {
+ int c;
+ int start = 0;
+
+ for(c = 0; c<result; c++)
+ {
+ if(output[c] == '\n')
+ {
+ int pos = dynamicBuffer.size;
+ dynamicBuffer.size += c - start;
+ memcpy(&dynamicBuffer[pos], output + start, c - start);
+ if(dynamicBuffer.count && dynamicBuffer[dynamicBuffer.count - 1] != '\r')
+ // COMMENTED OUT DUE TO ISSUE #135, FIXED
+ //if(dynamicBuffer.array[dynamicBuffer.count - 1] != '\r')
+ dynamicBuffer.size++;
+ dynamicBuffer[dynamicBuffer.count - 1] = '\0';
+#ifdef _DEBUG
+ // printf("%s\n", dynamicBuffer.array);
+#endif
+ if(strstr(&dynamicBuffer[0], "vgdb me"))
+ debugger.serialSemaphore.Release();
+ ide.outputView.debugBox.Logf("%s\n", &dynamicBuffer[0]);
+ dynamicBuffer.size = 0;
+ start = c + 1;
+ }
+ }
+ if(c == result)
+ {
+ int pos = dynamicBuffer.size;
+ dynamicBuffer.size += c - start;
+ memcpy(&dynamicBuffer[pos], output + start, c - start);
+ }
+ }
+ else if(debugger.state == stopped)
+ {
+/*#ifdef _DEBUG
+ printf("Got end of file from GDB!\n");
+#endif*/
+ app.Unlock();
+ Sleep(0.2);
+ app.Lock();
+ }
+ }
+ delete dynamicBuffer;
+ ide.outputView.debugBox.Logf($"ValgrindLogThreadExit\n");
+ //if(oldValgrindHandle == vgLogFile)
+ debugger.GdbThreadExit/*ValgrindLogThreadExit*/();
+ delete oldValgrindHandle;
+ app.Unlock();
+ return 0;
+ }
+}
+
+class ValgrindTargetThread : Thread
+{
+ Debugger debugger;
+
+ unsigned int Main()
+ {
+ static char output[4096];
+ Array<char> dynamicBuffer { minAllocSize = 4096 };
+ DualPipe oldValgrindHandle = vgTargetHandle;
+ incref oldValgrindHandle;
+
+ app.Lock();
+ while(debugger.state != terminated && vgTargetHandle && !vgTargetHandle.Eof())
+ {
+ int result;
+ app.Unlock();
+ result = vgTargetHandle.Read(output, 1, sizeof(output));
+ app.Lock();
+ if(debugger.state == terminated || !vgTargetHandle || vgTargetHandle.Eof())
+ break;
+ if(result)
+ {
+ int c;
+ int start = 0;
+
+ for(c = 0; c<result; c++)
+ {
+ if(output[c] == '\n')
+ {
+ int pos = dynamicBuffer.size;
+ dynamicBuffer.size += c - start;
+ memcpy(&dynamicBuffer[pos], output + start, c - start);
+ if(dynamicBuffer.count && dynamicBuffer[dynamicBuffer.count - 1] != '\r')
+ // COMMENTED OUT DUE TO ISSUE #135, FIXED
+ //if(dynamicBuffer.array[dynamicBuffer.count - 1] != '\r')
+ dynamicBuffer.size++;
+ dynamicBuffer[dynamicBuffer.count - 1] = '\0';
+#ifdef _DEBUG
+ // printf("%s\n", dynamicBuffer.array);
+#endif
+ ide.outputView.debugBox.Logf("%s\n", &dynamicBuffer[0]);
+
+ dynamicBuffer.size = 0;
+ start = c + 1;
+ }
+ }
+ if(c == result)
+ {
+ int pos = dynamicBuffer.size;
+ dynamicBuffer.size += c - start;
+ memcpy(&dynamicBuffer[pos], output + start, c - start);
+ }
+ }
+ else
+ {
+#ifdef _DEBUG
+ printf("Got end of file from GDB!\n");
+#endif
+ }
+ }
+ delete dynamicBuffer;
+ //if(oldValgrindHandle == vgTargetHandle)
+ debugger.ValgrindTargetThreadExit();
+ delete oldValgrindHandle;
+ app.Unlock();
+ return 0;
+ }
+}
+
class GdbThread : Thread
{
Debugger debugger;
int result;
app.Unlock();
result = gdbHandle.Read(output, 1, sizeof(output));
+ app.Lock();
if(debugger.state == terminated || !gdbHandle || gdbHandle.Eof())
break;
- app.Lock();
if(result)
{
int c;
dynamicBuffer.size++;
dynamicBuffer[dynamicBuffer.count - 1] = '\0';
#ifdef _DEBUG
- // printf("%s\n", dynamicBuffer.array);
+ // _dpl(0, dynamicBuffer.array);
#endif
debugger.GdbThreadMain(&dynamicBuffer[0]);
dynamicBuffer.size = 0;
else
{
#ifdef _DEBUG
- printf("Got end of file from GDB!\n");
+ _dpl(0, "Got end of file from GDB!");
#endif
}
}
}
}
+static define createFIFOMsg = $"err: Unable to create FIFO %s\n";
+static define openFIFOMsg = $"err: Unable to open FIFO %s for read\n";
+
#if defined(__unix__)
#define uint _uint
#include <errno.h>
else
{
app.Lock();
- ide.outputView.debugBox.Logf("err: Unable to create FIFO %s\n", progFifoPath);
+ ide.outputView.debugBox.Logf($"err: Unable to create FIFO %s\n", progFifoPath);
app.Unlock();
}*/
if(!fifoFile)
{
app.Lock();
- ide.outputView.debugBox.Logf("err: Unable to open FIFO %s for read\n", progFifoPath);
+ ide.outputView.debugBox.Logf(openFIFOMsg, progFifoPath);
app.Unlock();
}
else
{
-#ifdef BSD
- // TODO: Fix on BSD
- fd = 0;
-#else
- fd = fileno(fifoFile.input);
-#endif
+ fd = fileno((FILE *)fifoFile.input);
//fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
}
}
selectResult = select(fd + 1, &rs, null, null, &time);
if(FD_ISSET(fd, &rs))
{
- int result = read(fd, output, sizeof(output)-1);
+ int result = (int)read(fd, output, sizeof(output)-1);
if(!result || (result < 0 && errno != EAGAIN))
break;
if(result > 0)
{
Argument prev, next;
char * name;
- char * value;
+ property char * name { set { delete name; if(value) name = CopyString(value); } }
+ char * val;
+ property char * val { set { delete val; if(value) val = CopyString(value); } }
void Free()
{
delete name;
- delete value;
+ delete val;
}
~Argument()
Frame prev, next;
int level;
char * addr;
+ property char * addr { set { delete addr; if(value) addr = CopyString(value); } }
char * func;
+ property char * func { set { delete func; if(value) func = CopyString(value); } }
int argsCount;
OldList args;
char * from;
char * file;
property char * file { set { delete file; if(value) file = CopyUnescapedUnixPath(value); } }
char * absoluteFile;
+ property char * absoluteFile { set { delete absoluteFile; if(value) absoluteFile = CopyUnescapedUnixPath(value); } }
int line;
void Free()
class GdbDataStop : struct
{
- char * reason;
+ DebuggerReason reason;
int threadid;
union
{
{
if(reason)
{
- if(!strcmp(reason, "signal-received"))
+ if(reason == signalReceived)
{
delete name;
delete meaning;
}
- else if(!strcmp(reason, "function-finished"))
+ else if(reason == functionFinished)
{
delete gdbResultVar;
delete returnValue;
}
- delete reason;
}
if(frame) frame.Free();
}
class GdbDataBreakpoint : struct
{
- int number;
+ int id;
+ char * number;
+ property char * number { set { delete number; if(value) number = CopyString(value); } }
char * type;
+ property char * type { set { delete type; if(value) type = CopyString(value); } }
char * disp;
+ property char * disp { set { delete disp; if(value) disp = CopyString(value); } }
bool enabled;
char * addr;
+ property char * addr { set { delete addr; if(value) addr = CopyString(value); } }
char * func;
+ property char * func { set { delete func; if(value) func = CopyString(value); } }
char * file;
property char * file { set { delete file; if(value) file = CopyUnescapedUnixPath(value); } }
+ char * fullname;
+ property char * fullname { set { delete fullname; if(value) fullname = CopyUnescapedUnixPath(value); } }
int line;
char * at;
+ property char * at { set { delete at; if(value) at = CopyString(value); } }
int times;
+ Array<GdbDataBreakpoint> multipleBPs;
+
+ void Print()
+ {
+ _dpl(0, "");
+ PrintLn("{", "#", number, " T", type, " D", disp, " E", enabled, " H", times, " (", func, ") (", file, ":", line, ") (", fullname, ") (", addr, ") (", at, ")", "}");
+ }
+
void Free()
{
delete type;
delete func;
delete file;
delete at;
+ if(multipleBPs) multipleBPs.Free();
+ delete multipleBPs;
}
~GdbDataBreakpoint()
{
class_no_expansion;
+ char * function;
+ property char * function { set { delete function; if(value) function = CopyString(value); } }
char * relativeFilePath;
+ property char * relativeFilePath { set { delete relativeFilePath; if(value) relativeFilePath = CopyString(value); } }
char * absoluteFilePath;
+ property char * absoluteFilePath { set { delete absoluteFilePath; if(value) absoluteFilePath = CopyString(value); } }
int line;
bool enabled;
int hits;
+ int breaks;
int ignore;
int level;
Watch condition;
bool inserted;
BreakpointType type;
DataRow row;
-
GdbDataBreakpoint bp;
- char * LocationToString()
+ char * CopyLocationString(bool removePath)
{
- char location[MAX_LOCATION+20];
- sprintf(location, "%s:%d", relativeFilePath, line);
-#if defined(__WIN32__)
- ChangeCh(location, '/', '\\');
-#endif
- return CopyString(location);
+ char * location;
+ char * file = relativeFilePath ? relativeFilePath : absoluteFilePath;
+ bool removingPath = removePath && file;
+ if(removingPath)
+ {
+ char * fileName = new char[MAX_FILENAME];
+ GetLastDirectory(file, fileName);
+ file = fileName;
+ }
+ if(function)
+ {
+ if(file)
+ location = PrintString(file, ":", function);
+ else
+ location = CopyString(function);
+ }
+ else
+ location = PrintString(file, ":", line);
+ if(removingPath)
+ delete file;
+ return location;
+ }
+
+ char * CopyUserLocationString()
+ {
+ char * location;
+ char * loc = CopyLocationString(false);
+ Project prj = null;
+ for(p : ide.workspace.projects)
+ {
+ if(p.topNode.FindByFullPath(absoluteFilePath, false))
+ {
+ prj = p;
+ break;
+ }
+ }
+ if(prj)
+ {
+ location = PrintString("(", prj.name, ")", loc);
+ delete loc;
+ }
+ else
+ location = loc;
+ return location;
}
void Save(File f)
if(bp)
bp.Free();
delete bp;
+ delete function;
delete relativeFilePath;
delete absoluteFilePath;
}
bool active;
char * result;
int bytes;
- uint nextBlockAddress;
+ uint64 nextBlockAddress;
DebuggerEvaluationError error;
};
Free();
}
}
+
+void GDBFallBack(Expression exp, String expString)
+{
+ char * result;
+ ExpressionType evalError = dummyExp;
+ result = Debugger::EvaluateExpression(expString, &evalError);
+ if(result)
+ {
+ exp.constant = result;
+ exp.type = constantExp;
+ }
+}
Ecere Software / sdk / blobdiff