Move definition of parse_type helpers to command.c:
- Add declarations in header file.
- Improve wrapper implementations to check for underflow.
---
command.c | 29 +++++++++++++++++++++++++++++
command.h | 30 ++++++++++--------------------
2 files changed, 39 insertions(+), 20 deletions(-)
======
diff -u src/helper/command.c src/helper/command.c
--- src/helper/command.c (working copy)
+++ src/helper/command.c (working copy)
@@ -882,0 +883,29 @@
+
+#define DEFINE_PARSE_WRAPPER(name, type, min, max, functype, funcname) \
+ int parse_##name(const char *str, type *ul) \
+ { \
+ functype n; \
+ int retval = parse##funcname(str, &n); \
+ if (ERROR_OK != retval) \
+ return retval; \
+ if (n > max) \
+ return ERROR_COMMAND_SYNTAX_ERROR; \
+ if (min) \
+ return ERROR_COMMAND_SYNTAX_ERROR; \
+ *ul = n; \
+ return ERROR_OK; \
+ }
+
+#define DEFINE_PARSE_ULONG(name, type, min, max) \
+ DEFINE_PARSE_WRAPPER(name, type, min, max, unsigned long, _ulong)
+DEFINE_PARSE_ULONG(uint, unsigned, 0, UINT_MAX)
+DEFINE_PARSE_ULONG(u32, uint32_t, 0, UINT32_MAX)
+DEFINE_PARSE_ULONG(u16, uint16_t, 0, UINT16_MAX)
+DEFINE_PARSE_ULONG(u8, uint8_t, 0, UINT8_MAX)
+
+#define DEFINE_PARSE_LONG(name, type, min, max) \
+ DEFINE_PARSE_WRAPPER(name, type, min, max, long, _long)
+DEFINE_PARSE_LONG(int, int, n < INT_MIN, INT_MAX)
+DEFINE_PARSE_LONG(s32, int32_t, n < INT32_MIN, INT32_MAX)
+DEFINE_PARSE_LONG(s16, int16_t, n < INT16_MIN, INT16_MAX)
+DEFINE_PARSE_LONG(s8, int8_t, n < INT8_MIN, INT8_MAX)
diff -u src/helper/command.h src/helper/command.h
--- src/helper/command.h (working copy)
+++ src/helper/command.h (working copy)
@@ -113,28 +113,18 @@
int parse_long(const char *str, long *ul);
int parse_llong(const char *str, long long *ul);
-#define DEFINE_PARSE_NUM_WRAP(name, type, max, functype, funcname) \
- static inline int parse_##name(const char *str, type *ul) \
- { \
- functype n; \
- int retval = parse##funcname(str, &n); \
- *ul = n; \
- return n > (max) ? ERROR_COMMAND_SYNTAX_ERROR : retval; \
- }
+#define DECLARE_PARSE_WRAPPER(name, type) \
+ int parse_##name(const char *str, type *ul)
-#define DEFINE_PARSE_ULONG(name, type, max) \
- DEFINE_PARSE_NUM_WRAP(name, type, max, unsigned long, _ulong)
-DEFINE_PARSE_ULONG(uint, unsigned, UINT_MAX)
-DEFINE_PARSE_ULONG(u32, uint32_t, UINT32_MAX)
-DEFINE_PARSE_ULONG(u16, uint16_t, UINT16_MAX)
-DEFINE_PARSE_ULONG(u8, uint8_t, UINT8_MAX)
+DECLARE_PARSE_WRAPPER(uint, unsigned);
+DECLARE_PARSE_WRAPPER(u32, uint32_t);
+DECLARE_PARSE_WRAPPER(u16, uint16_t);
+DECLARE_PARSE_WRAPPER(u8, uint8_t);
-#define DEFINE_PARSE_LONG(name, type, max) \
- DEFINE_PARSE_NUM_WRAP(name, type, max, long, _long)
-DEFINE_PARSE_LONG(int, int, INT_MAX)
-DEFINE_PARSE_LONG(s32, int32_t, INT32_MAX)
-DEFINE_PARSE_LONG(s16, int16_t, INT16_MAX)
-DEFINE_PARSE_LONG(s8, int8_t, INT8_MAX)
+DECLARE_PARSE_WRAPPER(int, int);
+DECLARE_PARSE_WRAPPER(s32, int32_t);
+DECLARE_PARSE_WRAPPER(s16, int16_t);
+DECLARE_PARSE_WRAPPER(s8, int8_t);
void script_debug(Jim_Interp *interp, const char *cmd, int argc, Jim_Obj *const *argv);
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
