mirror of https://gitlab.com/basile.b/dexed.git
#97, add thread list
This commit is contained in:
Basile Burg
parent
609303c983
commit
691b54e672
|
|
@ -1,7 +1,7 @@
|
|||
inherited CEGdbWidget: TCEGdbWidget
|
||||
Left = 635
|
||||
Left = 1383
|
||||
Height = 668
|
||||
Top = 212
|
||||
Top = 333
|
||||
Width = 517
|
||||
Caption = 'GDB commander'
|
||||
ClientHeight = 668
|
||||
|
|
@ -68,9 +68,9 @@ inherited CEGdbWidget: TCEGdbWidget
|
|||
Height = 200
|
||||
Top = 6
|
||||
Width = 517
|
||||
ActivePage = TabSheet4
|
||||
ActivePage = TabSheet3
|
||||
Align = alTop
|
||||
TabIndex = 1
|
||||
TabIndex = 0
|
||||
TabOrder = 2
|
||||
object TabSheet3: TTabSheet
|
||||
Caption = 'Variables'
|
||||
|
|
@ -86,13 +86,13 @@ inherited CEGdbWidget: TCEGdbWidget
|
|||
Columns = <
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'Name'
|
||||
Width = 47
|
||||
Caption = 'name'
|
||||
Width = 46
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'Value'
|
||||
Width = 454
|
||||
Caption = 'value'
|
||||
Width = 455
|
||||
end>
|
||||
GridLines = True
|
||||
HideSelection = False
|
||||
|
|
@ -109,10 +109,12 @@ inherited CEGdbWidget: TCEGdbWidget
|
|||
Hint = 'locate variables'
|
||||
Top = 2
|
||||
Width = 505
|
||||
UseFormActivate = True
|
||||
ButtonWidth = 24
|
||||
NumGlyphs = 1
|
||||
Align = alTop
|
||||
BorderSpacing.Around = 2
|
||||
AutoSelect = False
|
||||
MaxLength = 0
|
||||
TabOrder = 1
|
||||
OnChange = varListFltChange
|
||||
|
|
@ -133,13 +135,13 @@ inherited CEGdbWidget: TCEGdbWidget
|
|||
Columns = <
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'Address'
|
||||
Width = 60
|
||||
Caption = 'address'
|
||||
Width = 59
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'Instruction'
|
||||
Width = 441
|
||||
Caption = 'instruction'
|
||||
Width = 442
|
||||
end>
|
||||
GridLines = True
|
||||
HideSelection = False
|
||||
|
|
@ -241,6 +243,57 @@ inherited CEGdbWidget: TCEGdbWidget
|
|||
end
|
||||
object TabSheet2: TTabSheet
|
||||
Caption = 'Thread list'
|
||||
ClientHeight = 164
|
||||
ClientWidth = 509
|
||||
object lstThreads: TListView
|
||||
Left = 0
|
||||
Height = 164
|
||||
Hint = 'call stack'
|
||||
Top = 0
|
||||
Width = 509
|
||||
Align = alClient
|
||||
Columns = <
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'id'
|
||||
Width = 23
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'state'
|
||||
Width = 42
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'core'
|
||||
Width = 38
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'function'
|
||||
Width = 62
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'address'
|
||||
Width = 59
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'filename'
|
||||
Width = 64
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Caption = 'line'
|
||||
Width = 200
|
||||
end>
|
||||
GridLines = True
|
||||
ReadOnly = True
|
||||
TabOrder = 0
|
||||
ViewStyle = vsReport
|
||||
OnDblClick = lstThreadsDblClick
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
102
src/ce_gdb.pas
102
src/ce_gdb.pas
|
|
@ -213,8 +213,6 @@ type
|
|||
procedure clear;
|
||||
end;
|
||||
|
||||
// TODO-cGDB: assembly view
|
||||
|
||||
// serializable breakpoint
|
||||
TPersistentBreakPoint = class(TCollectionItem)
|
||||
strict private
|
||||
|
|
@ -267,6 +265,8 @@ type
|
|||
|
||||
TCEDebugOptionsBase = class(TWritableLfmTextComponent)
|
||||
private
|
||||
fAutoDisassemble: boolean;
|
||||
fAutoGetThreads: boolean;
|
||||
fAutoDemangle: boolean;
|
||||
fAutoGetCallStack: boolean;
|
||||
fAutoGetRegisters: boolean;
|
||||
|
|
@ -281,10 +281,12 @@ type
|
|||
procedure setCommandsHistory(value: TStringList);
|
||||
procedure setShortcuts(value: TCEDebugShortcuts);
|
||||
published
|
||||
property autoDisassemble: boolean read fAutoDisassemble write fAutoDisassemble;
|
||||
property autoDemangle: boolean read fAutoDemangle write fAutoDemangle;
|
||||
property autoGetCallStack: boolean read fAutoGetCallStack write fAutoGetCallStack;
|
||||
property autoGetRegisters: boolean read fAutoGetRegisters write fAutoGetRegisters;
|
||||
property autoGetVariables: boolean read fAutoGetVariables write fAutoGetVariables;
|
||||
property autoGetThreads: boolean read fAutoGetThreads write fAutoGetThreads;
|
||||
property commandsHistory: TStringList read fCommandsHistory write setCommandsHistory;
|
||||
property ignoredSignals: TStringList read fIgnoredSignals write setIgnoredSignals;
|
||||
property shortcuts: TCEDebugShortcuts read fShortcuts write setShortcuts;
|
||||
|
|
@ -331,6 +333,7 @@ type
|
|||
button4: TCEToolButton;
|
||||
Edit1: TComboBox;
|
||||
GroupBox3: TGroupBox;
|
||||
lstThreads: TListView;
|
||||
PageControl1: TPageControl;
|
||||
PageControl2: TPageControl;
|
||||
TabSheet1: TTabSheet;
|
||||
|
|
@ -368,6 +371,7 @@ type
|
|||
procedure btnWatchClick(Sender: TObject);
|
||||
procedure Edit1KeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
|
||||
procedure lstCallStackDblClick(Sender: TObject);
|
||||
procedure lstThreadsDblClick(Sender: TObject);
|
||||
procedure mnuReadWClick(Sender: TObject);
|
||||
procedure mnuReadWriteWClick(Sender: TObject);
|
||||
procedure mnuSelProjClick(Sender: TObject);
|
||||
|
|
@ -422,6 +426,7 @@ type
|
|||
procedure infoRegs;
|
||||
procedure infoStack;
|
||||
procedure infoVariables;
|
||||
procedure infoThreads;
|
||||
procedure infoAsm(const fname: string);
|
||||
procedure sendCustomCommand;
|
||||
procedure setGpr(reg: TCpuRegister; val: TCpuGprValue);
|
||||
|
|
@ -528,6 +533,8 @@ begin
|
|||
fAutoGetCallStack:= true;
|
||||
fAutoGetRegisters:= true;
|
||||
fAutoGetVariables:= true;
|
||||
fAutoDisassemble:= true;
|
||||
fAutoGetThreads:=true;
|
||||
fShowGdbOutput:=true;
|
||||
fIgnoredSignals := TStringList.Create;
|
||||
fIgnoredSignals.Duplicates:= dupIgnore;
|
||||
|
|
@ -569,6 +576,8 @@ begin
|
|||
begin
|
||||
src := TCEDebugOptionsBase(source);
|
||||
fAutoDemangle:=src.fAutoDemangle;
|
||||
fAutoDisassemble:=src.fAutoDisassemble;
|
||||
fAutoGetThreads:=src.fAutoGetThreads;
|
||||
fAutoGetCallStack:=src.fAutoGetCallStack;
|
||||
fAutoGetRegisters:=src.fAutoGetRegisters;
|
||||
fAutoGetVariables:=src.autoGetVariables;
|
||||
|
|
@ -1690,12 +1699,14 @@ procedure TCEGdbWidget.interpretJson;
|
|||
infoRegs;
|
||||
if fOptions.autoGetVariables then
|
||||
infoVariables;
|
||||
if fOptions.autoGetThreads then
|
||||
infoThreads;
|
||||
selectAsmInstr;
|
||||
end;
|
||||
|
||||
var
|
||||
r: PString;
|
||||
i: integer;
|
||||
i,j: integer;
|
||||
val: TJSONData;
|
||||
obj: TJSONObject;
|
||||
arr: TJSONArray;
|
||||
|
|
@ -1741,7 +1752,10 @@ begin
|
|||
begin
|
||||
k := varList.FindCaption(0, val.AsString, false, true, false);
|
||||
if k.isNotNil then
|
||||
begin
|
||||
varList.ItemIndex:=k.index;
|
||||
k.MakeVisible(false);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
|
@ -1763,7 +1777,7 @@ begin
|
|||
val := obj.Find('func');
|
||||
if val.isNotNil then
|
||||
begin
|
||||
if val.AsString <> fLastFunction then
|
||||
if fOptions.autoDisassemble and (val.AsString <> fLastFunction) then
|
||||
infoAsm(fLastFilename);
|
||||
fLastFunction := val.AsString;
|
||||
end;
|
||||
|
|
@ -1809,7 +1823,7 @@ begin
|
|||
val := obj.Find('func');
|
||||
if val.isNotNil then
|
||||
begin
|
||||
if val.AsString <> fLastFunction then
|
||||
if fOptions.autoDisassemble and (val.AsString <> fLastFunction) then
|
||||
infoAsm(fLastFilename);
|
||||
fLastFunction := val.AsString;
|
||||
end;
|
||||
|
|
@ -1883,7 +1897,7 @@ begin
|
|||
0..integer(high(TCpuRegister)):
|
||||
begin
|
||||
fInspState.CPU.setInspectableRegister
|
||||
(TCpuRegister(number), {$IFDEF CPU64}val.AsInt64{$ELSE}val.AsInteger{$ENDIF});
|
||||
(TCpuRegister(number), {$IFDEF CPU64}val.AsQWord{$ELSE}val.AsInteger{$ENDIF});
|
||||
end;
|
||||
flagOffset:
|
||||
begin
|
||||
|
|
@ -1954,7 +1968,7 @@ begin
|
|||
val := fJson.Find('locals');
|
||||
if val.isNotNil and (val.JSONType = jtArray) then
|
||||
begin
|
||||
i := varList.ItemIndex;
|
||||
j := varList.ItemIndex;
|
||||
varList.BeginUpdate;
|
||||
varList.Clear;
|
||||
arr := TJSONArray(val);
|
||||
|
|
@ -1975,16 +1989,16 @@ begin
|
|||
with varList.Items[varList.Items.Count-1] do
|
||||
SubItems.Add(val.AsString);
|
||||
end;
|
||||
if (i <> -1) and (i <= varList.Items.Count) then
|
||||
varList.ItemIndex:=i;
|
||||
if (j <> -1) and (j <= varList.Items.Count) then
|
||||
varList.ItemIndex := j;
|
||||
varList.EndUpdate;
|
||||
end;
|
||||
|
||||
val := fJson.Find('asm_insns');
|
||||
if val.isNotNil and (val.JSONType = jtArray) then
|
||||
begin
|
||||
asmList.Clear;
|
||||
asmList.BeginUpdate;
|
||||
asmList.Clear;
|
||||
arr := TJSONArray(val);
|
||||
for i := 0 to arr.Count-1 do
|
||||
begin
|
||||
|
|
@ -2012,6 +2026,51 @@ begin
|
|||
selectAsmInstr;
|
||||
end;
|
||||
|
||||
val := fJson.Find('threads');
|
||||
if val.isNotNil and (val.JSONType = jtArray) then
|
||||
begin
|
||||
arr := TJSONArray(val);
|
||||
lstThreads.BeginUpdate;
|
||||
lstThreads.Clear;
|
||||
for i := 0 to arr.Count-1 do
|
||||
begin
|
||||
obj := arr.Objects[i];
|
||||
val := obj.Find('id');
|
||||
if val.isNotNil then
|
||||
begin
|
||||
lstThreads.AddItem(val.AsString, nil);
|
||||
k := lstThreads.Items[lstThreads.Items.Count-1];
|
||||
val := obj.Find('state');
|
||||
if val.isNotNil then
|
||||
k.SubItems.Add(val.AsString);
|
||||
val := obj.Find('core');
|
||||
if val.isNotNil then
|
||||
k.SubItems.Add(val.AsString);
|
||||
val := obj.Find('frame');
|
||||
if val.isNotNil and (val.JSONType = jtObject) then
|
||||
begin
|
||||
obj := TJSONObject(val);
|
||||
val := obj.Find('func');
|
||||
if val.isNotNil then
|
||||
if fOptions.autoDemangle then
|
||||
k.SubItems.Add(demangle(val.AsString))
|
||||
else
|
||||
k.SubItems.Add(demangle(val.AsString));
|
||||
val := obj.Find('addr');
|
||||
if val.isNotNil then
|
||||
k.SubItems.Add(val.AsString);
|
||||
val := obj.Find('fullname');
|
||||
if val.isNotNil then
|
||||
k.SubItems.Add(val.AsString);
|
||||
val := obj.Find('line');
|
||||
if val.isNotNil then
|
||||
k.SubItems.Add(val.AsString);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
lstThreads.EndUpdate;
|
||||
end;
|
||||
|
||||
if fOptions.showGdbOutput or fShowFromCustomCommand then
|
||||
begin
|
||||
fShowFromCustomCommand := false;
|
||||
|
|
@ -2119,6 +2178,11 @@ begin
|
|||
gdbCommand('-stack-list-variables --skip-unavailable --simple-values');
|
||||
end;
|
||||
|
||||
procedure TCEGdbWidget.infoThreads;
|
||||
begin
|
||||
gdbCommand('-thread-info');
|
||||
end;
|
||||
|
||||
procedure TCEGdbWidget.infoAsm(const fname: string);
|
||||
var
|
||||
cmd: string;
|
||||
|
|
@ -2230,6 +2294,24 @@ begin
|
|||
infoRegs;}
|
||||
end;
|
||||
|
||||
procedure TCEGdbWidget.lstThreadsDblClick(Sender: TObject);
|
||||
var
|
||||
lne: integer;
|
||||
nme: string;
|
||||
doc: TCESynMemo = nil;
|
||||
begin
|
||||
if (lstThreads.Selected.isNil) or (lstThreads.Selected.SubItems.Count < 6) then
|
||||
exit;
|
||||
lne := StrToIntDef(lstThreads.Selected.SubItems[5], -1);
|
||||
nme := lstThreads.Selected.SubItems[4];
|
||||
if not nme.fileExists or (lne = -1) then
|
||||
exit;
|
||||
fDocHandler.openDocument(nme);
|
||||
doc := fDocHandler.findDocument(nme);
|
||||
if doc.isNotNil then
|
||||
doc.CaretY:= lne;
|
||||
end;
|
||||
|
||||
procedure TCEGdbWidget.mnuReadWClick(Sender: TObject);
|
||||
begin
|
||||
fAddWatchPointKind := wpkRead;
|
||||
|
|
|
|||
Loading…
Reference in New Issue