Add label support to curses source view

1 files changed, 8 insertions, 3 deletions

diff --git a/tpu.c b/tpu.c
index 512c28d..efc4eb8 100644
--- a/tpu.c
+++ b/tpu.c
@@ -62,6 +62,7 @@ djb_hash(const char *str)
 void
 label_map_init(struct label_map *map)
 {
+	memset(map->labels, 0, sizeof(char *) * TPU_MAX_INST);
 	memset(map->buckets, 0, sizeof(void *) * LABEL_MAP_BUCKETS);
 }
 
@@ -103,6 +104,8 @@ label_map_add(struct label_map *map, const char *name, size_t pc)
 	pos = label_map_link_pos(map, name);
 	if (*pos) return false;
 
+	if (map->labels[pc]) return false;
+
 	*pos = link = malloc(sizeof(struct label_map_link));
 	if (!link) die("malloc:");
 	link->label = strdup(name);
@@ -112,6 +115,8 @@ label_map_add(struct label_map *map, const char *name, size_t pc)
 	link->pc = pc;
 	link->next = NULL;
 
+	map->labels[pc] = link->label;
+
 	return true;
 }
 
@@ -163,7 +168,7 @@ tpu_init(struct tpu *tpu)
 	tpu->acc = 0;
 	tpu->bak = 0;
 	tpu->inst_cnt = 0;
-	label_map_init(&tpu->labels);
+	label_map_init(&tpu->label_map);
 
 	tpu->last = -1;
 	tpu->io_port = -1;
@@ -176,7 +181,7 @@ tpu_deinit(struct tpu *tpu)
 {
 	int i;
 
-	label_map_deinit(&tpu->labels);
+	label_map_deinit(&tpu->label_map);
 	for (i = 0; i < TPU_MAX_INST; i++) {
 		if (tpu->insts[i].ops[0].type == OP_LABEL)
 			free(tpu->insts[i].ops[0].val.label);
@@ -353,7 +358,7 @@ tpu_jmp_label(struct tpu *tpu, const char *label)
 {
 	size_t pc;
 
-	pc = label_map_get(&tpu->labels, label);
+	pc = label_map_get(&tpu->label_map, label);
 	if (pc >= TPU_MAX_INST) abort();
 	tpu->pc = (uint8_t) pc;
 }