Changeset 4ce914d4 in mainline

Timestamp:

2010-04-30T23:10:12Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0c42638, bb252ca

Parents:

bcb6f27

Message:

get rid of atoi, use str_uint64

Location:

kernel/generic

Files:

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

kernel/generic/include/func.h

@@ -42 +42 @@
 
 extern void halt(void) __attribute__((noreturn));
-extern unative_t atoi(const char *text);
 
 #endif

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;

kernel/generic/src/console/kconsole.c

@@ -455 +455 @@
                         printf("No symbol information available.\n");
                         return false;
-                }
-                
-                if (isaddr)
-                        *result = (unative_t) symaddr;
-                else if (isptr)
-                        *result = **((unative_t **) symaddr);
-                else
-                        *result = *((unative_t *) symaddr);
+                case EOK:
+                        if (isaddr)
+                                *result = (unative_t) symaddr;
+                        else if (isptr)
+                                *result = **((unative_t **) symaddr);
+                        else
+                                *result = *((unative_t *) symaddr);
+                        break;
+                default:
+                        printf("Unknown error.\n");
+                        return false;
+                }
         } else {
                 /* It's a number - convert it */
-                *result = atoi(text);
-                if (isptr)
-                        *result = *((unative_t *) *result);
+                uint64_t value;
+                int rc = str_uint64(text, NULL, 0, true, &value);
+                switch (rc) {
+                case EINVAL:
+                        printf("Invalid number.\n");
+                        return false;
+                case EOVERFLOW:
+                        printf("Integer overflow.\n");
+                        return false;
+                case EOK:
+                        *result = (unative_t) value;
+                        if (isptr)
+                                *result = *((unative_t *) *result);
+                        break;
+                default:
+                        printf("Unknown error.\n");
+                        return false;
+                }
         }
         

kernel/generic/src/lib/func.c

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -33 +33 @@
 /**
  * @file
- * @brief       Miscellaneous functions.
+ * @brief Miscellaneous functions.
  */
 
@@ -79 +79 @@
 }
 
-/** Convert ascii representation to unative_t
- *
- * Supports 0x for hexa & 0 for octal notation.
- * Does not check for overflows, does not support negative numbers
- *
- * @param text Textual representation of number
- * @return Converted number or 0 if no valid number ofund 
- */
-unative_t atoi(const char *text)
-{
-        int base = 10;
-        unative_t result = 0;
-
-        if (text[0] == '0' && text[1] == 'x') {
-                base = 16;
-                text += 2;
-        } else if (text[0] == '0')
-                base = 8;
-
-        while (*text) {
-                if (base != 16 && \
-                    ((*text >= 'A' && *text <= 'F' )
-                     || (*text >='a' && *text <='f')))
-                        break;
-                if (base == 8 && *text >='8')
-                        break;
-
-                if (*text >= '0' && *text <= '9') {
-                        result *= base;
-                        result += *text - '0';
-                } else if (*text >= 'A' && *text <= 'F') {
-                        result *= base;
-                        result += *text - 'A' + 10;
-                } else if (*text >= 'a' && *text <= 'f') {
-                        result *= base;
-                        result += *text - 'a' + 10;
-                } else
-                        break;
-                text++;
-        }
-
-        return result;
-}
-
 /** @}
  */

kernel/generic/src/lib/str.c

@@ -823 +823 @@
                                 str++;
                                 break;
+                        default:
+                                str--;
                         }
                 }
@@ -886 +888 @@
  * @param base   Zero or number between 2 and 36 inclusive.
  * @param strict Do not allow any trailing characters.
- * @apram result Result of the conversion.
+ * @param result Result of the conversion.
  *
  * @return EOK if conversion was successful.