| Index: emcore/trunk/tools/tlsfanalyze.py |
| — | — | @@ -136,12 +136,12 @@ |
| 137 | 137 | try:
|
| 138 | 138 | nfa = block.get_next_free().get_address()
|
| 139 | 139 | if nfa >= prev_addr and nfa < prev_addr + block.get_size() + 4:
|
| 140 | | - print("%08X: Next free block (%08X) lies within the block itself" % (prev_addr, nfa))
|
| | 140 | + print("%08X: Next free block (%08X) is within the block itself" % (prev_addr, nfa))
|
| 141 | 141 | except: print("%08X: Invalid next free block pointer: %08X" % (prev_addr, block.next_free))
|
| 142 | 142 | try:
|
| 143 | 143 | pfa = block.get_prev_free().get_address()
|
| 144 | 144 | if pfa >= prev_addr and pfa < prev_addr + block.get_size() + 4:
|
| 145 | | - print("%08X: Previous free block (%08X) lies within the block itself" % (prev_addr, pfa))
|
| | 145 | + print("%08X: Previous free block (%08X) is within the block itself" % (prev_addr, pfa))
|
| 146 | 146 | except:
|
| 147 | 147 | print("%08X: Invalid previous free block pointer: %08X" % (prev_addr, block.prev_free))
|
| 148 | 148 | print("%08X: %08X bytes free" % (prev_addr + 4, block.get_size() + 4))
|
| — | — | @@ -255,7 +255,7 @@ |
| 256 | 256 | try:
|
| 257 | 257 | nfa = block.get_next_free().get_address()
|
| 258 | 258 | if nfa >= addr and nfa < addr + size + 4:
|
| 259 | | - print("[%d:%d:%08X] Next free block (%08X) lies within the block itself" % (i, j, addr, nfa))
|
| | 259 | + print("[%d:%d:%08X] Next free block (%08X) is within the block itself" % (i, j, addr, nfa))
|
| 260 | 260 | fatal = True
|
| 261 | 261 | except:
|
| 262 | 262 | print("[%d:%d:%08X] Invalid next free block pointer: %08X" % (i, j, addr, block.next_free))
|
| — | — | @@ -263,7 +263,7 @@ |
| 264 | 264 | try:
|
| 265 | 265 | pfa = block.get_prev_free().get_address()
|
| 266 | 266 | if pfa >= addr and pfa < addr + size + 4:
|
| 267 | | - print("[%d:%d:%08X] Previous free block (%08X) lies within the block itself" % (i, j, addr, pfa))
|
| | 267 | + print("[%d:%d:%08X] Previous free block (%08X) is within the block itself" % (i, j, addr, pfa))
|
| 268 | 268 | if prev == None and not block.get_prev_free().is_null():
|
| 269 | 269 | print("[%d:%d:%08X] Previous free block pointer is broken: %08X (should be NULL)" % (i, j, addr, pfa))
|
| 270 | 270 | if prev != None and prev != pfa:
|
| Index: emcore/trunk/tools/libemcore.py |
| — | — | @@ -1088,6 +1088,7 @@ |
| 1089 | 1089 | self.logger.debug("Looking for emCORE device\n")
|
| 1090 | 1090 | devs = usb.core.find(find_all=True, idVendor=self.idVendor)
|
| 1091 | 1091 | for dev in devs:
|
| | 1092 | + self.logger.debug("%04x:%04x\n" % (dev.idVendor, dev.idProduct))
|
| 1092 | 1093 | if dev.idProduct & self.idProductMask == self.idProduct:
|
| 1093 | 1094 | self.dev = dev
|
| 1094 | 1095 | break
|
| — | — | @@ -1097,6 +1098,7 @@ |
| 1098 | 1099 | self.logger.debug("Searching for device interface:\n")
|
| 1099 | 1100 | for cfg in self.dev:
|
| 1100 | 1101 | for intf in cfg:
|
| | 1102 | + self.logger.debug("%02x:%02x:%02x\n" % (intf.bInterfaceClass, intf.bInterfaceSubClass, intf.bInterfaceProtocol))
|
| 1101 | 1103 | if intf.bInterfaceClass == 0xff and intf.bInterfaceSubClass == 0 and intf.bInterfaceProtocol == 0:
|
| 1102 | 1104 | self.interface = intf.bInterfaceNumber
|
| 1103 | 1105 | break
|
| Index: emcore/trunk/tools/libemcoreldr.py |
| — | — | @@ -119,7 +119,7 @@ |
| 120 | 120 |
|
| 121 | 121 | maxblk = self.maxin - 0x10
|
| 122 | 122 |
|
| 123 | | - data = ""
|
| | 123 | + data = b""
|
| 124 | 124 |
|
| 125 | 125 | while True:
|
| 126 | 126 | blocklen = size
|
