WebSVN – HelenOS-historic – Diff – /kernel/trunk/generic/src/console/kconsole.c

     .argv = &symaddr_argv
 };
 /** Call0 - call function with no parameters */
 static char call0_buf[MAX_CMDLINE+1];
+static char carg1_buf[MAX_CMDLINE+1];
+static char carg2_buf[MAX_CMDLINE+1];
 static int cmd_call0(cmd_arg_t *argv);
 static cmd_arg_t call0_argv = {
     .type = ARG_TYPE_STRING,
     .buffer = call0_buf,
+    {
         .type = ARG_TYPE_STRING,
         .buffer = call0_buf,
         .len = sizeof(call0_buf)
     },
+    {
-    { .type = ARG_TYPE_INT }
+        .type = ARG_TYPE_VAR,
+        .buffer = carg1_buf,
+        .len = sizeof(carg1_buf)
+    }
 };
 static cmd_info_t call1_info = {
     .name = "call1",
     .description = "call1 <function> <arg1> -> call function(arg1).",
     .func = cmd_call1,
+    {
         .type = ARG_TYPE_STRING,
         .buffer = call0_buf,
         .len = sizeof(call0_buf)
     },
+    {
-    { .type = ARG_TYPE_INT },
+        .type = ARG_TYPE_VAR,
+        .buffer = carg1_buf,
+        .len = sizeof(carg1_buf)
+    },
+    {
-    { .type = ARG_TYPE_INT }
+        .type = ARG_TYPE_VAR,
+        .buffer = carg2_buf,
+        .len = sizeof(carg2_buf)
+    }
 };
 static cmd_info_t call2_info = {
     .name = "call2",
     .description = "call2 <function> <arg1> <arg2> -> call function(arg1,arg2).",
     .func = cmd_call2,
             continue;
         (void) cmd_info->func(cmd_info->argv);
+    }
+}
+static int parse_int_arg(char *text, size_t len, __native *result)
+{
+    char symname[MAX_SYMBOL_NAME];
+    __address symaddr;
+    bool isaddr = false;
+    /* If we get a name, try to find it in symbol table */
+    if (text[0] < '0' | text[0] > '9') {
+        if (text[0] == '&') {
+            isaddr = true;
+            text++;len--;
+        }
+        strncpy(symname, text, min(len+1, MAX_SYMBOL_NAME));
+        symaddr = get_symbol_addr(symname);
+        if (!symaddr) {
+            printf("Symbol %s not found.\n",symname);
+            return -1;
+        }
+        if (symaddr == (__address) -1) {
+            printf("Duplicate symbol %s.\n",symname);
+            symtab_print_search(symname);
+            return -1;
+        }
+        if (isaddr)
+            *result = (__native)symaddr;
+        else
+            *result = *((__native *)symaddr);
+    } else /* It's a number - convert it */
+        *result = atoi(text);
+    return 0;
+}
 /** Parse command line.
+ *
  * @param cmdline Command line as read from input device.
  * @param len Command line length.
+ *
+        }
         switch (cmd->argv[i].type) {
         case ARG_TYPE_STRING:
                 buf = cmd->argv[i].buffer;
-                strncpy(buf, (const char *) &cmdline[start], min((end - start) + 1, cmd->argv[i].len - 1));
+                strncpy(buf, (const char *) &cmdline[start], min((end - start) + 2, cmd->argv[i].len));
             buf[min((end - start) + 1, cmd->argv[i].len - 1)] = '\0';
             break;
-        case ARG_TYPE_INT: {
+        case ARG_TYPE_INT:
-            char symname[MAX_SYMBOL_NAME];
-            __address symaddr;
-            /* If we get a name, try to find it in symbol table */
-            if (cmdline[start] < '0' | cmdline[start] > '9') {
+            if (parse_int_arg(cmdline+start, end-start+1,
-                strncpy(symname, cmdline+start, min((end-start) + 1, MAX_SYMBOL_NAME -1 ));
-                symaddr = get_symbol_addr(symname);
-                if (!symaddr) {
-                    printf("Symbol %s not found.\n",symname);
-                    return NULL;
-                }
-                if (symaddr == (__address) -1) {
+                      &cmd->argv[i].intval))
-                    printf("Duplicate symbol %s.\n",symname);
-                    symtab_print_search(symname);
-                    return NULL;
+                return NULL;
-                }
-                cmd->argv[i].intval = *((__native *)symaddr);
-            } else /* It's a number - convert it */
-                cmd->argv[i].intval = atoi(cmdline+start);
             break;
+        case ARG_TYPE_VAR:
+            if (start != end && cmdline[start] == '"' && cmdline[end] == '"') {
+                buf = cmd->argv[i].buffer;
+                strncpy(buf, (const char *) &cmdline[start+1],
+                    min((end-start), cmd->argv[i].len));
+                buf[min((end - start), cmd->argv[i].len - 1)] = '\0';
+                cmd->argv[i].intval = (__native) buf;
+                cmd->argv[i].vartype = ARG_TYPE_STRING;
+            } else if (!parse_int_arg(cmdline+start, end-start+1,
+                         &cmd->argv[i].intval))
+                cmd->argv[i].vartype = ARG_TYPE_INT;
+            else {
+                printf("Unrecognized variable argument.\n");
+                return NULL;
+            }
+            break;
         case ARG_TYPE_INVALID:
         default:
             printf("invalid argument type\n");
             return NULL;
             break;
     char *symbol;
     __native (*f)(void);
     symaddr = get_symbol_addr(argv->buffer);
     if (!symaddr)
-        printf("Symbol not found.\n");
+        printf("Symbol %s not found.\n", argv->buffer);
     else if (symaddr == (__address) -1) {
         symtab_print_search(argv->buffer);
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
     __native (*f)(__native);
     __native arg1 = argv[1].intval;
     symaddr = get_symbol_addr(argv->buffer);
     if (!symaddr)
-        printf("Symbol not found.\n");
+        printf("Symbol %s not found.\n", argv->buffer);
     else if (symaddr == (__address) -1) {
         symtab_print_search(argv->buffer);
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
 /** Call function with two parameters */
 int cmd_call2(cmd_arg_t *argv)
+{
     __address symaddr;
     char *symbol;
-    __native (*f)(__native);
+    __native (*f)(__native,__native);
     __native arg1 = argv[1].intval;
     __native arg2 = argv[2].intval;
     symaddr = get_symbol_addr(argv->buffer);
     if (!symaddr)
-        printf("Symbol not found.\n");
+        printf("Symbol %s not found.\n", argv->buffer);
     else if (symaddr == (__address) -1) {
         symtab_print_search(argv->buffer);
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
         printf("Calling f(0x%x,0x%x): 0x%p: %s\n",
                arg1, arg2, symaddr, symbol);
-        f =  (__native (*)(__native)) symaddr;
+        f =  (__native (*)(__native,__native)) symaddr;
-        printf("Result: 0x%x\n", f(arg1));
+        printf("Result: 0x%x\n", f(arg1, arg2));
+    }
     return 1;
+}

Subversion Repositories HelenOS-historic

(root)/kernel/trunk/generic/src/console/kconsole.c @ 1780 – Rev 582 → 585