Changeset d0da921 in mainline

Timestamp:

2006-03-12T16:50:33Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

c102a5c8

Parents:

cfad878

Message:

Allow direct address specification.

File:

• generic/src/console/kconsole.c (modified) (2 diffs)

generic/src/console/kconsole.c

@@ -429 +429 @@
         
         /* If we get a name, try to find it in symbol table */
+        if (text[0] == '&') {
+                isaddr = true;
+                text++;len--;
+        } else if (text[0] == '*') {
+                isptr = true;
+                text++;len--;
+        }
         if (text[0] < '0' || text[0] > '9') {
-                if (text[0] == '&') {
-                        isaddr = true;
-                        text++;len--;
-                } else if (text[0] == '*') {
-                        isptr = true;
-                        text++;len--;
-                }
                 strncpy(symname, text, min(len+1, MAX_SYMBOL_NAME));
                 symaddr = get_symbol_addr(symname);
@@ -448 +448 @@
                         return -1;
                 }
-                if (isaddr)
-                        *result = (__native)symaddr;
-                else if (isptr)
-                        *result = **((__native **)symaddr);
-                else
-                        *result = *((__native *)symaddr);
         } else /* It's a number - convert it */
                 *result = atoi(text);
+
+        if (isaddr)
+                *result = (__native)symaddr;
+        else if (isptr)
+                *result = **((__native **)symaddr);
+        else
+                *result = *((__native *)symaddr);
+
         return 0;
 }