fixed debugger up

js/common/mmu.js

@@ -332,6 +332,7 @@ function Mmu(size) {
             if(l[0] != 'S')
             {
                 ERROR("Invalid srec record!");
+                throw "Bad srecord";
             }
 
             var count = l.substring(2,4);
@@ -379,6 +380,7 @@ function Mmu(size) {
             else
             {
                 ERROR("Unknown SREC type: " + t);
+                throw "Bad srecord";
                 return;
             }
 
@@ -387,6 +389,7 @@ function Mmu(size) {
                 if((data.length % 2) != 0)
                 {
                     ERROR("Length of data in SREC record is not valid: " + data.length);
+                    throw "Bad srecord";
                 }
 
                 addr = parseInt(addr, 16);

js/node/node_main.js

@@ -252,7 +252,11 @@ addCommand("loadsrec", function (s,command) {
     var setEntry = command.split(" ")[1];
     var srecString = command.split(" ")[2];
     setEntry = parseInt(setEntry,16);
-    callNoException(emu.mmu,emu.mmu.loadSREC,[srecString,setEntry]);
+    try {
+        callNoException(emu.mmu,emu.mmu.loadSREC,[srecString,setEntry]);
+    } catch(e){
+        s.write(e)
+    }
     s.write("ok\n");
 });
 
@@ -266,7 +270,7 @@ function handleCommand(data) {
     for(var i = 0 ; i < commands.length ; i++){
         if(data.substr(0,commands[i].length) == commands[i]) {
             try {
-            commandLUT[commands[i]](this,data);
+                commandLUT[commands[i]](this,data);
             } catch (e){
                 if (e == 1337){
                     this.write("ERROR: processor exception occured ")

tools/AssemblyView.py

@@ -1,13 +1,72 @@
 import wx
+import socket
 from  mips32emu.AssemblyViewPanel import AssemblyViewPanel
 
 class AssemblyView(wx.Frame):
     def __init__(self):
         wx.Frame.__init__(self,None, -1, 'AssemblyView')
+        toolbar = self.CreateToolBar()
+        load = toolbar.AddLabelTool(wx.ID_ANY, 'load', wx.Bitmap('tools/tload.png'))
+        reset = toolbar.AddLabelTool(wx.ID_ANY, 'reset', wx.Bitmap('tools/treset.png'))
+        step = toolbar.AddLabelTool(wx.ID_ANY, 'step', wx.Bitmap('tools/tstep.png'))
+        run = toolbar.AddLabelTool(wx.ID_ANY, 'run', wx.Bitmap('tools/trun.png'))
+        pause = toolbar.AddLabelTool(wx.ID_ANY, 'break', wx.Bitmap('tools/tbreak.png'))
+        toolbar.Realize()
+        self.Bind(wx.EVT_TOOL, self.onLoad, load)
+        self.Bind(wx.EVT_TOOL, self.onStep, step)
+        self.Bind(wx.EVT_TOOL, self.onRun, run)
+        self.Bind(wx.EVT_TOOL, self.onReset, reset)
+        self.Bind(wx.EVT_TOOL, self.onPause, pause)
         self.av = AssemblyViewPanel(self)
-    def onStep(self):
-        self.av.dbg.step()
+        self.srec = None
+    def onRun(self,evt):
+        try:
+            self.av.dbg.run()
+        except socket.error:
+            wx.MessageBox('Not connected', 'Error', wx.OK | wx.ICON_ERROR)
+        except Exception as e:
+            wx.MessageBox(str(e), 'Error', wx.OK | wx.ICON_ERROR)
+    def onReset(self,evt):
+        try:
+            if self.srec == None:
+                raise Exception("you havent loaded any srecs to reset to yet...")
+            self.loadSrec(self.srec)
+        except socket.error:
+            wx.MessageBox('Not connected', 'Error', wx.OK | wx.ICON_ERROR)
+        except Exception as e:
+            wx.MessageBox(str(e), 'Error', wx.OK | wx.ICON_ERROR)
+    def onPause(self,evt):
+        try:
+            self.av.dbg.dbgBreak()
+        except socket.error:
+            wx.MessageBox('Not connected', 'Error', wx.OK | wx.ICON_ERROR)
+        except Exception as e:
+            wx.MessageBox(str(e), 'Error', wx.OK | wx.ICON_ERROR)            
 
+    def onStep(self,evt):
+        try:
+            self.av.dbg.step()
+        except socket.error:
+            wx.MessageBox('Not connected', 'Error', wx.OK | wx.ICON_ERROR)
+        except Exception as e:
+            wx.MessageBox(str(e), 'Error', wx.OK | wx.ICON_ERROR)
+    def onLoad(self,evt):
+        diag = wx.FileDialog(None)
+        r = diag.ShowModal()   
+        if r != wx.ID_OK:
+            return
+        path = diag.GetPath()
+        self.srec = path
+        try:
+            self.loadSrec(path)
+        except socket.error:
+            wx.MessageBox('not connected!', 'Error', wx.OK | wx.ICON_ERROR)
+        except Exception as e:
+            wx.MessageBox('error while loading srec file! - ' + str(e), 'Error', wx.OK | wx.ICON_ERROR)
+    def loadSrec(self,fname):
+        self.av.dbg.dbgBreak()
+        for line in open(fname):
+            self.av.dbg.loadSrec(line,1)
 
 app = wx.App()
 frame = AssemblyView()

tools/mips32emu/AssemblyViewPanel.py

@@ -14,7 +14,7 @@ def __init__(self,parent,id=-1):
             wx.FONTWEIGHT_NORMAL, False, 'Courier 10 Pitch')
         self.timer = wx.Timer(self)
         self.Bind(wx.EVT_TIMER, self.timerHandler, self.timer)
-        self.timer.Start(1500,False)
+        self.timer.Start(700,False)
     def timerHandler(self,evt):
         self.Refresh()
     def OnSize(self, event):