Separated standard commands.
This commit is contained in:
Daniel Beer
parent
6dd1ab25c3
commit
071769f88c
2
Makefile
2
Makefile
|
|
@ -57,7 +57,7 @@ mspdebug: main.o fet.o rf2500.o dis.o uif.o olimex.o ihex.o elf32.o stab.o \
|
|||
util.o bsl.o sim.o symmap.o gdb.o btree.o rtools.o sym.o devcmd.o \
|
||||
cproc.o vector.o output_util.o expr.o fet_error.o binfile.o \
|
||||
fet_db.o usbutil.o titext.o srec.o device.o coff.o opdb.o output.o \
|
||||
cmddb.o
|
||||
cmddb.o stdcmd.o
|
||||
$(CC) $(LDFLAGS) $(MACPORTS_LDFLAGS) -o $@ $^ -lusb $(READLINE_LIBS)
|
||||
|
||||
.c.o:
|
||||
|
|
|
|||
1
cmddb.c
1
cmddb.c
|
|
@ -26,6 +26,7 @@
|
|||
#include "rtools.h"
|
||||
#include "cproc.h"
|
||||
#include "sym.h"
|
||||
#include "stdcmd.h"
|
||||
|
||||
const struct cmddb_record commands[] = {
|
||||
{
|
||||
|
|
|
|||
216
cproc.c
216
cproc.c
|
|
@ -36,227 +36,13 @@
|
|||
#include "util.h"
|
||||
#include "output.h"
|
||||
#include "cmddb.h"
|
||||
#include "stdcmd.h"
|
||||
|
||||
struct cproc {
|
||||
int modify_flags;
|
||||
int in_reader_loop;
|
||||
};
|
||||
|
||||
static int namelist_cmp(const void *a, const void *b)
|
||||
{
|
||||
return strcasecmp(*(const char **)a, *(const char **)b);
|
||||
}
|
||||
|
||||
static void namelist_print(struct vector *v)
|
||||
{
|
||||
int i;
|
||||
int max_len = 0;
|
||||
int rows, cols;
|
||||
|
||||
qsort(v->ptr, v->size, v->elemsize, namelist_cmp);
|
||||
|
||||
for (i = 0; i < v->size; i++) {
|
||||
const char *text = VECTOR_AT(*v, i, const char *);
|
||||
int len = strlen(text);
|
||||
|
||||
if (len > max_len)
|
||||
max_len = len;
|
||||
}
|
||||
|
||||
max_len += 2;
|
||||
cols = 72 / max_len;
|
||||
rows = (v->size + cols - 1) / cols;
|
||||
|
||||
for (i = 0; i < rows; i++) {
|
||||
int j;
|
||||
|
||||
printf(" ");
|
||||
for (j = 0; j < cols; j++) {
|
||||
int k = j * rows + i;
|
||||
const char *text;
|
||||
|
||||
if (k >= v->size)
|
||||
break;
|
||||
|
||||
text = VECTOR_AT(*v, k, const char *);
|
||||
printf("%s", text);
|
||||
for (k = strlen(text); k < max_len; k++)
|
||||
printf(" ");
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
|
||||
static const char *type_text(opdb_type_t type)
|
||||
{
|
||||
switch (type) {
|
||||
case OPDB_TYPE_BOOLEAN:
|
||||
return "boolean";
|
||||
|
||||
case OPDB_TYPE_NUMERIC:
|
||||
return "numeric";
|
||||
|
||||
case OPDB_TYPE_STRING:
|
||||
return "text";
|
||||
}
|
||||
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
static int push_option_name(void *user_data, const struct opdb_key *key,
|
||||
const union opdb_value *value)
|
||||
{
|
||||
return vector_push((struct vector *)user_data, &key->name, 1);
|
||||
}
|
||||
|
||||
static int push_command_name(void *user_data, const struct cmddb_record *rec)
|
||||
{
|
||||
return vector_push((struct vector *)user_data, &rec->name, 1);
|
||||
}
|
||||
|
||||
int cmd_help(cproc_t cp, char **arg)
|
||||
{
|
||||
const char *topic = get_arg(arg);
|
||||
|
||||
if (topic) {
|
||||
struct cmddb_record cmd;
|
||||
struct opdb_key key;
|
||||
|
||||
if (!cmddb_get(topic, &cmd)) {
|
||||
printc("\x1b[1mCOMMAND: %s\x1b[0m\n\n%s\n",
|
||||
cmd.name, cmd.help);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!opdb_get(topic, &key, NULL)) {
|
||||
printc("\x1b[1mOPTION: %s (%s)\x1b[0m\n\n%s\n",
|
||||
key.name, type_text(key.type), key.help);
|
||||
return 0;
|
||||
}
|
||||
|
||||
fprintf(stderr, "help: unknown command: %s\n", topic);
|
||||
return -1;
|
||||
} else {
|
||||
struct vector v;
|
||||
|
||||
vector_init(&v, sizeof(const char *));
|
||||
|
||||
if (!cmddb_enum(push_command_name, &v)) {
|
||||
printf("Available commands:\n");
|
||||
namelist_print(&v);
|
||||
printf("\n");
|
||||
} else {
|
||||
perror("help: can't allocate memory for command list");
|
||||
}
|
||||
|
||||
vector_realloc(&v, 0);
|
||||
|
||||
if (!opdb_enum(push_option_name, &v)) {
|
||||
printf("Available options:\n");
|
||||
namelist_print(&v);
|
||||
printf("\n");
|
||||
} else {
|
||||
perror("help: can't allocate memory for option list");
|
||||
}
|
||||
|
||||
vector_destroy(&v);
|
||||
|
||||
printf("Type \"help <topic>\" for more information.\n");
|
||||
printf("Press Ctrl+D to quit.\n");
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int parse_option(opdb_type_t type, union opdb_value *value,
|
||||
const char *word)
|
||||
{
|
||||
switch (type) {
|
||||
case OPDB_TYPE_BOOLEAN:
|
||||
value->numeric = (isdigit(word[0]) && word[0] > '0') ||
|
||||
word[0] == 't' || word[0] == 'y' ||
|
||||
(word[0] == 'o' && word[1] == 'n');
|
||||
break;
|
||||
|
||||
case OPDB_TYPE_NUMERIC:
|
||||
return expr_eval(stab_default, word, &value->numeric);
|
||||
|
||||
case OPDB_TYPE_STRING:
|
||||
strncpy(value->string, word, sizeof(value->string));
|
||||
value->string[sizeof(value->string) - 1] = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int display_option(void *user_data, const struct opdb_key *key,
|
||||
const union opdb_value *value)
|
||||
{
|
||||
printf("%32s = ", key->name);
|
||||
|
||||
switch (key->type) {
|
||||
case OPDB_TYPE_BOOLEAN:
|
||||
printf("%s", value->boolean ? "true" : "false");
|
||||
break;
|
||||
|
||||
case OPDB_TYPE_NUMERIC:
|
||||
printf("0x%x (%u)", value->numeric, value->numeric);
|
||||
break;
|
||||
|
||||
case OPDB_TYPE_STRING:
|
||||
printf("%s", value->string);
|
||||
break;
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cmd_opt(cproc_t cp, char **arg)
|
||||
{
|
||||
const char *opt_text = get_arg(arg);
|
||||
struct opdb_key key;
|
||||
union opdb_value value;
|
||||
|
||||
if (opt_text) {
|
||||
if (opdb_get(opt_text, &key, &value) < 0) {
|
||||
fprintf(stderr, "opt: no such option: %s\n",
|
||||
opt_text);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (**arg) {
|
||||
if (parse_option(key.type, &value, *arg) < 0) {
|
||||
fprintf(stderr, "opt: can't parse option: %s\n",
|
||||
*arg);
|
||||
return -1;
|
||||
}
|
||||
|
||||
opdb_set(key.name, &value);
|
||||
} else if (opt_text) {
|
||||
display_option(NULL, &key, &value);
|
||||
} else {
|
||||
opdb_enum(display_option, NULL);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cmd_read(cproc_t cp, char **arg)
|
||||
{
|
||||
char *filename = get_arg(arg);
|
||||
|
||||
if (!filename) {
|
||||
fprintf(stderr, "read: filename must be specified\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return cproc_process_file(cp, filename);
|
||||
}
|
||||
|
||||
cproc_t cproc_new(void)
|
||||
{
|
||||
cproc_t cp = malloc(sizeof(*cp));
|
||||
|
|
|
|||
5
cproc.h
5
cproc.h
|
|
@ -69,9 +69,4 @@ void cproc_reader_loop(cproc_t cp);
|
|||
int cproc_process_command(cproc_t cp, char *cmd);
|
||||
int cproc_process_file(cproc_t cp, const char *filename);
|
||||
|
||||
/* Built-in commands */
|
||||
int cmd_help(cproc_t cp, char **arg);
|
||||
int cmd_read(cproc_t cp, char **arg);
|
||||
int cmd_opt(cproc_t cp, char **arg);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,244 @@
|
|||
/* MSPDebug - debugging tool for MSP430 MCUs
|
||||
* Copyright (C) 2009, 2010 Daniel Beer
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "cmddb.h"
|
||||
#include "opdb.h"
|
||||
#include "vector.h"
|
||||
#include "cproc.h"
|
||||
#include "stdcmd.h"
|
||||
#include "output.h"
|
||||
#include "expr.h"
|
||||
|
||||
static int namelist_cmp(const void *a, const void *b)
|
||||
{
|
||||
return strcasecmp(*(const char **)a, *(const char **)b);
|
||||
}
|
||||
|
||||
static void namelist_print(struct vector *v)
|
||||
{
|
||||
int i;
|
||||
int max_len = 0;
|
||||
int rows, cols;
|
||||
|
||||
qsort(v->ptr, v->size, v->elemsize, namelist_cmp);
|
||||
|
||||
for (i = 0; i < v->size; i++) {
|
||||
const char *text = VECTOR_AT(*v, i, const char *);
|
||||
int len = strlen(text);
|
||||
|
||||
if (len > max_len)
|
||||
max_len = len;
|
||||
}
|
||||
|
||||
max_len += 2;
|
||||
cols = 72 / max_len;
|
||||
rows = (v->size + cols - 1) / cols;
|
||||
|
||||
for (i = 0; i < rows; i++) {
|
||||
int j;
|
||||
|
||||
printf(" ");
|
||||
for (j = 0; j < cols; j++) {
|
||||
int k = j * rows + i;
|
||||
const char *text;
|
||||
|
||||
if (k >= v->size)
|
||||
break;
|
||||
|
||||
text = VECTOR_AT(*v, k, const char *);
|
||||
printf("%s", text);
|
||||
for (k = strlen(text); k < max_len; k++)
|
||||
printf(" ");
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
|
||||
static const char *type_text(opdb_type_t type)
|
||||
{
|
||||
switch (type) {
|
||||
case OPDB_TYPE_BOOLEAN:
|
||||
return "boolean";
|
||||
|
||||
case OPDB_TYPE_NUMERIC:
|
||||
return "numeric";
|
||||
|
||||
case OPDB_TYPE_STRING:
|
||||
return "text";
|
||||
}
|
||||
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
static int push_option_name(void *user_data, const struct opdb_key *key,
|
||||
const union opdb_value *value)
|
||||
{
|
||||
return vector_push((struct vector *)user_data, &key->name, 1);
|
||||
}
|
||||
|
||||
static int push_command_name(void *user_data, const struct cmddb_record *rec)
|
||||
{
|
||||
return vector_push((struct vector *)user_data, &rec->name, 1);
|
||||
}
|
||||
|
||||
int cmd_help(cproc_t cp, char **arg)
|
||||
{
|
||||
const char *topic = get_arg(arg);
|
||||
|
||||
if (topic) {
|
||||
struct cmddb_record cmd;
|
||||
struct opdb_key key;
|
||||
|
||||
if (!cmddb_get(topic, &cmd)) {
|
||||
printc("\x1b[1mCOMMAND: %s\x1b[0m\n\n%s\n",
|
||||
cmd.name, cmd.help);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!opdb_get(topic, &key, NULL)) {
|
||||
printc("\x1b[1mOPTION: %s (%s)\x1b[0m\n\n%s\n",
|
||||
key.name, type_text(key.type), key.help);
|
||||
return 0;
|
||||
}
|
||||
|
||||
fprintf(stderr, "help: unknown command: %s\n", topic);
|
||||
return -1;
|
||||
} else {
|
||||
struct vector v;
|
||||
|
||||
vector_init(&v, sizeof(const char *));
|
||||
|
||||
if (!cmddb_enum(push_command_name, &v)) {
|
||||
printf("Available commands:\n");
|
||||
namelist_print(&v);
|
||||
printf("\n");
|
||||
} else {
|
||||
perror("help: can't allocate memory for command list");
|
||||
}
|
||||
|
||||
vector_realloc(&v, 0);
|
||||
|
||||
if (!opdb_enum(push_option_name, &v)) {
|
||||
printf("Available options:\n");
|
||||
namelist_print(&v);
|
||||
printf("\n");
|
||||
} else {
|
||||
perror("help: can't allocate memory for option list");
|
||||
}
|
||||
|
||||
vector_destroy(&v);
|
||||
|
||||
printf("Type \"help <topic>\" for more information.\n");
|
||||
printf("Press Ctrl+D to quit.\n");
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int parse_option(opdb_type_t type, union opdb_value *value,
|
||||
const char *word)
|
||||
{
|
||||
switch (type) {
|
||||
case OPDB_TYPE_BOOLEAN:
|
||||
value->numeric = (isdigit(word[0]) && word[0] > '0') ||
|
||||
word[0] == 't' || word[0] == 'y' ||
|
||||
(word[0] == 'o' && word[1] == 'n');
|
||||
break;
|
||||
|
||||
case OPDB_TYPE_NUMERIC:
|
||||
return expr_eval(stab_default, word, &value->numeric);
|
||||
|
||||
case OPDB_TYPE_STRING:
|
||||
strncpy(value->string, word, sizeof(value->string));
|
||||
value->string[sizeof(value->string) - 1] = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int display_option(void *user_data, const struct opdb_key *key,
|
||||
const union opdb_value *value)
|
||||
{
|
||||
printf("%32s = ", key->name);
|
||||
|
||||
switch (key->type) {
|
||||
case OPDB_TYPE_BOOLEAN:
|
||||
printf("%s", value->boolean ? "true" : "false");
|
||||
break;
|
||||
|
||||
case OPDB_TYPE_NUMERIC:
|
||||
printf("0x%x (%u)", value->numeric, value->numeric);
|
||||
break;
|
||||
|
||||
case OPDB_TYPE_STRING:
|
||||
printf("%s", value->string);
|
||||
break;
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cmd_opt(cproc_t cp, char **arg)
|
||||
{
|
||||
const char *opt_text = get_arg(arg);
|
||||
struct opdb_key key;
|
||||
union opdb_value value;
|
||||
|
||||
if (opt_text) {
|
||||
if (opdb_get(opt_text, &key, &value) < 0) {
|
||||
fprintf(stderr, "opt: no such option: %s\n",
|
||||
opt_text);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (**arg) {
|
||||
if (parse_option(key.type, &value, *arg) < 0) {
|
||||
fprintf(stderr, "opt: can't parse option: %s\n",
|
||||
*arg);
|
||||
return -1;
|
||||
}
|
||||
|
||||
opdb_set(key.name, &value);
|
||||
} else if (opt_text) {
|
||||
display_option(NULL, &key, &value);
|
||||
} else {
|
||||
opdb_enum(display_option, NULL);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cmd_read(cproc_t cp, char **arg)
|
||||
{
|
||||
char *filename = get_arg(arg);
|
||||
|
||||
if (!filename) {
|
||||
fprintf(stderr, "read: filename must be specified\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return cproc_process_file(cp, filename);
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
/* MSPDebug - debugging tool for MSP430 MCUs
|
||||
* Copyright (C) 2009, 2010 Daniel Beer
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef STDCMD_H_
|
||||
#define STDCMD_H_
|
||||
|
||||
/* Built-in commands */
|
||||
int cmd_help(cproc_t cp, char **arg);
|
||||
int cmd_read(cproc_t cp, char **arg);
|
||||
int cmd_opt(cproc_t cp, char **arg);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue