|
|
|
@ -26,7 +26,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
win := component.CreateWindow(nil) |
|
|
|
|
db := &Debugger{win, make(chan bool), make(chan bool), true, false} |
|
|
|
|
db := &Debugger{win, make(chan bool), make(chan bool), true, false, true} |
|
|
|
|
|
|
|
|
|
return &DebuggerWindow{engine: engine, win: win, lib: lib, Db: db} |
|
|
|
|
} |
|
|
|
@ -59,6 +59,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data |
|
|
|
|
if !self.Db.done { |
|
|
|
|
self.Db.Q <- true |
|
|
|
|
} |
|
|
|
|
self.Db.breakOnInstr = self.win.Root().ObjectByName("breakEachLine").Bool("checked") |
|
|
|
|
|
|
|
|
|
defer func() { |
|
|
|
|
if r := recover(); r != nil { |
|
|
|
@ -164,6 +165,7 @@ type Debugger struct { |
|
|
|
|
N chan bool |
|
|
|
|
Q chan bool |
|
|
|
|
done, interrupt bool |
|
|
|
|
breakOnInstr bool |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
type storeVal struct { |
|
|
|
@ -190,16 +192,18 @@ func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, sta |
|
|
|
|
d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", key), fmt.Sprintf("% x", node.Str())}) |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
out: |
|
|
|
|
for { |
|
|
|
|
select { |
|
|
|
|
case <-d.N: |
|
|
|
|
break out |
|
|
|
|
case <-d.Q: |
|
|
|
|
d.interrupt = true |
|
|
|
|
d.clearBuffers() |
|
|
|
|
|
|
|
|
|
return false |
|
|
|
|
if d.breakOnInstr { |
|
|
|
|
out: |
|
|
|
|
for { |
|
|
|
|
select { |
|
|
|
|
case <-d.N: |
|
|
|
|
break out |
|
|
|
|
case <-d.Q: |
|
|
|
|
d.interrupt = true |
|
|
|
|
d.clearBuffers() |
|
|
|
|
|
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|