From d9d37fda4763219243cbb9af3188fb359c3d1372 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Jan 2022 11:47:05 +0900
Subject: [PATCH] [gamecode] Implement ruamoko opcode lookup

And get the debugger working with the new instruction set.
---
 libs/gamecode/pr_debug.c  | 51 +++++++++++++++++++++++++++------------
 libs/gamecode/pr_opcode.c |  7 ++++++
 libs/gamecode/test/main.c |  7 +++++-
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 7e3090a76..98c5d0e59 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1513,11 +1513,13 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 	int         addr = s - pr->pr_statements;
 	int         dump_code = contents & 2;
 	const char *fmt;
-	const v6p_opcode_t *op;
+	const char *mnemonic;
 	dfunction_t *call_func = 0;
 	pr_def_t   *parm_def = 0;
 	pr_auxfunction_t *aux_func = 0;
 	pr_debug_data_t data;
+	etype_t     op_type[3];
+	int         op_width[3];
 
 	dstring_clearstr (res->line);
 
@@ -1539,24 +1541,43 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 			return;
 	}
 
-	op = PR_v6p_Opcode (s->op);
-	if (!op) {
-		Sys_Printf ("%sUnknown instruction %d\n", res->line->str, s->op);
-		return;
+	if (pr->progs->version < PROG_VERSION) {
+		const v6p_opcode_t *op = PR_v6p_Opcode (s->op);
+		if (!op) {
+			Sys_Printf ("%sUnknown instruction %d\n", res->line->str, s->op);
+			return;
+		}
+		VectorSet (op->type_a, op->type_b, op->type_c, op_type);
+		VectorSet (1, 1, 1, op_width);
+		fmt = op->fmt;
+		mnemonic = op->opname;
+	} else {
+		const opcode_t *op = PR_Opcode (s->op);
+		if (!op) {
+			Sys_Printf ("%sUnknown instruction %d\n", res->line->str, s->op);
+			return;
+		}
+		VectorCopy (op->widths, op_width);
+		VectorCopy (op->types, op_type);
+		fmt = op->fmt;
+		mnemonic = op->mnemonic;
 	}
 
-	if (!(fmt = op->fmt))
+	if (!fmt) {
 		fmt = "%Ga, %Gb, %gc";
+	}
 
 	dasprintf (res->line, "%04x ", addr);
-	if (pr_debug->int_val > 2)
-		dasprintf (res->line, "%02x %04x(%8s) %04x(%8s) %04x(%8s)\t",
+	if (pr_debug->int_val > 2) {
+		dasprintf (res->line,
+					"%02x %04x(%8s)[%d] %04x(%8s)[%d] %04x(%8s)[%d]\t",
 					s->op,
-					s->a, pr_type_name[op->type_a],
-					s->b, pr_type_name[op->type_b],
-					s->c, pr_type_name[op->type_c]);
+					s->a, pr_type_name[op_type[0]], op_width[0],
+					s->b, pr_type_name[op_type[1]], op_width[1],
+					s->c, pr_type_name[op_type[2]], op_width[2]);
+	}
 
-	dasprintf (res->line, "%s ", op->opname);
+	dasprintf (res->line, "%s ", mnemonic);
 
 	while (*fmt) {
 		if (*fmt == '%') {
@@ -1582,15 +1603,15 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 				switch (opchar) {
 					case 'a':
 						opval = s->a;
-						optype = res->type_encodings[op->type_a];
+						optype = res->type_encodings[op_type[0]];
 						break;
 					case 'b':
 						opval = s->b;
-						optype = res->type_encodings[op->type_b];
+						optype = res->type_encodings[op_type[1]];
 						break;
 					case 'c':
 						opval = s->c;
-						optype = res->type_encodings[op->type_c];
+						optype = res->type_encodings[op_type[2]];
 						break;
 					case 'x':
 						if (mode == 'P') {
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index e2bebf46c..add538502 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -36,3 +36,10 @@
 const opcode_t pr_opcodes[512] = {
 #include "libs/gamecode/pr_opcode.cinc"
 };
+
+const opcode_t *
+PR_Opcode (pr_ushort_t opcode)
+{
+	opcode &= OP_MASK;
+	return &pr_opcodes[opcode];
+}
diff --git a/libs/gamecode/test/main.c b/libs/gamecode/test/main.c
index 44e91167e..0579463b2 100644
--- a/libs/gamecode/test/main.c
+++ b/libs/gamecode/test/main.c
@@ -43,12 +43,15 @@ test_debug_handler (prdebug_t event, void *param, void *data)
 			break;
 		case prd_trace:
 			dstatement_t *st = test_pr.pr_statements + test_pr.pr_xstatement;
-			if (verbose > 0) {
+			if (verbose > 1) {
 				printf ("debug: trace %05x %04x %04x %04x %04x%s\n",
 						test_pr.pr_xstatement, st->op, st->a, st->b, st->c,
 						pr->globals.stack ? va (0, " %05x", *pr->globals.stack)
 										  : "");
 			}
+			if (verbose > 0) {
+				PR_PrintStatement (&test_pr, st, 0);
+			}
 			if (pr->globals.stack) {
 				if (*pr->globals.stack & 3) {
 					printf ("stack not aligned: %d\n", *pr->globals.stack);
@@ -73,6 +76,8 @@ static void
 setup_test (test_t *test)
 {
 	memset (&test_pr, 0, sizeof (test_pr));
+	PR_Init (&test_pr);
+	PR_Debug_Init (&test_pr);
 	test_pr.progs = &test_progs;
 	test_pr.debug_handler = test_debug_handler;
 	test_pr.debug_data = &test_pr;