Changeset e2b762ec in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2009-03-16T21:58:05Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

f36c061

Parents:

d9167a1c

Message:

Make kernel symbol information optional.

File:

• kernel/generic/src/console/cmd.c (modified) (16 diffs)

kernel/generic/src/console/cmd.c

@@ -54 +54 @@
 #include <macros.h>
 #include <debug.h>
-#include <symtab.h>
 #include <cpu.h>
 #include <mm/tlb.h>
@@ -67 +66 @@
 #include <ipc/irq.h>
 
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
+
 #ifdef CONFIG_TEST
 #include <test.h>
@@ -168 +171 @@
 };
 
+#ifdef CONFIG_SYMTAB
 /* Data and methods for 'symaddr' command. */
 static int cmd_symaddr(cmd_arg_t *argv);
@@ -183 +187 @@
         .argv = &symaddr_argv
 };
+#endif
 
 static char set_buf[MAX_CMDLINE+1];
@@ -459 +464 @@
         &set4_info,
         &slabs_info,
+#ifdef CONFIG_SYMTAB
         &symaddr_info,
+#endif
         &sched_info,
         &threads_info,
@@ -606 +613 @@
 }
 
+#ifdef CONFIG_SYMTAB
+
 /** Search symbol table */
 int cmd_symaddr(cmd_arg_t *argv)
@@ -614 +623 @@
 }
 
+#endif
+
 /** Call function with zero parameters */
 int cmd_call0(cmd_arg_t *argv)
 {
+#ifdef CONFIG_SYMTAB
         uintptr_t symaddr;
-        char *symbol;
         unative_t (*fnc)(void);
         fncptr_t fptr;
-        
+
         symaddr = get_symbol_addr((char *) argv->buffer);
         if (!symaddr)
@@ -629 +640 @@
                 printf("Duplicate symbol, be more specific.\n");
         } else {
-                symbol = get_symtab_entry(symaddr);
                 fnc = (unative_t (*)(void)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call0);
-                printf("Calling %s() (%p)\n", symbol, symaddr);
+                printf("Calling %s() (%p)\n", argv->buffer, symaddr);
                 printf("Result: %#" PRIxn "\n", fnc());
         }
-        
+#endif
         return 1;
 }
@@ -670 +680 @@
 int cmd_call1(cmd_arg_t *argv)
 {
+#ifdef CONFIG_SYMTAB
         uintptr_t symaddr;
         char *symbol;
@@ -677 +688 @@
         
         symaddr = get_symbol_addr((char *) argv->buffer);
+
         if (!symaddr)
                 printf("Symbol %s not found.\n", argv->buffer);
@@ -688 +700 @@
                 printf("Result: %#" PRIxn "\n", fnc(arg1));
         }
-        
+#endif
         return 1;
 }
@@ -695 +707 @@
 int cmd_call2(cmd_arg_t *argv)
 {
+#ifdef CONFIG_SYMTAB
         uintptr_t symaddr;
         char *symbol;
@@ -714 +727 @@
                        arg1, arg2, symaddr, symbol);
                 printf("Result: %#" PRIxn "\n", fnc(arg1, arg2));
-        }
-        
+        }       
+#endif
         return 1;
 }
@@ -722 +735 @@
 int cmd_call3(cmd_arg_t *argv)
 {
+#ifdef CONFIG_SYMTAB
         uintptr_t symaddr;
         char *symbol;
@@ -743 +757 @@
                 printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3));
         }
-        
+#endif
         return 1;
 }
@@ -798 +812 @@
 
         if (((char *)argv->buffer)[0] == '*') {
+#ifdef CONFIG_SYMTAB
                 addr = (uint32_t *) get_symbol_addr((char *) argv->buffer + 1);
+#else
+                addr = 0;
+#endif
                 pointer = true;
         } else if (((char *) argv->buffer)[0] >= '0' && 
-                   ((char *)argv->buffer)[0] <= '9')
+                   ((char *)argv->buffer)[0] <= '9') {
                 addr = (uint32_t *)atoi((char *)argv->buffer);
-        else
+        } else {
+#ifdef CONFIG_SYMTAB
                 addr = (uint32_t *)get_symbol_addr((char *) argv->buffer);
+#else
+                addr = 0;
+#endif
+        }
 
         if (!addr)
                 printf("Symbol %s not found.\n", argv->buffer);
         else if (addr == (uint32_t *) -1) {
+#ifdef CONFIG_SYMTAB
                 symtab_print_search((char *) argv->buffer);
+#endif
                 printf("Duplicate symbol, be more specific.\n");
         } else {