Update the version number to v7 and v7n

And add a check to make sure that you can't load a 48k .x file on a Next and vice-versa. Signed-off-by: Mark Ryan <[email protected]>
markdryan · Jan 28, 2024 · be40eca · be40eca
1 parent 8dda965
commit be40eca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/state_base.c b/src/state_base.c
@@ -112,7 +112,13 @@ void specasm_load_e(const char *fname)
 		return;
 	}
 
-	if (SPECASM_VERSION >= state.version) {
+	/*
+	 * We use the top bit to distinguish between 48K and Next versions
+	 * of the file format.
+	 */
+
+	if (((SPECASM_VERSION & 0x8000) == (state.version & 0x8000)) &&
+	    (SPECASM_VERSION >= state.version)) {
 		state.version = SPECASM_VERSION;
 		return;
 	}

diff --git a/src/state_base.h b/src/state_base.h
@@ -17,8 +17,13 @@
 #ifndef SPECASM_STATE_READ_H
 #define SPECASM_STATE_READ_H
 
-#define SPECASM_VERSION 6
-#define SPECASM_VERSION_STR "v6"
+#ifdef SPECASM_TARGET_NEXT_OPCODES
+#define SPECASM_VERSION 0x8007
+#define SPECASM_VERSION_STR "v7n"
+#else
+#define SPECASM_VERSION 7
+#define SPECASM_VERSION_STR "v7"
+#endif
 
 #include <stdint.h>