Changeset b6d20a7 in mainline

Timestamp:

2005-09-03T17:21:43Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

4533601

Parents:

6401f79

Message:

Symbols now include filename

Files:

• include/symtab.h (modified) (1 diff)
• src/debug/genmap.py (modified) (3 diffs)

include/symtab.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-#define MAX_SYMBOL_NAME 32
+#define MAX_SYMBOL_NAME 64
 
 struct symtab_entry {

src/debug/genmap.py

@@ -6 +6 @@
 
 symline = re.compile(r'(0x[a-f0-9]+)\s+([^\s]+)$')
-symtabfmt = "<Q32s"
-MAXSTRING=31
+fileline = re.compile(r'[^\s]+\s+0x[a-f0-9]+\s+0x[a-f0-9]+\s+([^\s]+\.o)$')
+
+MAXSTRING=63
+symtabfmt = "<Q%ds" % (MAXSTRING+1)
 
 def read_symbols(inp):
@@ -18 +20 @@
 
     symtable = {}
+    filename = ''
     while 1:
         line = inp.readline()
@@ -25 +28 @@
             break
         line = line.strip()
-        # Search only for symbols
+        # Search for file name
+        res = fileline.match(line)
+        if res:
+            filename = res.group(1)
+        # Search for symbols
         res = symline.match(line)
         if res:
-            symtable[int(res.group(1),16)] = res.group(2)
+            symtable[int(res.group(1),16)] = filename + ':' + res.group(2)
     return symtable