Changeset 25a76ab8 in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/generic/src/console/cmd.c

@@ -837 +837 @@
         bool pointer = false;
         int rc;
-
-        if (((char *)argv->buffer)[0] == '*') {
+        
+        if (((char *) argv->buffer)[0] == '*') {
                 rc = symtab_addr_lookup((char *) argv->buffer + 1, &addr);
                 pointer = true;
-        } else if (((char *) argv->buffer)[0] >= '0' && 
-                   ((char *)argv->buffer)[0] <= '9') {
-                rc = EOK;
-                addr = atoi((char *)argv->buffer);
-        } else {
+        } else if (((char *) argv->buffer)[0] >= '0' &&
+                   ((char *) argv->buffer)[0] <= '9') {
+                uint64_t value;
+                rc = str_uint64((char *) argv->buffer, NULL, 0, true, &value);
+                if (rc == EOK)
+                        addr = (uintptr_t) value;
+        } else
                 rc = symtab_addr_lookup((char *) argv->buffer, &addr);
-        }
-
+        
         if (rc == ENOENT)
                 printf("Symbol %s not found.\n", argv->buffer);
+        else if (rc == EINVAL)
+                printf("Invalid address.\n");
         else if (rc == EOVERFLOW) {
                 symtab_print_search((char *) argv->buffer);
-                printf("Duplicate symbol, be more specific.\n");
+                printf("Duplicate symbol (be more specific) or address overflow.\n");
         } else if (rc == EOK) {
                 if (pointer)
@@ -859 +862 @@
                 printf("Writing %#" PRIx64 " -> %p\n", arg1, addr);
                 *(uint32_t *) addr = arg1;
-        } else {
+        } else
                 printf("No symbol information available.\n");
-        }
         
         return 1;