Add support for multiple input and output ports

1 files changed, 22 insertions, 29 deletions

diff --git a/tis100.c b/tis100.c
index 26ce5d0..2f1c0d3 100644
--- a/tis100.c
+++ b/tis100.c
@@ -11,55 +11,48 @@
 #include <stdlib.h>
 
 static struct tis tis;
-static FILE *tis_stdin = NULL;
-static FILE *tis_stdout = NULL;
 
 int (*cleanup)(void) = NULL;
-const char *progname = "tis-as";
+const char *progname = "tis100";
+
+static bool
+io_active(struct tis *tis)
+{
+	struct tpu_io_port *io_port;
+	int i;
+
+	for (i = 0; i < TIS_MAX_IO_PORTS; i++) {
+		io_port = tis->in_ports[i];
+		if (!io_port || !io_port->file) continue;
+		if (!feof(io_port->file) && io_port->port.attached
+				&& io_port->port.dst_port->reading)
+			return true;
+	}
+	return false;
+}
 
 int
 main(int argc, const char **argv)
 {
 	bool idle, prev_idle;
 
-	if (argc < 2 || argc > 4) {
-		fprintf(stderr, "Usage: tis-as FILE [STDIN] [STDOUT]\n");
+	if (argc < 2) {
+		fprintf(stderr, "Usage: tis100 FILE [IO..]\n");
 		exit(1);
 	}
 
-	if (argc >= 3) {
-		tis_stdin = fopen(argv[2], "r");
-		if (!tis_stdin) die("fopen '%s':", argv[2]);
-	} else {
-		tis_stdin = stdin;
-	}
-	setvbuf(tis_stdin, NULL, _IONBF, 0);
-
-	if (argc >= 4) {
-		tis_stdout = fopen(argv[3], "w+");
-		if (!tis_stdout) die("fopen '%s':", argv[3]);
-	} else {
-		tis_stdout = stdout;
-	}
-	setvbuf(tis_stdout, NULL, _IONBF, 0);
-
 	tis_init(&tis);
 
 	tis_load(&tis, argv[1]);
+	tis_load_io(&tis, argv + 2);
 
-	tis.stdin_port.out = -1;
 	idle = false;
-	while (!idle || !prev_idle || tis.stdin_port.attached
-			&& tis.stdin_port.reading && !feof(tis_stdin)) {
-		tis_communicate(&tis, tis_stdin, tis_stdout);
-
+	while (!idle || !prev_idle || io_active(&tis)) {
+		tis_communicate(&tis);
 		prev_idle = idle;
 		idle = !tis_step(&tis);
 	}
 
-	fclose(tis_stdin);
-	fclose(tis_stdout);
-
 	tis_deinit(&tis);
 }