From 02ea68f1f3b56c669b1a178c082d55ff27fd5826 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 19 Sep 2014 01:42:26 +0200 Subject: [PATCH] info --- Mist/assets/debugger/debugger.qml | 33 ++++++++++++++++++++----------- Mist/debugger.go | 2 ++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Mist/assets/debugger/debugger.qml b/Mist/assets/debugger/debugger.qml index 34fe01253..902e09d2c 100644 --- a/Mist/assets/debugger/debugger.qml +++ b/Mist/assets/debugger/debugger.qml @@ -223,18 +223,29 @@ ApplicationWindow { } } - Rectangle { - height: 200 - width: parent.width - TableView { - id: logTableView - property var logModel: ListModel { - id: logModel + SplitView { + Rectangle { + height: 200 + width: parent.width * 0.66 + TableView { + id: logTableView + property var logModel: ListModel { + id: logModel + } + height: parent.height + width: parent.width + TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width - 2 } + model: logModel } - height: parent.height - width: parent.width - TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width - 2 } - model: logModel + } + + TextArea { + objectName: "info" + anchors { + top: parent.top + bottom: parent.bottom + } + readOnly: true } } } diff --git a/Mist/debugger.go b/Mist/debugger.go index 7bc544377..2b9081419 100644 --- a/Mist/debugger.go +++ b/Mist/debugger.go @@ -284,6 +284,8 @@ func (d *Debugger) halting(pc int, op ethvm.OpCode, mem *ethvm.Memory, stack *et d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", key), fmt.Sprintf("% x", node.Str())}) }) + d.win.Root().ObjectByName("info").Set("text", fmt.Sprintf(`stack frame %v`, new(big.Int).SetBytes(mem.Get(0, 32)))) + out: for { select {