From c5b718f5e85c7a884f7610fea46ceea2c3fbd4a7 Mon Sep 17 00:00:00 2001 From: oharboe Date: Fri, 11 Jul 2008 12:17:56 +0000 Subject: - retired variable stuff. - drscan is now a low level tcl command: execute DR scan - removed obsolete partial command text support git-svn-id: svn://svn.berlios.de/openocd/trunk@791 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/Makefile.am | 4 +- src/helper/command.c | 63 +------------ src/helper/command.h | 1 - src/helper/interpreter.c | 227 ----------------------------------------------- src/helper/interpreter.h | 49 ---------- 5 files changed, 4 insertions(+), 340 deletions(-) delete mode 100644 src/helper/interpreter.c delete mode 100644 src/helper/interpreter.h (limited to 'src/helper') diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index e518bc7f..1f3d76b6 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -9,7 +9,7 @@ else CONFIGFILES = options.c endif -libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c interpreter.c command.c time_support.c \ +libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c command.c time_support.c \ replacements.c fileio.c noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \ - interpreter.h time_support.h replacements.h fileio.h + time_support.h replacements.h fileio.h diff --git a/src/helper/command.c b/src/helper/command.c index 6acd53c1..d2abb0c2 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -49,52 +49,11 @@ int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **arg /* forward declaration of jim_command */ extern int jim_command(command_context_t *context, char *line); -int build_unique_lengths(command_context_t *context, command_t *commands) -{ - command_t *c, *p; - - /* iterate through all commands */ - for (c = commands; c; c = c->next) - { - /* find out how many characters are required to uniquely identify a command */ - for (c->unique_len = 1; c->unique_len <= strlen(c->name); c->unique_len++) - { - int foundmatch = 0; - - /* for every command, see if the current length is enough */ - for (p = commands; p; p = p->next) - { - /* ignore the command itself */ - if (c == p) - continue; - - /* compare commands up to the current length */ - if (strncmp(p->name, c->name, c->unique_len) == 0) - foundmatch++; - } - - /* when none of the commands matched, we've found the minimum length required */ - if (!foundmatch) - break; - } - - /* if the current command has children, build the unique lengths for them */ - if (c->children) - build_unique_lengths(context, c->children); - } - - return ERROR_OK; -} -/* Avoid evaluating this each time we add a command. Reduces overhead from O(n^2) to O(n). - * Makes a difference on ARM7 types machines and is not observable on GHz machines. - */ -static int unique_length_dirty = 1; command_t* register_command(command_context_t *context, command_t *parent, char *name, int (*handler)(struct command_context_s *context, char* name, char** args, int argc), enum command_mode mode, char *help) { command_t *c, *p; - unique_length_dirty = 1; if (!context || !name) return NULL; @@ -110,7 +69,6 @@ command_t* register_command(command_context_t *context, command_t *parent, char c->help = strdup(help); else c->help = NULL; - c->unique_len = 0; c->next = NULL; /* place command in tree */ @@ -150,8 +108,6 @@ int unregister_all_commands(command_context_t *context) { command_t *c, *c2; - unique_length_dirty = 1; - if (context == NULL) return ERROR_OK; @@ -189,8 +145,6 @@ int unregister_command(command_context_t *context, char *name) { command_t *c, *p = NULL, *c2; - unique_length_dirty = 1; - if ((!context) || (!name)) return ERROR_INVALID_ARGUMENTS; @@ -351,21 +305,11 @@ command_t *find_command(command_context_t *context, command_t *commands, char *w { command_t *c; - if (unique_length_dirty) - { - unique_length_dirty = 0; - /* update unique lengths */ - build_unique_lengths(context, context->commands); - } - for (c = commands; c; c = c->next) { - if (strncasecmp(c->name, words[start_word], c->unique_len)) + if (strcasecmp(c->name, words[start_word])) continue; - if (strncasecmp(c->name, words[start_word], strlen(words[start_word]))) - continue; - if ((context->mode == COMMAND_CONFIG) || (c->mode == COMMAND_ANY) || (c->mode == context->mode) ) { if (!c->children) @@ -533,10 +477,7 @@ int command_print_help_match(command_context_t* context, command_t* c_first, cha { if (argc > 0) { - if (strncasecmp(c->name, args[0], c->unique_len)) - continue; - - if (strncasecmp(c->name, args[0], strlen(args[0]))) + if (strcasecmp(c->name, args[0])) continue; if (argc > 1) diff --git a/src/helper/command.h b/src/helper/command.h index 6a1da024..bc4d332e 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -60,7 +60,6 @@ typedef struct command_s int (*handler)(struct command_context_s *context, char* name, char** args, int argc); enum command_mode mode; char *help; - int unique_len; struct command_s *next; } command_t; diff --git a/src/helper/interpreter.c b/src/helper/interpreter.c deleted file mode 100644 index 8dbb7909..00000000 --- a/src/helper/interpreter.c +++ /dev/null @@ -1,227 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005 by Dominic Rath * - * Dominic.Rath@gmx.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * 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. * - ***************************************************************************/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "interpreter.h" -#include "configuration.h" - -#include "binarybuffer.h" -#include -#include - -var_t *variables = NULL; - -int handle_var_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int handle_field_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int handle_script_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); - -int interpreter_register_commands(struct command_context_s *cmd_ctx) -{ - register_command(cmd_ctx, NULL, "var", handle_var_command, - COMMAND_ANY, "allocate, display or delete variable [num_fields|'del'] [size1] ..."); - register_command(cmd_ctx, NULL, "field", handle_field_command, - COMMAND_ANY, "display/modify variable field [value|'flip']"); - register_command(cmd_ctx, NULL, "script", handle_script_command, - COMMAND_ANY, "execute commands from "); - - return ERROR_OK; -} - -var_t* get_var_by_num(int num) -{ - int count = 0; - var_t *var = variables; - - if (var) - { - if (num == count) - return var; - while (var->next) - { - var = var->next; - count++; - if (num == count) - return var; - } - } - return NULL; -} - -var_t* get_var_by_name(char *name) -{ - var_t *var = variables; - - if (var) - { - if (strcmp(var->name, name) == 0) - return var; - while (var->next) - { - var = var->next; - if (strcmp(var->name, name) == 0) - return var; - } - } - return NULL; -} - -var_t* get_var_by_namenum(char *namenum) -{ - if ((namenum[0] >= '0') && (namenum[0] <= '9')) - return get_var_by_num(strtol(namenum, NULL, 0)); - else - return get_var_by_name(namenum); - -} - -int field_le_to_host(u8 *buffer, void *priv, struct scan_field_s *dummy) -{ - var_field_t *field = priv; - field->value = buf_get_u32(buffer, 0, field->num_bits); - - return ERROR_OK; -} - -int handle_var_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - var_t **last_var_p = &variables; - int i; - - if (argc >= 2) - { - while (*last_var_p) - { - if (strcmp((*last_var_p)->name, args[0]) == 0) - { - if (strcmp(args[1], "del") == 0) - { - var_t *next = (*last_var_p)->next; - free ((*last_var_p)->fields); - free (*last_var_p); - *last_var_p = next; - command_print(cmd_ctx, "variable %s deleted", args[0]); - } - else - command_print(cmd_ctx, "variable of that name already exists"); - return ERROR_OK; - } - last_var_p = &((*last_var_p)->next); - } - - if ((args[0][0] >= '0') && (args[0][0] <= '9')) - { - command_print(cmd_ctx, "invalid name specified (first character may not be a number)"); - return ERROR_OK; - } - - *last_var_p = malloc(sizeof(var_t)); - (*last_var_p)->name = strdup(args[0]); - (*last_var_p)->num_fields = argc - 1; - (*last_var_p)->next = NULL; - - (*last_var_p)->fields = malloc(sizeof(var_field_t) * (*last_var_p)->num_fields); - for (i = 0; i < (*last_var_p)->num_fields; i++) - { - (*last_var_p)->fields[i].num_bits = strtol(args[1+i], NULL, 0); - (*last_var_p)->fields[i].value = 0x0; - } - return ERROR_OK; - } - - if (argc == 1) - { - var_t *var = get_var_by_namenum(args[0]); - if (var) - { - int i; - command_print(cmd_ctx, "%s (%i fields):", var->name, var->num_fields); - for (i = 0; i < (var->num_fields); i++) - { - command_print(cmd_ctx, "0x%x (/%i)", var->fields[i].value, var->fields[i].num_bits); - } - } - else - { - command_print(cmd_ctx, "variable %s doesn't exist", args[0]); - } - } - - if (argc == 0) - { - var_t *var = variables; - int count = 0; - while (var) - { - command_print(cmd_ctx, "%i: %s (%i fields)", count, var->name, var->num_fields); - var = var->next; - count++; - } - } - - return ERROR_OK; -} - -int handle_field_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - - if (argc < 2) - return ERROR_COMMAND_SYNTAX_ERROR; - - if (argc >= 2) - { - var_t *var = get_var_by_namenum(args[0]); - int field_num = strtol(args[1], NULL, 0); - if (!var) - { - command_print(cmd_ctx, "variable %s doesn't exist", args[0]); - return ERROR_OK; - } - if (field_num >= var->num_fields) - command_print(cmd_ctx, "variable field %i is out of bounds (max. %i)", field_num, var->num_fields - 1); - if ((var) && (field_num < var->num_fields)) - { - if (argc > 2) - { - if (strcmp(args[2], "flip") == 0) - var->fields[field_num].value = flip_u32(var->fields[field_num].value, var->fields[field_num].num_bits); - else - var->fields[field_num].value = strtoul(args[2], NULL, 0); - } - - command_print(cmd_ctx, "%s(%i): 0x%x (/%i)", var->name, field_num, var->fields[field_num].value, var->fields[field_num].num_bits); - } - } - - return ERROR_OK; -} - -int handle_script_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - FILE *script_file; - - if (argc != 1) - return ERROR_COMMAND_SYNTAX_ERROR; - - - /* Run a tcl script file */ - return command_run_linef(cmd_ctx, "source [find {%s}]", args[0]); -} diff --git a/src/helper/interpreter.h b/src/helper/interpreter.h deleted file mode 100644 index c4f8acfb..00000000 --- a/src/helper/interpreter.h +++ /dev/null @@ -1,49 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005 by Dominic Rath * - * Dominic.Rath@gmx.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * 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. * - ***************************************************************************/ -#ifndef INTERPRETER_H -#define INTERPRETER_H - -#include "types.h" -#include "command.h" -#include "log.h" - -typedef struct var_field_s -{ - int num_bits; - u32 value; -} var_field_t; - -typedef struct var_s -{ - char *name; - int num_fields; - var_field_t *fields; - struct var_s *next; -} var_t; - -extern var_t *variables; - -struct scan_field_s; -extern int field_le_to_host(u8 *buffer, void *priv, struct scan_field_s *field); - -extern var_t* get_var_by_namenum(char *namenum); -extern int interpreter_register_commands(struct command_context_s *cmd_ctx); - -#endif /* INTERPRETER_H */ -- cgit v1.2.3