Changeset 2312685 in mainline

Timestamp:

2005-12-10T18:02:51Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

3887b105

Parents:

7a8c866a

Message:

Fixes in new console.

Location:

generic/src

Files:

• console/kconsole.c (modified) (4 diffs)
• lib/func.c (modified) (2 diffs)
• mm/heap.c (modified) (1 diff)

generic/src/console/kconsole.c

@@ -119 +119 @@
 static char carg1_buf[MAX_CMDLINE+1];
 static char carg2_buf[MAX_CMDLINE+1];
+static char carg3_buf[MAX_CMDLINE+1];
 
 static int cmd_call0(cmd_arg_t *argv);
@@ -181 +182 @@
 };
 
+static int cmd_call3(cmd_arg_t *argv);
+static cmd_arg_t call3_argv[] = {
+        {
+                .type = ARG_TYPE_STRING,
+                .buffer = call0_buf,
+                .len = sizeof(call0_buf)
+        },
+        { 
+                .type = ARG_TYPE_VAR,
+                .buffer = carg1_buf,
+                .len = sizeof(carg1_buf)
+        },
+        { 
+                .type = ARG_TYPE_VAR,
+                .buffer = carg2_buf,
+                .len = sizeof(carg2_buf)
+        },
+        { 
+                .type = ARG_TYPE_VAR,
+                .buffer = carg3_buf,
+                .len = sizeof(carg3_buf)
+        }
+
+};
+static cmd_info_t call3_info = {
+        .name = "call3",
+        .description = "call3 <function> <arg1> <arg2> <arg3> -> call function(arg1,arg2,arg3).",
+        .func = cmd_call3,
+        .argc = 4,
+        .argv = call3_argv
+};
 
 /** Data and methods for 'halt' command. */
@@ -228 +260 @@
         if (!cmd_register(&call2_info))
                 panic("could not register command %s\n", call2_info.name);
+
+        spinlock_initialize(&call3_info.lock, "kconsole_call3");
+        link_initialize(&call3_info.link);
+        if (!cmd_register(&call3_info))
+                panic("could not register command %s\n", call3_info.name);
         
         spinlock_initialize(&halt_info.lock, "kconsole_halt");
@@ -653 +690 @@
 }
 
+/** Call function with three parameters */
+int cmd_call3(cmd_arg_t *argv)
+{
+        __address symaddr;
+        char *symbol;
+        __native (*f)(__native,__native,__native);
+        __native arg1 = argv[1].intval;
+        __native arg2 = argv[2].intval;
+        __native arg3 = argv[3].intval;
+
+        symaddr = get_symbol_addr(argv->buffer);
+        if (!symaddr)
+                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%x): 0x%p: %s\n", 
+                       arg1, arg2, arg3, symaddr, symbol);
+                f =  (__native (*)(__native,__native,__native)) symaddr;
+                printf("Result: 0x%x\n", f(arg1, arg2, arg3));
+        }
+        
+        return 1;
+}
+
 
 /** Print detailed description of 'describe' command. */

generic/src/lib/func.c

@@ -136 +136 @@
 
         while (*text) {
-                result *= base;
                 if (base != 16 && *text >= 'A' && *text <= 'F')
                         break;
@@ -142 +141 @@
                         break;
 
-                if (*text >= '0' && *text <= '9')
+                if (*text >= '0' && *text <= '9') {
+                        result *= base;
                         result += *text - '0';
-                else if (*text >= 'A' && *text <= 'F')
+                } else if (*text >= 'A' && *text <= 'F') {
+                        result *= base;
                         result += *text - 'A' + 10;
-                else
+                } else
                         break;
                 text++;

generic/src/mm/heap.c

@@ -65 +65 @@
         chunk_t *x, *y, *z;
 
-        size = ALIGN_UP(size, sizeof(__native));
-
         if (size == 0)
                 panic("zero-size allocation request");
                 
+        size = ALIGN_UP(size, sizeof(__native));
+
         x = chunk0;
         ipl = interrupts_disable();