Add support for 64 bit parameter to irscan

[openocd.git] / src / helper / command.c

diff --git a/src/helper/command.c b/src/helper/command.c
index fb1a709a5dee6f65c4f326e105a6d561a0bdf70e..4e0314315cf3fc8ce7fc965c07e07d0485aed2d3 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -24,14 +24,14 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-/* see Embedder-HOWTO.txt in Jim Tcl project hosted on BerliOS*/
+/* see Embedded-HOWTO.txt in Jim Tcl project hosted on BerliOS*/
 #define JIM_EMBEDDED
 
 /* @todo the inclusion of target.h here is a layering violation */
@@ -152,6 +152,7 @@ static void script_command_args_free(const char **words, unsigned nwords)
                free((void *)words[i]);
        free(words);
 }
+
 static const char **script_command_args_alloc(
        unsigned argc, Jim_Obj * const *argv, unsigned *nwords)
 {
@@ -244,6 +245,7 @@ static struct command *command_find(struct command *head, const char *name)
        }
        return NULL;
 }
+
 struct command *command_find_in_context(struct command_context *cmd_ctx,
        const char *name)
 {
@@ -570,6 +572,7 @@ static char *__command_name(struct command *c, char delim, unsigned extra)
        }
        return name;
 }
+
 char *command_name(struct command *c, char delim)
 {
        return __command_name(c, delim, 0);
@@ -777,7 +780,7 @@ static int jim_capture(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        /* disable polling during capture. This avoids capturing output
         * from polling.
         *
-        * This is necessary in order to avoid accidentially getting a non-empty
+        * This is necessary in order to avoid accidentally getting a non-empty
         * string for tcl fn's.
         */
        bool save_poll = jtag_poll_get_enabled();
@@ -847,6 +850,7 @@ static void command_help_show_wrap(const char *str, unsigned n, unsigned n2)
                n = n2;
        }
 }
+
 static COMMAND_HELPER(command_help_show, struct command *c, unsigned n,
        bool show_help, const char *match)
 {
@@ -911,6 +915,7 @@ static COMMAND_HELPER(command_help_show, struct command *c, unsigned n,
        return CALL_COMMAND_HANDLER(command_help_show_list,
                c->children, n, show_help, match);
 }
+
 COMMAND_HANDLER(handle_help_command)
 {
        bool full = strcmp(CMD_NAME, "help") == 0;
@@ -927,19 +932,16 @@ COMMAND_HANDLER(handle_help_command)
                        if (NULL != match) {
                                char *prev = match;
 
-                               match = alloc_printf("%s %s", match,
-                                               CMD_ARGV[i]);
+                               match = alloc_printf("%s %s", match, CMD_ARGV[i]);
                                free(prev);
                                if (NULL == match) {
-                                       LOG_ERROR("unable to build "
-                                               "search string");
+                                       LOG_ERROR("unable to build search string");
                                        return -ENOMEM;
                                }
                        } else {
                                match = alloc_printf("%s", CMD_ARGV[i]);
                                if (NULL == match) {
-                                       LOG_ERROR("unable to build "
-                                               "search string");
+                                       LOG_ERROR("unable to build search string");
                                        return -ENOMEM;
                                }
                        }
@@ -1311,6 +1313,10 @@ struct command_context *command_init(const char *startup_tcl, Jim_Interp *interp
        HostOs = "ecos";
 #elif defined(__FreeBSD__)
        HostOs = "freebsd";
+#elif defined(__NetBSD__)
+       HostOs = "netbsd";
+#elif defined(__OpenBSD__)
+       HostOs = "openbsd";
 #else
 #warning "Unrecognized host OS..."
        HostOs = "other";
@@ -1398,19 +1404,21 @@ DEFINE_PARSE_NUM_TYPE(_llong, long long, strtoll, LLONG_MIN, LLONG_MAX)
                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)
+#define DEFINE_PARSE_ULONGLONG(name, type, min, max) \
+       DEFINE_PARSE_WRAPPER(name, type, min, max, unsigned long long, _ullong)
+DEFINE_PARSE_ULONGLONG(_uint, unsigned, 0, UINT_MAX)
+DEFINE_PARSE_ULONGLONG(_u64,  uint64_t, 0, UINT64_MAX)
+DEFINE_PARSE_ULONGLONG(_u32,  uint32_t, 0, UINT32_MAX)
+DEFINE_PARSE_ULONGLONG(_u16,  uint16_t, 0, UINT16_MAX)
+DEFINE_PARSE_ULONGLONG(_u8,   uint8_t,  0, UINT8_MAX)
+
+#define DEFINE_PARSE_LONGLONG(name, type, min, max) \
+       DEFINE_PARSE_WRAPPER(name, type, min, max, long long, _llong)
+DEFINE_PARSE_LONGLONG(_int, int,     n < INT_MIN,   INT_MAX)
+DEFINE_PARSE_LONGLONG(_s64, int64_t, n < INT64_MIN, INT64_MAX)
+DEFINE_PARSE_LONGLONG(_s32, int32_t, n < INT32_MIN, INT32_MAX)
+DEFINE_PARSE_LONGLONG(_s16, int16_t, n < INT16_MIN, INT16_MAX)
+DEFINE_PARSE_LONGLONG(_s8,  int8_t,  n < INT8_MIN,  INT8_MAX)
 
 static int command_parse_bool(const char *in, bool *out,
        const char *on, const char *off)