forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MacOSX - lldbmi2 debugger support

This commit is contained in:
Vadim Lopatin 2016-06-07 19:23:15 +03:00
parent db9b49f2c3
commit cc878579e0
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ddebug/gdb/gdbinterface.d
View File

@ -227,7 +227,8 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
debuggerArgs ~= externalTerminalTty; debuggerArgs ~= externalTerminalTty;
} }
} }
debuggerArgs ~= "--interpreter=mi"; debuggerArgs ~= "--interpreter";
debuggerArgs ~= "mi2";
debuggerArgs ~= "--silent"; debuggerArgs ~= "--silent";
if (!USE_INIT_SEQUENCE) { if (!USE_INIT_SEQUENCE) {
debuggerArgs ~= "--args"; debuggerArgs ~= "--args";
@ -503,6 +504,8 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
Log.d("GDB internal debug message: ", s); Log.d("GDB internal debug message: ", s);
} }
long _stoppedThreadId = 0;
// *stopped,reason="exited-normally" // *stopped,reason="exited-normally"
// *running,thread-id="all" // *running,thread-id="all"
// *asyncclass,result // *asyncclass,result
@ -524,12 +527,14 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
StateChangeReason reasonId = StateChangeReason.unknown; StateChangeReason reasonId = StateChangeReason.unknown;
DebugFrame location = parseFrame(params["frame"]); DebugFrame location = parseFrame(params["frame"]);
string threadId = params.getString("thread-id"); string threadId = params.getString("thread-id");
_stoppedThreadId = params.getUlong("thread-id", 0);
string stoppedThreads = params.getString("all"); string stoppedThreads = params.getString("all");
Breakpoint bp = null; Breakpoint bp = null;
if (reason.equal("end-stepping-range")) { if (reason.equal("end-stepping-range")) {
updateState(); updateState();
_callback.onDebugState(DebuggingState.paused, StateChangeReason.endSteppingRange, location, bp); _callback.onDebugState(DebuggingState.paused, StateChangeReason.endSteppingRange, location, bp);
} else if (reason.equal("breakpoint-hit")) { } else if (reason.equal("breakpoint-hit")) {
Log.v("handling breakpoint-hit");
if (GDBBreakpoint gdbbp = findBreakpointByNumber(params.getString("bkptno"))) { if (GDBBreakpoint gdbbp = findBreakpointByNumber(params.getString("bkptno"))) {
bp = gdbbp.bp; bp = gdbbp.bp;
if (!location && bp) { if (!location && bp) {
@ -537,9 +542,11 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
location.fillMissingFields(bp); location.fillMissingFields(bp);
} }
} }
//_requests.targetIsReady();
updateState(); updateState();
_callback.onDebugState(DebuggingState.paused, StateChangeReason.breakpointHit, location, bp); _callback.onDebugState(DebuggingState.paused, StateChangeReason.breakpointHit, location, bp);
} else if (reason.equal("signal-received")) { } else if (reason.equal("signal-received")) {
//_requests.targetIsReady();
updateState(); updateState();
_callback.onDebugState(DebuggingState.paused, StateChangeReason.exception, location, bp); _callback.onDebugState(DebuggingState.paused, StateChangeReason.exception, location, bp);
} else if (reason.equal("exited-normally")) { } else if (reason.equal("exited-normally")) {
@ -560,6 +567,8 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
_exitCode = -1; _exitCode = -1;
_callback.onDebugState(DebuggingState.stopped, StateChangeReason.exited, null, null); _callback.onDebugState(DebuggingState.stopped, StateChangeReason.exited, null, null);
} }
} else {
Log.e("unknown async type `", msgType, "`");
} }
} }
@ -692,7 +701,7 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
submitRequest(new GDBInitRequest("-inferior-tty-set " ~ quotePathIfNeeded(externalTerminalTty), true)); submitRequest(new GDBInitRequest("-inferior-tty-set " ~ quotePathIfNeeded(externalTerminalTty), true));
submitRequest(new GDBInitRequest("-gdb-set breakpoint pending on", false)); submitRequest(new GDBInitRequest("-gdb-set breakpoint pending on", false));
submitRequest(new GDBInitRequest("-enable-pretty-printing", false)); //submitRequest(new GDBInitRequest("-enable-pretty-printing", false));
submitRequest(new GDBInitRequest("-gdb-set print object on", false)); submitRequest(new GDBInitRequest("-gdb-set print object on", false));
submitRequest(new GDBInitRequest("-gdb-set print sevenbit-strings on", false)); submitRequest(new GDBInitRequest("-gdb-set print sevenbit-strings on", false));
submitRequest(new GDBInitRequest("-gdb-set host-charset UTF-8", false)); submitRequest(new GDBInitRequest("-gdb-set host-charset UTF-8", false));
@ -728,9 +737,11 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
this() { command = "-thread-info"; } this() { command = "-thread-info"; }
override void onResult() { override void onResult() {
_currentState = parseThreadList(params); _currentState = parseThreadList(params);
if (_currentState) { if (_currentState) {
// TODO // TODO
Log.d("Thread list is parsed"); Log.d("Thread list is parsed");
if (!_currentState.currentThreadId)
_currentState.currentThreadId = _stoppedThreadId;
submitRequest(new StackListFramesRequest(_currentState.currentThreadId, 0)); submitRequest(new StackListFramesRequest(_currentState.currentThreadId, 0));
} }
} }
@ -768,7 +779,8 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
this(ulong threadId, int frameId) { this(ulong threadId, int frameId) {
_threadId = threadId; _threadId = threadId;
_frameId = frameId; _frameId = frameId;
command = "-stack-list-variables --thread " ~ to!string(_threadId) ~ " --frame " ~ to!string(_frameId) ~ " --simple-values"; //command = "-stack-list-variables --thread " ~ to!string(_threadId) ~ " --frame " ~ to!string(_frameId) ~ " --simple-values";
command = "-stack-list-locals --thread " ~ to!string(_threadId) ~ " --frame " ~ to!string(_frameId) ~ " 2";
} }
override void onResult() { override void onResult() {
DebugVariableList variables = parseVariableList(params); DebugVariableList variables = parseVariableList(params);

2
src/ddebug/gdb/gdbmiparser.d
View File

@ -63,7 +63,7 @@ string demangleFunctionName(string fn) {
import std.ascii; import std.ascii;
//import core.demangle : Demangle; //import core.demangle : Demangle;
uint i = 0; uint i = 0;
for(; fn[i] == '_' || isAlphaNum(fn[i]); i++) { for(; i < fn.length && (fn[i] == '_' || isAlphaNum(fn[i])); i++) {
// next // next
} }
string rest = i < fn.length ? fn[i .. $] : null; string rest = i < fn.length ? fn[i .. $] : null;