diff --git a/debug/b43-beautifier b/debug/b43-beautifier index 10d699f..138450f 100755 --- a/debug/b43-beautifier +++ b/debug/b43-beautifier @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ # b43 firmware assembly code beautifier # @@ -23,19 +23,19 @@ from libb43 import * def usage(): - print "b43 firmware assembly code beautifier" - print "" - print "Copyright (C) 2008 Michael Buesch " - print "Licensed under the GNU/GPL version 3" - print "" - print "Usage: b43-beautifier [OPTIONS]" - print "" - print "-h|--help Print this help text" - print "-a|--asmfile [FILE] Assembly code source file" - print "-d|--defs [DIR] Directory containing the defs files" - print "" - print "The options -d and -a are essential." - print "The \"include\" directory can be used for --defs" + print("b43 firmware assembly code beautifier") + print("") + print("Copyright (C) 2008 Michael Buesch ") + print("Licensed under the GNU/GPL version 3") + print("") + print("Usage: b43-beautifier [OPTIONS]") + print("") + print("-h|--help Print this help text") + print("-a|--asmfile [FILE] Assembly code source file") + print("-d|--defs [DIR] Directory containing the defs files") + print("") + print("The options -d and -a are essential.") + print("The \"include\" directory can be used for --defs") def parseArgs(): global opt_asmfile @@ -62,10 +62,10 @@ def parseArgs(): opt_defsfiles = v if not opt_asmfile: - print "Must provide --asmfile" + print("Must provide --asmfile") sys.exit(1) if not opt_defsfiles: - print "Must provide --defs" + print("Must provide --defs") sys.exit(1) def main(): @@ -73,8 +73,8 @@ def main(): try: asm = file(opt_asmfile).read() - except IOError, e: - print "Could not read asmfile %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not read asmfile %s: %s" % (e.filename, e.strerror)) return 1 try: b = B43Beautifier(asm, opt_defsfiles) diff --git a/debug/b43-fwdump b/debug/b43-fwdump index 5aadccd..45ecff8 100755 --- a/debug/b43-fwdump +++ b/debug/b43-fwdump @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ # b43 firmware state dumper # @@ -25,21 +25,21 @@ import re def usage(): - print "b43 firmware state dumper" - print "" - print "Copyright (C) 2008 Michael Buesch " - print "Licensed under the GNU/GPL version 3" - print "" - print "Usage: b43-fwdump [OPTIONS]" - print "" - print "-h|--help Print this help text" - 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." + print("b43 firmware state dumper") + print("") + print("Copyright (C) 2008 Michael Buesch ") + print("Licensed under the GNU/GPL version 3") + print("") + print("Usage: b43-fwdump [OPTIONS]") + print("") + print("-h|--help Print this help text") + 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(): @@ -145,29 +145,29 @@ def main(): stdout.write(shm) sys.exit(0) - print "--- B43 microcode state dump ---" - print "PC: %03X PSM-COND: %04X" % (dbg.getPc(), psmcond) - print "Link registers:" + print("--- B43 microcode state dump ---") + print("PC: %03X PSM-COND: %04X" % (dbg.getPc(), psmcond)) + print("Link registers:") dump_regs("lr", lr) - print "Offset registers:" + print("Offset registers:") dump_regs("off", off) - print "General purpose registers:" + print("General purpose registers:") dump_regs("r", gpr) - print "Code:" + print("Code:") if binary: try: bintext = file(binary, "r").read() - except IOError, e: - print "Could not read binary file %s: %s" % (binary, e.strerror) + except IOError as e: + print("Could not read binary file %s: %s" % (binary, e.strerror)) sys.exit(1) dasm = Disassembler(bintext, dasmopt + " --paddr").getAsm() - print makeShortDump(dasm, dbg.getPc()) + print(makeShortDump(dasm, dbg.getPc())) else: - print "" + print("") if dumpShm: - print "Shared memory:" + print("Shared memory:") ascii = "" for i in range(0, len(shm)): if i % 16 == 0 and i != 0: diff --git a/debug/install.py b/debug/install.py index f6d576c..258a3ef 100755 --- a/debug/install.py +++ b/debug/install.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Run this script as root to install the debugging tools # diff --git a/debug/libb43.py b/debug/libb43.py index c8b9533..09977c6 100644 --- a/debug/libb43.py +++ b/debug/libb43.py @@ -74,14 +74,14 @@ def __init__(self, phy=None): try: phys = os.listdir(b43_path) except OSError: - print "Could not find B43's debugfs directory: %s" % b43_path + print("Could not find B43's debugfs directory: %s" % b43_path) raise B43Exception if not phys: - print "Could not find any b43 device" + print("Could not find any b43 device") raise B43Exception if len(phys) != 1: - print "Found multiple b43 devices." - print "You must call this tool with a phyX parameter to specify a device" + print("Found multiple b43 devices.") + print("You must call this tool with a phyX parameter to specify a device") raise B43Exception phy = phys[0] b43_path += phy; @@ -96,8 +96,8 @@ def __init__(self, phy=None): self.f_shm16write = file(b43_path + "/shm16write", "w") self.f_shm32read = file(b43_path + "/shm32read", "r+") self.f_shm32write = file(b43_path + "/shm32write", "w") - except IOError, e: - print "Could not open debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not open debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception self.b43_path = b43_path @@ -114,7 +114,7 @@ def __debugfs_find(self): path = m.group(1) break if not path: - print "Could not find debugfs in /etc/mtab" + print("Could not find debugfs in /etc/mtab") raise B43Exception return path @@ -126,8 +126,8 @@ def read16(self, reg): self.f_mmio16read.flush() self.f_mmio16read.seek(0) val = self.f_mmio16read.read() - except IOError, e: - print "Could not access debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not access debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception return int(val, 16) @@ -139,8 +139,8 @@ def read32(self, reg): self.f_mmio32read.flush() self.f_mmio32read.seek(0) val = self.f_mmio32read.read() - except IOError, e: - print "Could not access debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not access debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception return int(val, 16) @@ -152,8 +152,8 @@ def maskSet16(self, reg, mask, set): self.f_mmio16write.seek(0) self.f_mmio16write.write("0x%X 0x%X 0x%X" % (reg, mask, set)) self.f_mmio16write.flush() - except IOError, e: - print "Could not access debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not access debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception return @@ -170,8 +170,8 @@ def maskSet32(self, reg, mask, set): self.f_mmio32write.seek(0) self.f_mmio32write.write("0x%X 0x%X 0x%X" % (reg, mask, set)) self.f_mmio32write.flush() - except IOError, e: - print "Could not access debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not access debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception return @@ -188,8 +188,8 @@ def shmRead16(self, routing, offset): self.f_shm16read.flush() self.f_shm16read.seek(0) val = self.f_shm16read.read() - except IOError, e: - print "Could not access debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not access debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception return int(val, 16) @@ -201,8 +201,8 @@ def shmMaskSet16(self, routing, offset, mask, set): self.f_shm16write.seek(0) self.f_shm16write.write("0x%X 0x%X 0x%X 0x%X" % (routing, offset, mask, set)) self.f_shm16write.flush() - except IOError, e: - print "Could not access debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not access debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception return @@ -219,8 +219,8 @@ def shmRead32(self, routing, offset): self.f_shm32read.flush() self.f_shm32read.seek(0) val = self.f_shm32read.read() - except IOError, e: - print "Could not access debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not access debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception return int(val, 16) @@ -232,8 +232,8 @@ def shmMaskSet32(self, routing, offset, mask, set): self.f_shm32write.seek(0) self.f_shm32write.write("0x%X 0x%X 0x%X 0x%X" % (routing, offset, mask, set)) self.f_shm32write.flush() - except IOError, e: - print "Could not access debugfs file %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("Could not access debugfs file %s: %s" % (e.filename, e.strerror)) raise B43Exception return @@ -345,9 +345,9 @@ def __init__(self, index, line): def __init__(self, text, expected_md5sum): sum = hashlib.md5(text).hexdigest() if sum != expected_md5sum: - print "Patcher: The text does not match the expected MD5 sum" - print "Expected: " + expected_md5sum - print "Calculated: " + sum + print("Patcher: The text does not match the expected MD5 sum") + print("Expected: " + expected_md5sum) + print("Calculated: " + sum) raise B43Exception text = text.splitlines() self.lines = [] @@ -375,7 +375,7 @@ def delLine(self, linenumber): if l.index == linenumber: l.deleted = True return - print "Patcher deleteLine: Did not find the line!" + print("Patcher deleteLine: Did not find the line!") raise B43Exception def addText(self, beforeLineNumber, text): @@ -388,7 +388,7 @@ def addText(self, beforeLineNumber, text): break index += 1 if index >= len(self.lines): - print "Patcher addText: Did not find the line!" + print("Patcher addText: Did not find the line!") raise B43Exception for l in text: self.lines.insert(index, TextPatcher.TextLine(-1, l)) @@ -402,8 +402,8 @@ def __init__(self, header_file): assembly file containing the symbolic SPR definitions.""" try: defs = file(header_file).readlines() - except IOError, e: - print "B43SymbolicSpr: Could not read %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("B43SymbolicSpr: Could not read %s: %s" % (e.filename, e.strerror)) B43Exception # Parse the definitions self.spr_names = { } @@ -438,8 +438,8 @@ def __init__(self, header_file): assembly file containing the symbolic SHM definitions.""" try: defs = file(header_file).readlines() - except IOError, e: - print "B43SymbolicShm: Could not read %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("B43SymbolicShm: Could not read %s: %s" % (e.filename, e.strerror)) raise B43Exception # Parse the definitions self.shm_names = { } @@ -477,8 +477,8 @@ def __init__(self, header_file): assembly file containing the symbolic condition definitions.""" try: defs = file(header_file).readlines() - except IOError, e: - print "B43SymbolicCondition: Could not read %s: %s" % (e.filename, e.strerror) + except IOError as e: + print("B43SymbolicCondition: Could not read %s: %s" % (e.filename, e.strerror)) raise B43Exception # Parse the definitions self.cond_names = { } diff --git a/debug/patcher-template b/debug/patcher-template index df927c3..ccba310 100755 --- a/debug/patcher-template +++ b/debug/patcher-template @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ # Copyright (C) 2008 Michael Buesch # @@ -20,7 +20,7 @@ from libb43 import * if len(sys.argv) != 3 and len(sys.argv) != 2: - print "Usage: %s INPUT_FILE [OUTPUT_FILE]" % sys.argv[0] + print("Usage: %s INPUT_FILE [OUTPUT_FILE]" % sys.argv[0]) sys.exit(1) infile = sys.argv[1] @@ -43,5 +43,5 @@ try: sys.stdout.write(p.getText()) except B43Exception: - print "Could not patch. Do you use the correct input file?" + print("Could not patch. Do you use the correct input file?") sys.exit(1) diff --git a/disassembler/b43-ivaldump b/disassembler/b43-ivaldump index ce06cbb..9647de5 100755 --- a/disassembler/b43-ivaldump +++ b/disassembler/b43-ivaldump @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ # A small script to dump the contents of a b43 initvals file # @@ -18,15 +18,15 @@ import sys def usage(): - print "b43 initvals file dumper" - print "Prints a .initvals assembly section to stdout." - print "" - print "Copyright (C) 2008-2010 Michael Buesch " - print "Licensed under the GNU/GPL version 2" - print "" - print "Usage: b43-ivaldump FILE" - print "" - print "FILE is the file that is going to be dumped" + print("b43 initvals file dumper") + print("Prints a .initvals assembly section to stdout.") + print("") + print("Copyright (C) 2008-2010 Michael Buesch ") + print("Licensed under the GNU/GPL version 2") + print("") + print("Usage: b43-ivaldump FILE") + print("") + print("FILE is the file that is going to be dumped") return if len(sys.argv) != 2: @@ -37,26 +37,26 @@ filename = sys.argv[1] try: ivals = file(filename).read() -except IOError, e: - print "Could not read the initvals file: %s" % e.strerror +except IOError as e: + print("Could not read the initvals file: %s" % e.strerror) sys.exit(1) if len(ivals) < 8: - print "The file is too small. This can not be an initvals file." + print("The file is too small. This can not be an initvals file.") sys.exit(1) if ivals[0] != "i": - print "This is not an initvals file. (Wrong header magic)." + print("This is not an initvals file. (Wrong header magic).") sys.exit(1) if ord(ivals[1]) != 1: - print "Initvals file version %d is not supported by this program." % ord(ivals[1]) + print("Initvals file version %d is not supported by this program." % ord(ivals[1])) sys.exit(1) sectname = filename.split('/')[-1] if sectname.endswith(".fw"): sectname = sectname[:-3] -print ".initvals(%s)" % sectname +print(".initvals(%s)" % sectname) idx = 8 # skip header while idx < len(ivals): off_sz = ord(ivals[idx + 0]) << 8 @@ -70,9 +70,9 @@ while idx < len(ivals): data |= ord(ivals[idx + 4]) << 8 data |= ord(ivals[idx + 5]) << 0 idx += 6 - print "\tmmio32\t0x%08X, 0x%04X" % (data, offset) + print("\tmmio32\t0x%08X, 0x%04X" % (data, offset)) else: data = ord(ivals[idx + 2]) << 8 data |= ord(ivals[idx + 3]) << 0 idx += 4 - print "\tmmio16\t0x%04X, 0x%04X" % (data, offset) + print("\tmmio16\t0x%04X, 0x%04X" % (data, offset)) diff --git a/disassembler/brcm80211-fwconv b/disassembler/brcm80211-fwconv index 5c32f28..e84b166 100755 --- a/disassembler/brcm80211-fwconv +++ b/disassembler/brcm80211-fwconv @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ # Copyright (C) 2010 Michael Buesch # @@ -101,11 +101,11 @@ def getSectionByIndex(sections, searchIndex): def parseHeaderFile(hdr_filepath, sortByOffset=False): try: hdr_data = file(hdr_filepath, "rb").read() - except (IOError), e: - print "Failed to read header file: %s" % e.strerror + except (IOError) as e: + print("Failed to read header file: %s" % e.strerror) return None if len(hdr_data) % (3 * 4) != 0: - print "Invalid header file format" + print("Invalid header file format") return None return parseHeader(hdr_data, sortByOffset) @@ -115,8 +115,8 @@ def dumpInfo(hdr_filepath): return 1 for section in sections: (offset, length, index) = section - print "Index %2d %24s ==> offset:0x%08X length:0x%08X" %\ - (index, indexToName(index), offset, length) + print("Index %2d %24s ==> offset:0x%08X length:0x%08X" %\ + (index, indexToName(index), offset, length)) return 0 def extractSection(hdr_filepath, bin_filepath, extractIndex, outfilePath): @@ -125,22 +125,22 @@ def extractSection(hdr_filepath, bin_filepath, extractIndex, outfilePath): return 1 section = getSectionByIndex(sections, extractIndex) if not section: - print "Did not find a section with index %d" % extractIndex + print("Did not find a section with index %d" % extractIndex) return 1 (offset, length, index) = section try: bin_data = file(bin_filepath, "rb").read() - except (IOError), e: - print "Failed to read bin file: %s" % e.strerror + except (IOError) as e: + print("Failed to read bin file: %s" % e.strerror) return 1 try: outfile = file(outfilePath, "wb") outfile.write(bin_data[offset : offset + length]) except IndexError: - print "Binfile index error." + print("Binfile index error.") return 1 - except (IOError), e: - print "Failed to write output file: %s" % e.strerror + except (IOError) as e: + print("Failed to write output file: %s" % e.strerror) return 1 return 0 @@ -150,13 +150,13 @@ def mergeSection(hdr_filepath, bin_filepath, mergeIndex, mergefilePath): return 1 try: bin_data = file(bin_filepath, "rb").read() - except (IOError), e: - print "Failed to read bin file: %s" % e.strerror + except (IOError) as e: + print("Failed to read bin file: %s" % e.strerror) return 1 try: merge_data = file(mergefilePath, "rb").read() - except (IOError), e: - print "Failed to open merge output file: %s" % e.strerror + except (IOError) as e: + print("Failed to open merge output file: %s" % e.strerror) return 1 newBin = [] newSections = [] @@ -166,7 +166,7 @@ def mergeSection(hdr_filepath, bin_filepath, mergeIndex, mergefilePath): (offset, length, index) = section if index == mergeIndex: if foundIt: - print "Confused. Multiple sections with index %d?" % index + print("Confused. Multiple sections with index %d?" % index) return 1 foundIt = True # We overwrite this section @@ -177,38 +177,38 @@ def mergeSection(hdr_filepath, bin_filepath, mergeIndex, mergefilePath): try: newBin.append(bin_data[offset : offset + length]) except IndexError: - print "Failed to read input data" + print("Failed to read input data") return 1 newSections.append( (newOffset, length, index) ) newOffset += length if not foundIt: - print "Did not find section with index %d" % mergeIndex + print("Did not find section with index %d" % mergeIndex) return 1 newBin = "".join(newBin) newHdr = generateHeaderData(newSections) try: file(bin_filepath, "wb").write(newBin) file(hdr_filepath, "wb").write(newHdr) - except (IOError), e: - print "Failed to write bin or header file: %s" % e.strerror + except (IOError) as e: + print("Failed to write bin or header file: %s" % e.strerror) return 1 return 0 def usage(): - print "BRCM80211 firmware converter tool" - print "" - print "Usage: %s [OPTIONS]" % sys.argv[0] - print "" - print " -H|--header FILE Use FILE as header file" - print " -B|--bin FILE Use FILE as bin file" - print "" - print "Actions:" - print " -d|--dump Dump general information" - print " -x|--extract INDEX:FILE Extract the section with index INDEX to FILE" - print " -m|--merge INDEX:FILE Merges FILE into the bin file stream at INDEX" - print " A Merge modifies the files specified in -H and -B" - print "" - print " -h|--help Print this help text" + print("BRCM80211 firmware converter tool") + print("") + print("Usage: %s [OPTIONS]" % sys.argv[0]) + print("") + print(" -H|--header FILE Use FILE as header file") + print(" -B|--bin FILE Use FILE as bin file") + print("") + print("Actions:") + print(" -d|--dump Dump general information") + print(" -x|--extract INDEX:FILE Extract the section with index INDEX to FILE") + print(" -m|--merge INDEX:FILE Merges FILE into the bin file stream at INDEX") + print(" A Merge modifies the files specified in -H and -B") + print("") + print(" -h|--help Print this help text") def main(): opt_header = None @@ -241,8 +241,8 @@ def main(): v = v.split(':') opt_index = int(v[0]) opt_outfile = v[1] - except IndexError, ValueError: - print "Invalid -x|--extract index number\n" + except IndexError as ValueError: + print("Invalid -x|--extract index number\n") usage() return 1 if o in ("-m", "--merge"): @@ -251,29 +251,29 @@ def main(): v = v.split(':') opt_index = int(v[0]) opt_mergefile = v[1] - except IndexError, ValueError: - print "Invalid -m|--merge index and/or merge file name\n" + except IndexError as ValueError: + print("Invalid -m|--merge index and/or merge file name\n") usage() return 1 if not opt_action: - print "No action specified\n" + print("No action specified\n") usage() return 1 if opt_action == "dump": if not opt_header: - print "No header file specified\n" + print("No header file specified\n") usage() return 1 return dumpInfo(opt_header) elif opt_action == "extract": if not opt_header or not opt_bin: - print "No header or bin file specified\n" + print("No header or bin file specified\n") usage() return 1 return extractSection(opt_header, opt_bin, opt_index, opt_outfile) elif opt_action == "merge": if not opt_header or not opt_bin: - print "No header or bin file specified\n" + print("No header or bin file specified\n") usage() return 1 return mergeSection(opt_header, opt_bin, opt_index, opt_mergefile) diff --git a/disassembler/brcm80211-ivaldump b/disassembler/brcm80211-ivaldump index 4225da6..7428ad4 100755 --- a/disassembler/brcm80211-ivaldump +++ b/disassembler/brcm80211-ivaldump @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ # A small script to dump the contents of a brcm80211 initvals section # @@ -18,15 +18,15 @@ import sys def usage(): - print "brcm80211 initvals section dumper" - print "Prints a .initvals assembly section to stdout." - print "" - print "Copyright (C) 2010 Michael Buesch " - print "Licensed under the GNU/GPL version 2" - print "" - print "Usage: brcm80211-ivaldump FILE" - print "" - print "FILE is the file that is going to be dumped" + print("brcm80211 initvals section dumper") + print("Prints a .initvals assembly section to stdout.") + print("") + print("Copyright (C) 2010 Michael Buesch ") + print("Licensed under the GNU/GPL version 2") + print("") + print("Usage: brcm80211-ivaldump FILE") + print("") + print("FILE is the file that is going to be dumped") return if len(sys.argv) != 2: @@ -37,18 +37,18 @@ filename = sys.argv[1] try: ivals = file(filename).read() -except IOError, e: - print "Could not read the initvals file: %s" % e.strerror +except IOError as e: + print("Could not read the initvals file: %s" % e.strerror) sys.exit(1) if len(ivals) == 0 or len(ivals) % 8 != 0: - print "The input file is malformed." + print("The input file is malformed.") sys.exit(1) sectname = filename.split('/')[-1] if sectname.endswith(".fw"): sectname = sectname[:-3] -print ".initvals(%s)" % sectname +print(".initvals(%s)" % sectname) for idx in range(0, len(ivals), 8): addr = ord(ivals[idx + 0]) addr |= ord(ivals[idx + 1]) << 8 @@ -62,12 +62,12 @@ for idx in range(0, len(ivals), 8): if addr == 0xFFFF: break if size == 4: - print "\tmmio32\t0x%08X, 0x%04X" % (value, addr) + print("\tmmio32\t0x%08X, 0x%04X" % (value, addr)) elif size == 2: if value & 0xFFFF0000: - print "The input file is malformed (invalid value for 16bit field)" + print("The input file is malformed (invalid value for 16bit field)") sys.exit(1) - print "\tmmio16\t0x%04X, 0x%04X" % (value, addr) + print("\tmmio16\t0x%04X, 0x%04X" % (value, addr)) else: - print "The input file is malformed (invalid size field: 0x%04X)" % size + print("The input file is malformed (invalid size field: 0x%04X)" % size) sys.exit(1) diff --git a/fwcutter/mklist.py b/fwcutter/mklist.py index ae94412..1f743c2 100755 --- a/fwcutter/mklist.py +++ b/fwcutter/mklist.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Script for creating a "struct extract" list for fwcutter_list.h # @@ -33,7 +33,7 @@ import hashlib if len(sys.argv) != 2: - print "Usage: %s path/to/wl.o" % sys.argv[0] + print("Usage: %s path/to/wl.o" % sys.argv[0]) sys.exit(1) fn = sys.argv[1] @@ -52,13 +52,13 @@ rodata_fileoffset = int(m.group(1), 16) break if rodata_fileoffset == None: - print "ERROR: Could not find .rodata fileoffset" + print("ERROR: Could not find .rodata fileoffset") sys.exit(1) md5sum = hashlib.md5(file(fn, "r").read()) -print "static struct extract _%s[] =" % md5sum.hexdigest() -print "{" +print("static struct extract _%s[] =" % md5sum.hexdigest()) +print("{") sym_re = re.compile(r"([0-9a-fA-F]+)\s+g\s+O\s+\.rodata\s+([0-9a-fA-F]+) d11([-_\s\w0-9]+)") ucode_re = re.compile(r"ucode(\d+)") @@ -81,10 +81,10 @@ if "pcm" in name: type = "EXT_PCM" if "bommajor" in name: - print "\t/* ucode major version at offset 0x%x */" % pos + print("\t/* ucode major version at offset 0x%x */" % pos) continue if "bomminor" in name: - print "\t/* ucode minor version at offset 0x%x */" % pos + print("\t/* ucode minor version at offset 0x%x */" % pos) continue if "ucode_2w" in name: continue @@ -98,9 +98,9 @@ else: type = "EXT_UCODE_3" if not type: - print "\t/* ERROR: Could not guess data type for: %s */" % name + print("\t/* ERROR: Could not guess data type for: %s */" % name) continue - print "\t{ .name = \"%s\", .offset = 0x%X, .type = %s, .length = 0x%X }," % (name, pos, type, size) -print "\tEXTRACT_LIST_END" -print "};" + print("\t{ .name = \"%s\", .offset = 0x%X, .type = %s, .length = 0x%X }," % (name, pos, type, size)) +print("\tEXTRACT_LIST_END") +print("};")