Changeset 91c78c9 in mainline

Timestamp:

2005-12-10T16:02:39Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

adb2ebf8

Parents:

5bb20ec

Message:

String constants without spaces are now supported by call commands.
For more we would need some lexer.
The call? commands are not compatibile with stdarg functions on AMD
architectures, because of the calling sequence.

Location:

generic

Files:

• include/console/kconsole.h (modified) (2 diffs)
• src/console/kconsole.c (modified) (10 diffs)
• src/lib/func.c (modified) (1 diff)

generic/include/console/kconsole.h

@@ -37 +37 @@
         ARG_TYPE_INVALID = 0,
         ARG_TYPE_INT,
-        ARG_TYPE_STRING
+        ARG_TYPE_STRING,
+        ARG_TYPE_VAR      /**< Variable type - either symbol or string */
 };
 
@@ -46 +47 @@
         size_t len;                     /**< Size of the buffer. */
         __native intval;                /**< Integer value */
+        cmd_arg_type_t vartype;         /**< Resulting type of variable arg */
 };
 

generic/src/console/kconsole.c

@@ -117 +117 @@
 /** 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);
@@ -139 +141 @@
                 .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 = {
@@ -156 +162 @@
                 .len = sizeof(call0_buf)
         },
-        { .type = ARG_TYPE_INT },
-        { .type = ARG_TYPE_INT }
+        { 
+                .type = ARG_TYPE_VAR,
+                .buffer = carg1_buf,
+                .len = sizeof(carg1_buf)
+        },
+        { 
+                .type = ARG_TYPE_VAR,
+                .buffer = carg2_buf,
+                .len = sizeof(carg2_buf)
+        }
 };
 static cmd_info_t call2_info = {
@@ -306 +320 @@
 }
 
+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.
  *
@@ -371 +417 @@
                 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: {
-                        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') {
-                                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) {
-                                        printf("Duplicate symbol %s.\n",symname);
-                                        symtab_print_search(symname);
-                                        return NULL;
-                                }
-                                cmd->argv[i].intval = *((__native *)symaddr);
-                        } else /* It's a number - convert it */
-                                cmd->argv[i].intval = atoi(cmdline+start);
+                case ARG_TYPE_INT: 
+                        if (parse_int_arg(cmdline+start, end-start+1, 
+                                          &cmd->argv[i].intval))
+                                return NULL;
                         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:
@@ -538 +583 @@
         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);
@@ -562 +607 @@
         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);
@@ -581 +626 @@
         __address symaddr;
         char *symbol;
-        __native (*f)(__native);
+        __native (*f)(__native,__native);
         __native arg1 = argv[1].intval;
         __native arg2 = argv[2].intval;
@@ -587 +632 @@
         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);
@@ -595 +640 @@
                 printf("Calling f(0x%x,0x%x): 0x%p: %s\n", 
                        arg1, arg2, symaddr, symbol);
-                f =  (__native (*)(__native)) symaddr;
-                printf("Result: 0x%x\n", f(arg1));
+                f =  (__native (*)(__native,__native)) symaddr;
+                printf("Result: 0x%x\n", f(arg1, arg2));
         }
         

generic/src/lib/func.c

@@ -113 +113 @@
                         return;
         }
+        dest[i-1] = '\0';
 }