Add argument parsing errors in command.h, use in parse_type routines.

[fw/openocd] / src / helper / command.h

diff --git a/src/helper/command.h b/src/helper/command.h
index 4e7180faaf457fadd938be8a264930b6596f83cc..565a83e68bc0d071a72965af41ae43dc7012d80c 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -98,6 +98,9 @@ extern void process_jim_events(void);
 #define                ERROR_COMMAND_CLOSE_CONNECTION          (-600)
 #define                ERROR_COMMAND_SYNTAX_ERROR                      (-601)
 #define                ERROR_COMMAND_NOTFOUND                          (-602)
+#define                ERROR_COMMAND_ARGUMENT_INVALID          (-603)
+#define                ERROR_COMMAND_ARGUMENT_OVERFLOW         (-604)
+#define                ERROR_COMMAND_ARGUMENT_UNDERFLOW        (-605)
 
 extern int fast_and_dangerous;
 
@@ -113,28 +116,18 @@ int parse_ullong(const char *str, unsigned long long *ul);
 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 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)
-
-#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)
+#define DECLARE_PARSE_WRAPPER(name, type) \
+       int parse_##name(const char *str, type *ul)
+
+DECLARE_PARSE_WRAPPER(uint, unsigned);
+DECLARE_PARSE_WRAPPER(u32, uint32_t);
+DECLARE_PARSE_WRAPPER(u16, uint16_t);
+DECLARE_PARSE_WRAPPER(u8, uint8_t);
+
+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);