Add an instruction sanity checker to deloopify

2 files changed, 9 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index e5e2fc7..6cce90f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.o
 vbtracetool
 *.a
+deloopify
diff --git a/deloopify.c b/deloopify.c
index 99a8547..6405758 100644
--- a/deloopify.c
+++ b/deloopify.c
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 	long inlineno = 0, outlineno = -1;
 	char sig[MAX_LOOP_LEN][100];
 	char loopsig[] = "Loop";
+	bool borken = false;
 
 	char outname[1024];
 	strcpy(outname, argv[1]);
@@ -72,10 +73,16 @@ int main(int argc, char *argv[])
 		inlineno += 1;
 		outlineno += 1;
 
+		/* sanity check trace - every fourth line should be an instruction */
+		if (!borken && !(inlineno % 4) && line[4] != ':') {
+			printf("Oh dear, an opcode seems to have broken at line %ld -- that's bad iff the input trace file is unmodified vbtracetool output\n", inlineno);
+			borken = true;
+		}
+
 		/* append line number of input file to instructions */
 		if (line[4] == ':') {
 			int instrstrlen = strlen(line) - 1;
-			memset(&line[instrstrlen], 0x20, 100 - instrstrlen);
+			memset(&line[instrstrlen], 0x20, 64 - instrstrlen);
 			sprintf(&line[58], "	l%08ld\n", inlineno);
 		}
 		fwrite(line, strlen(line), 1, outf);