DEC_NEG_OK,
DEC_POS_OK,
FLOAT_POS_OK,
- FLOAT_NEG_OK,
+ FLOAT_NEG_OK
};
/* Keep it sync with enum in .h */
static const char * num_help[] = {
- "UINT8", "UINT16", "UINT32",
- "INT8", "INT16", "INT32",
-#ifndef CMDLINE_NO_FLOAT
+ "UINT8", "UINT16", "UINT32", "UINT64",
+ "INT8", "INT16", "INT32", "INT64",
+#ifdef CMDLINE_HAVE_FLOAT
"FLOAT",
#endif
};
static inline int
-add_to_res(unsigned int c, unsigned int *res, unsigned int base)
+add_to_res(unsigned int c, uint64_t *res, unsigned int base)
{
/* overflow */
- if ( (UINT32_MAX - c) / base < *res ) {
+ if ( (UINT64_MAX - c) / base < *res ) {
return -1;
}
- *res = *res * base + c ;
+ *res = (uint64_t) (*res * base + c);
return 0;
}
enum num_parse_state_t st = START;
const char * buf = srcbuf;
char c = *buf;
- uint32_t res1 = 0;
-#ifndef CMDLINE_NO_FLOAT
- uint32_t res2 = 0, res3 = 1;
+ uint64_t res1 = 0;
+#ifdef CMDLINE_HAVE_FLOAT
+ uint64_t res2 = 0, res3 = 1;
#endif
memcpy(&nd, &((struct cmdline_token_num *)tk)->num_data, sizeof(nd));
else if (c == '0') {
st = ZERO_OK;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
else if (c == 'b') {
st = BIN;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
else
st = DEC_NEG_OK;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
res1 = 0;
st = FLOAT_NEG;
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
st = FLOAT_NEG;
}
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
st = FLOAT_POS;
}
}
break;
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
case FLOAT_POS:
if (c >= '0' && c <= '9') {
if (add_to_res(c - '0', &res2, 10) < 0)
}
-#ifdef CMDLINE_NO_FLOAT
- debug_printf("(%"PRIu32")\n", res1);
-#else
+#ifdef CMDLINE_HAVE_FLOAT
debug_printf("(%"PRIu32") (%"PRIu32") (%"PRIu32")\n",
res1, res2, res3);
+#else
+ debug_printf("(%"PRIu32")\n", res1);
#endif
buf ++;
*(uint32_t *)res = (uint32_t) res1;
return (buf-srcbuf);
}
-#ifndef CMDLINE_NO_FLOAT
+ else if ( nd.type == UINT64 ) {
+ if (res)
+ *(uint64_t *)res = res1;
+ return (buf-srcbuf);
+ }
+#ifdef CMDLINE_HAVE_FLOAT
else if ( nd.type == FLOAT ) {
if (res)
*(float *)res = (float)res1;
case DEC_NEG_OK:
if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) {
if (res)
- *(int8_t *)res = - (int8_t) res1;
+ *(int8_t *)res = (int8_t) (-res1);
return (buf-srcbuf);
}
else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) {
if (res)
- *(int16_t *)res = - (int16_t) res1;
+ *(int16_t *)res = (int16_t) (-res1);
return (buf-srcbuf);
}
else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) {
if (res)
- *(int32_t *)res = - (int32_t) res1;
+ *(int32_t *)res = (int32_t) (-res1);
return (buf-srcbuf);
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if ( nd.type == FLOAT ) {
if (res)
*(float *)res = - (float)res1;
}
break;
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
case FLOAT_POS:
case FLOAT_POS_OK:
if ( nd.type == FLOAT ) {
debug_printf("error\n");
return -1;
}
- return -1;
}