Index: kernel/tools/genmap.py
===================================================================
--- kernel/tools/genmap.py	(revision 177e4ea4f278b1d53d68392d53cd40704cd0931d)
+++ kernel/tools/genmap.py	(revision 3c80f2ba924af168dfc3e3a650b8f57db0fe8c00)
@@ -1,3 +1,34 @@
 #!/usr/bin/env python
+#
+# Copyright (c) 2006 Ondrej Palkovsky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+"""
+Create binary symbol map out of linker map file
+"""
 
 import sys
@@ -5,7 +36,6 @@
 import re
 
-MAXSTRING=63
-symtabfmt = "<Q%ds" % (MAXSTRING+1)
-
+MAXSTRING = 63
+symtabfmt = "<Q%ds" % (MAXSTRING + 1)
 
 funcline = re.compile(r'([0-9a-f]+)\s+[lg]\s+.\s+\.text\s+([0-9a-f]+)\s+(.*)$')
@@ -13,75 +43,81 @@
 dataline = re.compile(r'([0-9a-f]+)\s+[lg]\s+[a-zA-Z]\s+\.data\s+([0-9a-f]+)\s+(.*)$')
 fileexp = re.compile(r'([^\s]+):\s+file format')
+startfile = re.compile(r'\.(text|bss|data)\s+(0x[0-9a-f]+)\s+0x[0-9a-f]+\s+(.*)$')
+
 def read_obdump(inp):
-    funcs = {}
-    data = {}
-    bss ={}
-    fname = ''
-    for line in inp:
-        line = line.strip()
-        res = funcline.match(line)
-        if res:
-            funcs.setdefault(fname,[]).append((int(res.group(1),16),
-                                               res.group(3)))
-            continue
-        res = bssline.match(line)
-        if res:
-            start = int(res.group(1),16)
-            end = int(res.group(2),16)
-            if end:
-                bss.setdefault(fname,[]).append((start,res.group(3)))
-        res = dataline.match(line)
-        if res:
-            start = int(res.group(1),16)
-            end = int(res.group(2),16)
-            if end:
-                data.setdefault(fname,[]).append((start,res.group(3)))
-        res = fileexp.match(line)
-        if res:
-            fname = res.group(1)
-            continue
+	"Parse input"
+	
+	funcs = {}
+	data = {}
+	bss = {}
+	fname = ''
+	
+	for line in inp:
+		line = line.strip()
+		res = funcline.match(line)
+		if (res):
+			funcs.setdefault(fname, []).append((int(res.group(1), 16), res.group(3)))
+			continue
+		
+		res = bssline.match(line)
+		if (res):
+			start = int(res.group(1), 16)
+			end = int(res.group(2), 16)
+			if (end):
+				bss.setdefault(fname, []).append((start, res.group(3)))
+		
+		res = dataline.match(line)
+		if (res):
+			start = int(res.group(1), 16)
+			end = int(res.group(2), 16)
+			if (end):
+				data.setdefault(fname, []).append((start, res.group(3)))
+		
+		res = fileexp.match(line)
+		if (res):
+			fname = res.group(1)
+			continue
+	
+	return {'text' : funcs, 'bss' : bss, 'data' : data }
 
-    return {
-        'text' : funcs,
-        'bss' : bss,
-        'data' : data
-        }
-
-startfile = re.compile(r'\.(text|bss|data)\s+(0x[0-9a-f]+)\s+0x[0-9a-f]+\s+(.*)$')
 def generate(kmapf, obmapf, out):
-    obdump = read_obdump(obmapf)    
-
-    def sorter(x,y):
-        return cmp(x[0],y[0])
-
-    for line in kmapf:
-        line = line.strip()
-        res = startfile.match(line)
-
-        if res and obdump[res.group(1)].has_key(res.group(3)):
-            offset = int(res.group(2),16)
-            fname = res.group(3)
-            symbols = obdump[res.group(1)][fname]
-            symbols.sort(sorter)
-            for addr,symbol in symbols:                
-                value = fname + ':' + symbol
-                data = struct.pack(symtabfmt,addr+offset,value[:MAXSTRING])
-                out.write(data)
-                
-    out.write(struct.pack(symtabfmt,0,''))
+	"Generate output file"
+	
+	obdump = read_obdump(obmapf)
+	
+	def sorter(x,y):
+		return cmp(x[0],y[0])
+	
+	for line in kmapf:
+		line = line.strip()
+		res = startfile.match(line)
+		
+		if ((res) and (obdump[res.group(1)].has_key(res.group(3)))):
+			offset = int(res.group(2), 16)
+			fname = res.group(3)
+			symbols = obdump[res.group(1)][fname]
+			symbols.sort(sorter)
+			for addr, symbol in symbols:
+				value = fname + ':' + symbol
+				data = struct.pack(symtabfmt, addr + offset, value[:MAXSTRING])
+				out.write(data)
+			
+	out.write(struct.pack(symtabfmt, 0, ''))
 
 def main():
-    if len(sys.argv) != 4:
-        print "Usage: %s <kernel.map> <nm dump> <output.bin>" % sys.argv[0]
-        sys.exit(1)
-
-    kmapf = open(sys.argv[1],'r')
-    obmapf = open(sys.argv[2],'r')
-    out = open(sys.argv[3],'w')
-    generate(kmapf,obmapf,out)
-    kmapf.close()
-    obmapf.close()
-    out.close()
+	if (len(sys.argv) != 4):
+		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')
+	
+	generate(kmapf, obmapf, out)
+	
+	kmapf.close()
+	obmapf.close()
+	out.close()
 
 if __name__ == '__main__':
-    main()
+	sys.exit(main())