assembler/disassembler: Fix indirect mem addressing for r15

[b43-tools.git] / debug / b43-fwdump

diff --git a/debug/b43-fwdump b/debug/b43-fwdump
index 928634abd7c56a1a0163f81adc6a7f09e8b41413..24f1f0d23d8e99cbb60b24eb7180e0eec93ee100 100755 (executable)
--- a/debug/b43-fwdump
+++ b/debug/b43-fwdump
@@ -32,25 +32,32 @@ def usage():
        print "Usage: b43-fwdump [OPTIONS]"
        print ""
        print "-h|--help            Print this help text"
-       print "-p|--phy PHY         The PHY to use. For example phy0"
+       print "-p|--phy WIPHY       The WIPHY to use. For example phy0."
+       print "                     Can be omitted, if there is only one device in the system."
        print "-b|--binary BIN      The firmware binary. This is required for"
        print "                     an instruction dump."
        print "-d|--dasmopt OPT     Additional options to the disassembler."
+       print "-s|--shm             Also dump SHM."
+       print "-S|--shmbin          Do a binary SHM dump, only."
        return
 
 def parseArgs():
        global phy
        global binary
        global dasmopt
+       global dumpShm
+       global dumpShmBin
 
        phy = None # Autodetect
        binary = None # No instruction dump
        dasmopt = ""
+       dumpShm = False
+       dumpShmBin = False
 
        try:
                (opts, args) = getopt.getopt(sys.argv[1:],
-                       "hp:b:d:",
-                       [ "help", "phy=", "binary=", "dasmopt=" ])
+                       "hp:b:d:sS",
+                       [ "help", "phy=", "binary=", "dasmopt=", "shm", "shmbin" ])
        except getopt.GetoptError:
                usage()
                sys.exit(1)
@@ -65,6 +72,10 @@ def parseArgs():
                        binary = v
                if o in ("-d", "--dasmopt"):
                        dasmopt = v
+               if o in ("-s", "--shm"):
+                       dumpShm = True
+               if o in ("-S", "--shmbin"):
+                       dumpShmBin = True
        return
 
 
@@ -80,16 +91,6 @@ def dump_regs(prefix, regs):
        stdout.write("\n")
        return
 
-def disassembleText(text):
-       input = NamedTemporaryFile()
-       output = NamedTemporaryFile()
-
-       input.write(text)
-       input.flush()
-       os.system("b43-dasm %s %s %s --paddr" % (input.name, dasmopt, output.name))
-
-       return output.read()
-
 def makeShortDump(dasm, pc):
        dasm = dasm.splitlines()
        i = 0
@@ -110,6 +111,11 @@ def makeShortDump(dasm, pc):
                pos += 1
        return ret
 
+def toAscii(char):
+       if char >= 32 and char <= 126:
+               return chr(char)
+       return "."
+
 def main():
        parseArgs()
 
@@ -120,11 +126,17 @@ def main():
        gpr = b43.getGprs()
        lr = b43.getLinkRegs()
        off = b43.getOffsetRegs()
-       shm = b43.shmSharedRead()
+       if dumpShm or dumpShmBin:
+               shm = b43.shmSharedRead()
        dbg = b43.getPsmDebug()
        psmcond = b43.getPsmConditions()
        b43.ucodeStart()
 
+       if dumpShmBin:
+               # Only do a binary SHM dump
+               stdout.write(shm)
+               sys.exit(0)
+
        print "--- B43 microcode state dump ---"
        print "PC: %03X  PSM-COND: %04X" % (dbg.getPc(), psmcond)
        print "Link registers:"
@@ -141,10 +153,26 @@ def main():
                except IOError, e:
                        print "Could not read binary file %s: %s" % (binary, e.strerror)
                        sys.exit(1)
-               dasm = disassembleText(bintext)
+               dasm = Disassembler(bintext, dasmopt + "--paddr").getAsm()
                print makeShortDump(dasm, dbg.getPc())
        else:
                print "<No binary supplied. See --binary option>"
+
+       if dumpShm:
+               print "Shared memory:"
+               ascii = ""
+               for i in range(0, len(shm)):
+                       if i % 16 == 0 and i != 0:
+                               stdout.write("  " + ascii + "\n")
+                               ascii = ""
+                       if i % 16 == 0:
+                               stdout.write("0x%04X:  " % i)
+                       c = ord(shm[i])
+                       stdout.write("%02X" % c)
+                       if (i % 2 != 0):
+                               stdout.write(" ")
+                       ascii += toAscii(c)
+               stdout.write("  " + ascii + "\n")
        return