Changeset e16e0d59 in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2009-03-17T20:33:18Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

5eb90cb

Parents:

b1c8dc0

Message:

Make optionality of symbol information less intrusive per Jakub's request. Also, improve symtab function names and update their semantics.

File:

• kernel/generic/src/console/kconsole.c (modified) (4 diffs)

kernel/generic/src/console/kconsole.c

@@ -54 +54 @@
 #include <sysinfo/sysinfo.h>
 #include <ddi/device.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
+#include <errno.h>
 
 /** Simple kernel console.
@@ -350 +348 @@
                                 found = cmdtab_compl(tmp);
                         } else { /* Symtab completion */
-#ifdef CONFIG_SYMTAB
                                 found = symtab_compl(tmp);
-#else
-                                found = 0;
-#endif
                         }
 
@@ -525 +519 @@
         bool isaddr = false;
         bool isptr = false;
-
-#ifdef CONFIG_SYMTAB
+        int rc;
+
         static char symname[MAX_SYMBOL_NAME];
-#endif
         
         /* If we get a name, try to find it in symbol table */
@@ -541 +534 @@
         }
         if (text[0] < '0' || text[0] > '9') {
-#ifdef CONFIG_SYMTAB
                 strncpy(symname, text, min(len + 1, MAX_SYMBOL_NAME));
-                symaddr = get_symbol_addr(symname);
-                if (!symaddr) {
+                rc = symtab_addr_lookup(symname, &symaddr);
+                switch (rc) {
+                case ENOENT:
                         printf("Symbol %s not found.\n", symname);
                         return -1;
-                }
-                if (symaddr == (uintptr_t) -1) {
+                case EOVERFLOW:
                         printf("Duplicate symbol %s.\n", symname);
                         symtab_print_search(symname);
                         return -1;
-                }
-#else
-                symaddr = 0;
-#endif
+                default:
+                        printf("No symbol information available.\n");
+                        return -1;
+                }
+
                 if (isaddr)
                         *result = (unative_t)symaddr;