Changeset 28f4adb in mainline for kernel

Timestamp:

2010-11-02T11:13:36Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4687a26c, e06ef614

Parents:

458619f7

git-author:

Vojtech Horky <> (2010-11-02 11:13:36)

git-committer:

Martin Decky <martin@…> (2010-11-02 11:13:36)

Message:

update scripts for compatibility with Python 3 (thx Vojtech Horky and Martin Sucha)

Location:

kernel/tools

Files:

• amd64/decpt.py (modified) (2 diffs)
• genmap.py (modified) (3 diffs)
• ia32/decpt.py (modified) (2 diffs)

kernel/tools/amd64/decpt.py

@@ -7 +7 @@
 def main():
     if len(sys.argv) != 2 or not sys.argv[1].startswith('0x'):
-        print "%s 0x..." % sys.argv[0]
+        print("%s 0x..." % sys.argv[0])
         sys.exit(1)
     
@@ -16 +16 @@
     ptl1 = (address >> 30) & 0x1ff
     ptl0 = (address >> 39) & 0x1ff
-    print "Ptl0:   %3d" % ptl0
-    print "Ptl1:   %3d" % ptl1
-    print "Ptl2:   %3d" % ptl2
-    print "Ptl3:   %3d" % ptl3
-    print "Offset: 0x%x" % offset
+    print("Ptl0:   %3d" % ptl0)
+    print("Ptl1:   %3d" % ptl1)
+    print("Ptl2:   %3d" % ptl2)
+    print("Ptl3:   %3d" % ptl3)
+    print("Offset: 0x%x" % offset)
 
 if __name__ == '__main__':

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
@@ -107 +107 @@
 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)

kernel/tools/ia32/decpt.py

@@ -7 +7 @@
 def main():
     if len(sys.argv) != 2 or not sys.argv[1].startswith('0x'):
-        print "%s 0x..." % sys.argv[0]
+        print("%s 0x..." % sys.argv[0])
         sys.exit(1)
     
@@ -14 +14 @@
     ptl1 = (address >> 12) & 0x3ff
     ptl0 = (address >> 22) & 0x3ff
-    print "Ptl0:   %3d" % ptl0
-    print "Ptl1:   %3d" % ptl1
-    print "Offset: 0x%x" % offset
+    print("Ptl0:   %3d" % ptl0)
+    print("Ptl1:   %3d" % ptl1)
+    print("Offset: 0x%x" % offset)
 
 if __name__ == '__main__':