Fixed debugger
This commit is contained in:
parent
26ecf4b780
commit
d694e00a33
@ -409,7 +409,7 @@ ApplicationWindow {
|
||||
|
||||
}
|
||||
|
||||
Window {
|
||||
ApplicationWindow {
|
||||
id: debugWindow
|
||||
visible: false
|
||||
title: "Debugger"
|
||||
@ -447,36 +447,49 @@ ApplicationWindow {
|
||||
orientation: Qt.Vertical
|
||||
anchors.fill: parent
|
||||
|
||||
TableView {
|
||||
property var memModel: ListModel {
|
||||
id: memModel
|
||||
}
|
||||
height: parent.height/2
|
||||
width: parent.width
|
||||
TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50}
|
||||
TableViewColumn{ role: "value" ; title: "Memory" ; width: 750}
|
||||
model: memModel
|
||||
}
|
||||
TableView {
|
||||
property var memModel: ListModel {
|
||||
id: memModel
|
||||
}
|
||||
height: parent.height/2
|
||||
width: parent.width
|
||||
TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50}
|
||||
TableViewColumn{ role: "value" ; title: "Memory" ; width: 750}
|
||||
model: memModel
|
||||
}
|
||||
|
||||
SplitView {
|
||||
orientation: Qt.Horizontal
|
||||
TableView {
|
||||
property var debuggerLog: ListModel {
|
||||
id: debuggerLog
|
||||
}
|
||||
TableViewColumn{ role: "value"; title: "Debug messages" }
|
||||
model: debuggerLog
|
||||
}
|
||||
TableView {
|
||||
property var stackModel: ListModel {
|
||||
id: stackModel
|
||||
}
|
||||
height: parent.height/2
|
||||
width: parent.width
|
||||
TableViewColumn{ role: "value" ; title: "Stack" ; width: parent.width }
|
||||
model: stackModel
|
||||
}
|
||||
}
|
||||
SplitView {
|
||||
orientation: Qt.Horizontal
|
||||
TableView {
|
||||
property var debuggerLog: ListModel {
|
||||
id: debuggerLog
|
||||
}
|
||||
TableViewColumn{ role: "value"; title: "Debug messages" }
|
||||
model: debuggerLog
|
||||
}
|
||||
TableView {
|
||||
property var stackModel: ListModel {
|
||||
id: stackModel
|
||||
}
|
||||
height: parent.height/2
|
||||
width: parent.width
|
||||
TableViewColumn{ role: "value" ; title: "Stack" ; width: parent.width }
|
||||
model: stackModel
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
statusBar: StatusBar {
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
Button {
|
||||
property var enabled: true
|
||||
id: debugNextButton
|
||||
onClicked: {
|
||||
ui.next()
|
||||
}
|
||||
text: "Next"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
var jefcoinAddr = "fc0a9436890478bb9b1c6ed7455c2535366f4a99"
|
||||
var jefcoinAddr = "518546ffa883dcc838a64bc2dabada0fd64af459"
|
||||
var mAddr = ""
|
||||
|
||||
function createTransaction() {
|
||||
|
@ -130,7 +130,7 @@ func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
|
||||
gui.win = win
|
||||
gui.uiLib.win = win
|
||||
|
||||
db := &Debugger{gui.win, make(chan bool)}
|
||||
db := &Debugger{gui.win, make(chan bool), true}
|
||||
gui.lib.Db = db
|
||||
gui.uiLib.Db = db
|
||||
|
||||
|
@ -6,9 +6,7 @@ import (
|
||||
"github.com/ethereum/eth-go"
|
||||
"github.com/ethereum/eth-go/ethchain"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
"github.com/ethereum/go-ethereum/utils"
|
||||
"github.com/go-qml/qml"
|
||||
"github.com/obscuren/mutan"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
@ -121,27 +119,28 @@ func DefaultAssetPath() string {
|
||||
func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) {
|
||||
state := ui.eth.BlockChain().CurrentBlock.State()
|
||||
|
||||
mainInput, _ := mutan.PreParse(data)
|
||||
callerScript, err := utils.Compile(mainInput)
|
||||
script, err := ethutil.Compile(data)
|
||||
if err != nil {
|
||||
ethutil.Config.Log.Debugln(err)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
dis := ethchain.Disassemble(callerScript)
|
||||
dis := ethchain.Disassemble(script)
|
||||
ui.win.Root().Call("clearAsm")
|
||||
|
||||
for _, str := range dis {
|
||||
ui.win.Root().Call("setAsm", str)
|
||||
}
|
||||
callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), nil)
|
||||
|
||||
// Contract addr as test address
|
||||
keyPair := ethutil.GetKeyRing().Get(0)
|
||||
callerTx :=
|
||||
ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), script)
|
||||
callerTx.Sign(keyPair.PrivateKey)
|
||||
|
||||
account := ui.eth.StateManager().TransState().GetStateObject(keyPair.Address())
|
||||
c := ethchain.MakeContract(callerTx, state)
|
||||
callerClosure := ethchain.NewClosure(account, c, c.Script(), state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr))
|
||||
contract := ethchain.MakeContract(callerTx, state)
|
||||
callerClosure := ethchain.NewClosure(account, contract, contract.Init(), state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr))
|
||||
|
||||
block := ui.eth.BlockChain().CurrentBlock
|
||||
vm := ethchain.NewVm(state, ui.eth.StateManager(), ethchain.RuntimeVars{
|
||||
@ -151,23 +150,28 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string)
|
||||
Coinbase: block.Coinbase,
|
||||
Time: block.Time,
|
||||
Diff: block.Difficulty,
|
||||
TxData: nil,
|
||||
})
|
||||
|
||||
ui.Db.done = false
|
||||
go func() {
|
||||
callerClosure.Call(vm, nil, ui.Db.halting)
|
||||
callerClosure.Call(vm, contract.Init(), ui.Db.halting)
|
||||
|
||||
state.Reset()
|
||||
|
||||
ui.Db.done = true
|
||||
}()
|
||||
}
|
||||
|
||||
func (ui *UiLib) Next() {
|
||||
ui.Db.Next()
|
||||
if !ui.Db.done {
|
||||
ui.Db.Next()
|
||||
}
|
||||
}
|
||||
|
||||
type Debugger struct {
|
||||
win *qml.Window
|
||||
N chan bool
|
||||
win *qml.Window
|
||||
N chan bool
|
||||
done bool
|
||||
}
|
||||
|
||||
func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, stack *ethchain.Stack) {
|
||||
|
Loading…
Reference in New Issue
Block a user