Added support for TI text format.

Makefile

@@ -46,7 +46,7 @@ install: mspdebug mspdebug.man
 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 cproc_util.o expr.o fet_error.o binfile.o fet_db.o \
-	  usbutil.o
+	  usbutil.o titext.o
 	$(CC) $(LDFLAGS) -o $@ $^ -lusb $(READLINE_LIBS)
 
 .c.o:

binfile.c

@@ -21,6 +21,7 @@
 #include "ihex.h"
 #include "elf32.h"
 #include "symmap.h"
+#include "titext.h"
 
 struct file_format {
 	int (*check)(FILE *in);
@@ -41,6 +42,10 @@ static const struct file_format formats[] = {
 	{
 		.check = symmap_check,
 		.syms = symmap_syms
+	},
+	{
+		.check = titext_check,
+		.extract = titext_extract
 	}
 };
 

titext.c

@@ -0,0 +1,158 @@
+/* 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 <ctype.h>
+#include <stdlib.h>
+#include "titext.h"
+
+static inline int ishex(int c)
+{
+	return isdigit(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
+}
+
+static int is_address_line(const char *text)
+{
+	if (*text != '@')
+		return 0;
+
+	text++;
+	if (!*text || isspace(*text))
+		return 0;
+
+	while (*text && !isspace(*text)) {
+		if (!ishex(*text))
+			return 0;
+		text++;
+	}
+
+	while (*text) {
+		if (!isspace(*text))
+			return 0;
+		text++;
+	}
+
+	return 1;
+}
+
+static int is_data_line(const char *text)
+{
+	while (*text) {
+		if (!(ishex(*text) || isspace(*text)))
+			return 0;
+		text++;
+	}
+
+	return 1;
+}
+
+int titext_check(FILE *in)
+{
+	char buf[64];
+
+	rewind(in);
+	fgets(buf, sizeof(buf), in);
+	return is_address_line(buf);
+}
+
+static int process_data_line(int address, const char *buf,
+			     binfile_imgcb_t cb, void *user_data)
+{
+	uint8_t data[64];
+	int data_len = 0;
+	int value = 0;
+	int vc = 0;
+
+	while (*buf) {
+		int c = *(buf++);
+		int x;
+
+		if (isspace(c)) {
+			if (vc) {
+				if (data_len >= sizeof(data))
+					goto too_long;
+				data[data_len++] = value;
+			}
+
+			vc = 0;
+		} else {
+			if (isdigit(c)) {
+				x = c - '0';
+			} else if (c >= 'A' && c <= 'F') {
+				x = c - 'A' + 10;
+			} else if (c >= 'a' && c <= 'f') {
+				x = c - 'a' + 10;
+			} else  {
+				fprintf(stderr, "titext: unexpected "
+					"character: %c\n", c);
+				return -1;
+			}
+
+			if (vc >= 2) {
+				fprintf(stderr, "titext: too many digits "
+					"in hex value\n");
+				return -1;
+			}
+
+			value = (value << 4) | x;
+			vc++;
+		}
+	}
+
+	if (vc) {
+		if (data_len >= sizeof(data))
+			goto too_long;
+		data[data_len++] = value;
+	}
+
+	if (cb(user_data, address, data, data_len) < 0)
+		return -1;
+
+	return data_len;
+
+ too_long:
+	fprintf(stderr, "titext: too many data bytes\n");
+	return -1;
+}
+
+int titext_extract(FILE *in, binfile_imgcb_t cb, void *user_data)
+{
+	int address = 0;
+	int lno = 0;
+	char buf[128];
+
+	rewind(in);
+	while (fgets(buf, sizeof(buf), in)) {
+		lno++;
+
+		if (is_address_line(buf)) {
+			address = strtoul(buf + 1, NULL, 16);
+		} else if (is_data_line(buf)) {
+			int count = process_data_line(address, buf,
+						      cb, user_data);
+			if (count < 0) {
+				fprintf(stderr, "titext: data error on line "
+					"%d\n", lno);
+				return -1;
+			}
+
+			address += count;
+		}
+	}
+
+	return 0;
+}

titext.h

@@ -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 TITEXT_H_
+#define TITEXT_H_
+
+#include "binfile.h"
+
+int titext_check(FILE *in);
+int titext_extract(FILE *in, binfile_imgcb_t cb, void *user_data);
+
+#endif