WebSVN – HelenOS – Diff – /branches/dd/kernel/generic/src/console/cmd.c

 #include <arch/types.h>
 #include <adt/list.h>
 #include <arch.h>
 #include <config.h>
 #include <func.h>
+#include <string.h>
 #include <macros.h>
 #include <debug.h>
 #include <symtab.h>
 #include <cpu.h>
 #include <mm/tlb.h>
     .description = "List of memory zones.",
     .func = cmd_zones,
     .argc = 0
 };
-/* Data and methods for 'ipc_task' command */
+/* Data and methods for 'ipc' command */
-static int cmd_ipc_task(cmd_arg_t *argv);
+static int cmd_ipc(cmd_arg_t *argv);
-static cmd_arg_t ipc_task_argv = {
+static cmd_arg_t ipc_argv = {
     .type = ARG_TYPE_INT,
 };
-static cmd_info_t ipc_task_info = {
+static cmd_info_t ipc_info = {
-    .name = "ipc_task",
+    .name = "ipc",
-    .description = "ipc_task <taskid> Show IPC information of given task.",
+    .description = "ipc <taskid> Show IPC information of given task.",
-    .func = cmd_ipc_task,
+    .func = cmd_ipc,
     .argc = 1,
-    .argv = &ipc_task_argv
+    .argv = &ipc_argv
 };
 /* Data and methods for 'zone' command */
 static int cmd_zone(cmd_arg_t *argv);
 static cmd_arg_t zone_argv = {
     &exit_info,
     &reboot_info,
     &uptime_info,
     &halt_info,
     &help_info,
-    &ipc_task_info,
+    &ipc_info,
     &set4_info,
     &slabs_info,
     &symaddr_info,
     &sched_info,
     &threads_info,
     unsigned int i;
     for (i = 0; basic_commands[i]; i++) {
         cmd_initialize(basic_commands[i]);
         if (!cmd_register(basic_commands[i]))
-            panic("could not register command %s\n", basic_commands[i]->name);
+            printf("Cannot register command %s\n", basic_commands[i]->name);
+    }
+}
 /** List supported commands.
+ *
  * @return 0 on failure, 1 on success.
  */
 int cmd_help(cmd_arg_t *argv)
+{
-    link_t *cur;
     spinlock_lock(&cmd_lock);
+    link_t *cur;
+    size_t len = 0;
     for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
         cmd_info_t *hlp;
         hlp = list_get_instance(cur, cmd_info_t, link);
         spinlock_lock(&hlp->lock);
+        if (strlen(hlp->name) > len)
+            len = strlen(hlp->name);
+        spinlock_unlock(&hlp->lock);
+    }
+    for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        cmd_info_t *hlp;
+        hlp = list_get_instance(cur, cmd_info_t, link);
+        spinlock_lock(&hlp->lock);
-        printf("%s - %s\n", hlp->name, hlp->description);
+        printf("%-*s %s\n", len, hlp->name, hlp->description);
         spinlock_unlock(&hlp->lock);
+    }
     spinlock_unlock(&cmd_lock);
     return 1;
+}
 /** Reboot the system.
     ASSERT(uptime);
     /* This doesn't have to be very accurate */
     unative_t sec = uptime->seconds1;
-    printf("Up %u days, %u hours, %u minutes, %u seconds\n",
+    printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n",
         sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);
     return 1;
+}
 /** Call function with zero parameters */
 int cmd_call0(cmd_arg_t *argv)
+{
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*f)(void);
+    unative_t (*fnc)(void);
-#ifdef ia64
-    struct {
-        unative_t f;
-        unative_t gp;
+    fncptr_t fptr;
-    } fptr;
-#endif
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
     else if (symaddr == (uintptr_t) -1) {
         symtab_print_search((char *) argv->buffer);
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
-        printf("Calling %s() (%.*p)\n", symbol, sizeof(uintptr_t) * 2, symaddr);
+        fnc = (unative_t (*)(void)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call0);
-#ifdef ia64
-        fptr.f = symaddr;
-        fptr.gp = ((unative_t *)cmd_call2)[1];
-        f =  (unative_t (*)(void)) &fptr;
-#else
-        f =  (unative_t (*)(void)) symaddr;
+        printf("Calling %s() (%p)\n", symbol, symaddr);
-#endif
-        printf("Result: %#zx\n", f());
+        printf("Result: %#" PRIxn "\n", fnc());
+    }
     return 1;
+}
 /** Call function with one parameter */
 int cmd_call1(cmd_arg_t *argv)
+{
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*f)(unative_t,...);
+    unative_t (*fnc)(unative_t, ...);
     unative_t arg1 = argv[1].intval;
-#ifdef ia64
-    struct {
-        unative_t f;
-        unative_t gp;
+    fncptr_t fptr;
-    }fptr;
-#endif
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
     else if (symaddr == (uintptr_t) -1) {
         symtab_print_search((char *) argv->buffer);
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
-        printf("Calling f(%#zx): %.*p: %s\n", arg1, sizeof(uintptr_t) * 2, symaddr, symbol);
+        fnc = (unative_t (*)(unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call1);
-#ifdef ia64
-        fptr.f = symaddr;
-        fptr.gp = ((unative_t *)cmd_call2)[1];
-        f =  (unative_t (*)(unative_t,...)) &fptr;
-#else
-        f =  (unative_t (*)(unative_t,...)) symaddr;
+        printf("Calling f(%#" PRIxn "): %p: %s\n", arg1, symaddr, symbol);
-#endif
-        printf("Result: %#zx\n", f(arg1));
+        printf("Result: %#" PRIxn "\n", fnc(arg1));
+    }
     return 1;
+}
 /** Call function with two parameters */
 int cmd_call2(cmd_arg_t *argv)
+{
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*f)(unative_t,unative_t,...);
+    unative_t (*fnc)(unative_t, unative_t, ...);
     unative_t arg1 = argv[1].intval;
     unative_t arg2 = argv[2].intval;
-#ifdef ia64
-    struct {
-        unative_t f;
-        unative_t gp;
+    fncptr_t fptr;
-    }fptr;
-#endif
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
     else if (symaddr == (uintptr_t) -1) {
         symtab_print_search((char *) argv->buffer);
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
+        fnc = (unative_t (*)(unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call2);
-        printf("Calling f(0x%zx,0x%zx): %.*p: %s\n",
+        printf("Calling f(%#" PRIxn ", %#" PRIxn "): %p: %s\n",
-               arg1, arg2, sizeof(uintptr_t) * 2, symaddr, symbol);
+               arg1, arg2, symaddr, symbol);
-#ifdef ia64
-        fptr.f = symaddr;
-        fptr.gp = ((unative_t *)cmd_call2)[1];
-        f =  (unative_t (*)(unative_t,unative_t,...)) &fptr;
-#else
-        f =  (unative_t (*)(unative_t,unative_t,...)) symaddr;
-#endif
-        printf("Result: %#zx\n", f(arg1, arg2));
+        printf("Result: %#" PRIxn "\n", fnc(arg1, arg2));
+    }
     return 1;
+}
 /** Call function with three parameters */
 int cmd_call3(cmd_arg_t *argv)
+{
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*f)(unative_t,unative_t,unative_t,...);
+    unative_t (*fnc)(unative_t, unative_t, unative_t, ...);
     unative_t arg1 = argv[1].intval;
     unative_t arg2 = argv[2].intval;
     unative_t arg3 = argv[3].intval;
-#ifdef ia64
-    struct {
-        unative_t f;
-        unative_t gp;
+    fncptr_t fptr;
-    }fptr;
-#endif
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
     else if (symaddr == (uintptr_t) -1) {
         symtab_print_search((char *) argv->buffer);
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
+        fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call3);
-        printf("Calling f(0x%zx,0x%zx, 0x%zx): %.*p: %s\n",
+        printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n",
-               arg1, arg2, arg3, sizeof(uintptr_t) * 2, symaddr, symbol);
+               arg1, arg2, arg3, symaddr, symbol);
-#ifdef ia64
-        fptr.f = symaddr;
-        fptr.gp = ((unative_t *)cmd_call2)[1];
-        f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) &fptr;
-#else
-        f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) symaddr;
-#endif
-        printf("Result: %#zx\n", f(arg1, arg2, arg3));
+        printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3));
+    }
     return 1;
+}
         symtab_print_search((char *) argv->buffer);
         printf("Duplicate symbol, be more specific.\n");
     } else {
         if (pointer)
             addr = (uint32_t *)(*(unative_t *)addr);
-        printf("Writing 0x%x -> %.*p\n", arg1, sizeof(uintptr_t) * 2, addr);
+        printf("Writing %#" PRIx64 " -> %p\n", arg1, addr);
         *addr = arg1;
+    }
     return 1;
+ *
  * @param argv Integer argument from cmdline expected
+ *
  * return Always 1
  */
-int cmd_ipc_task(cmd_arg_t * argv) {
+int cmd_ipc(cmd_arg_t * argv) {
     ipc_print_task(argv[0].intval);
     return 1;
+}
  * return Always 1.
  */
 int cmd_continue(cmd_arg_t *argv)
+{
     printf("The kernel will now relinquish the console.\n");
+    release_console();
-    printf("Use userspace controls to redraw the screen.\n");
+    if ((kconsole_notify) && (kconsole_irq.notif_cfg.notify))
-    arch_release_console();
+        ipc_irq_send_msg_0(&kconsole_irq);
     return 1;
+}
 #ifdef CONFIG_TEST
 /** Command for printing kernel tests list.
+ *
  * return Always 1.
  */
 int cmd_tests(cmd_arg_t *argv)
+{
+    size_t len = 0;
     test_t *test;
+    for (test = tests; test->name != NULL; test++) {
+        if (strlen(test->name) > len)
+            len = strlen(test->name);
+    }
     for (test = tests; test->name != NULL; test++)
-        printf("%s\t\t%s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+        printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
-    printf("*\t\tRun all safe tests\n");
+    printf("%-*s Run all safe tests\n", len, "*");
     return 1;
+}
 static bool run_test(const test_t *test)
+{
-    printf("%s\t\t%s\n", test->name, test->desc);
+    printf("%s (%s)\n", test->name, test->desc);
     /* Update and read thread accounting
        for benchmarking */
     ipl_t ipl = interrupts_disable();
     spinlock_lock(&TASK->lock);
     uint64_t cycles;
     char suffix;
     order(dt, &cycles, &suffix);
-    printf("Time: %llu%c cycles\n", cycles, suffix);
+    printf("Time: %" PRIu64 "%c cycles\n", cycles, suffix);
     if (ret == NULL) {
         printf("Test passed\n");
         return true;
+    }
         printf("Error allocating memory for statistics\n");
         return false;
+    }
     for (i = 0; i < cnt; i++) {
-        printf("%s (%d/%d) ... ", test->name, i + 1, cnt);
+        printf("%s (%u/%u) ... ", test->name, i + 1, cnt);
         /* Update and read thread accounting
            for benchmarking */
         ipl_t ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
             break;
+        }
         data[i] = dt;
         order(dt, &cycles, &suffix);
-        printf("OK (%llu%c cycles)\n", cycles, suffix);
+        printf("OK (%" PRIu64 "%c cycles)\n", cycles, suffix);
+    }
     if (ret) {
         printf("\n");
         for (i = 0; i < cnt; i++) {
             sum += data[i];
+        }
         order(sum / (uint64_t) cnt, &cycles, &suffix);
-        printf("Average\t\t%llu%c\n", cycles, suffix);
+        printf("Average\t\t%" PRIu64 "%c\n", cycles, suffix);
+    }
     free(data);
     return ret;

Subversion Repositories HelenOS

(root)/branches/dd/kernel/generic/src/console/cmd.c – Rev 3022 → 4055