Changeset 89c57b6 in mainline for kernel/tools/genmap.py

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/tools/genmap.py (modified) (2 diffs)

kernel/tools/genmap.py

@@ -86 +86 @@
         obdump = read_obdump(obmapf)
         
-        def sorter(x,y):
-                return cmp(x[0],y[0])
+        def key_sorter(x):
+                return x[0]
         
         for line in kmapf:
@@ -93 +93 @@
                 res = startfile.match(line)
                 
-                if ((res) and (obdump[res.group(1)].has_key(res.group(3)))):
+                if ((res) and (res.group(3) in obdump[res.group(1)])):
                         offset = int(res.group(2), 16)
                         fname = res.group(3)
                         symbols = obdump[res.group(1)][fname]
-                        symbols.sort(sorter)
+                        symbols.sort(key = key_sorter)
                         for addr, symbol in symbols:
                                 value = fname + ':' + symbol
-                                data = struct.pack(symtabfmt, addr + offset, value[:MAXSTRING])
+                                value_bytes = value.encode('ascii')
+                                data = struct.pack(symtabfmt, addr + offset, value_bytes[:MAXSTRING])
                                 out.write(data)
                         
-        out.write(struct.pack(symtabfmt, 0, ''))
+        out.write(struct.pack(symtabfmt, 0, b''))
 
 def main():
         if (len(sys.argv) != 4):
-                print "Usage: %s <kernel.map> <nm dump> <output.bin>" % sys.argv[0]
+                print("Usage: %s <kernel.map> <nm dump> <output.bin>" % sys.argv[0])
                 return 1
         
         kmapf = open(sys.argv[1], 'r')
         obmapf = open(sys.argv[2], 'r')
-        out = open(sys.argv[3], 'w')
+        out = open(sys.argv[3], 'wb')
         
         generate(kmapf, obmapf, out)