libticonv: add a helper function; libtifiles: add two variable types …

…which are normally for internal use only; tifileutil: add the initial, slightly more than minimally useful version of an in-tree libtifiles front-end (issue #31), so that it can be used by the libticalcs build; libticalcs: use tifileutil instead of tf2hex + tipack; require a C++11 compiler and autoconf-archive; remove tf2hex. Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr> Signed-off-by: Adrien Bertrand <bertrand.adrien@gmail.com> (CMake integration)
debrouxl · Sep 13, 2023 · 773f097 · 773f097
1 parent f8c06b3
commit 773f097
Show file tree

Hide file tree

Showing 63 changed files with 2,752 additions and 594 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -175,6 +175,7 @@ add_subdirectory(libticonv/trunk)
 add_subdirectory(libtifiles/trunk)
 add_subdirectory(libticables/trunk)
 add_subdirectory(libticalcs/trunk)
+add_subdirectory(tifileutil)
 
 add_custom_target(check
     DEPENDS ticonv_check tifiles2_check ticables2_check ticalcs2_check

diff --git a/libticalcs/trunk/configure.ac b/libticalcs/trunk/configure.ac
@@ -36,7 +36,6 @@ AC_CONFIG_FILES([
   docs/Makefile
   po/Makefile.in
   src/Makefile
-  src/tf2hex/Makefile
   src/romdump_8x/Makefile
   src/romdump_84p_usb/Makefile
   src/romdump_9x/Makefile
@@ -204,12 +203,12 @@ AC_ARG_ENABLE([builtin-rom-dumpers],
   [], [enable_builtin_rom_dumpers=yes])
 
 AC_ARG_VAR([SPASM], [SPASM Z80 assembler])
-AC_ARG_VAR([TIPACK], [Tool for creating TI variable files])
+AC_ARG_VAR([TIFILEUTIL], [Tool for creating TI variable files])
 have_spasm=no
-have_tipack=no
+have_tifileutil=no
 have_tigcc=no
 : ${SPASM=spasm}
-: ${TIPACK=tipack}
+: ${TIFILEUTIL=tifileutil}
 
 if test "x$enable_builtin_rom_dumpers" != "xyes" ; then
   AC_MSG_CHECKING([whether $SPASM works])
@@ -224,13 +223,11 @@ EOF
   fi
   AC_MSG_RESULT([$have_spasm])
 
-  if test "x$have_spasm" = "xyes" ; then
-    AC_MSG_CHECKING([whether $TIPACK works])
-    if "$TIPACK" conftest.bin -p -o conftest.8xp >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
-      have_tipack=yes
-    fi
-    AC_MSG_RESULT([$have_tipack])
+  AC_MSG_CHECKING([whether $TIFILEUTIL works])
+  if "$TIFILEUTIL" wrap conftest.bin -p -o conftest.8xp >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
+    have_tifileutil=yes
   fi
+  AC_MSG_RESULT([$have_tifileutil])
 
   AC_MSG_CHECKING([whether tigcc works])
   cat >conftest.c <<EOF
@@ -256,12 +253,12 @@ EOF
   AC_MSG_RESULT([$have_tigcc])
 fi
 
-if test "x$have_spasm$have_tipack" = "xyesyes" ; then
+if test "x$have_spasm$have_tifileutil" = "xyesyes" ; then
   build_z80_rom_dumpers=yes
 else
   build_z80_rom_dumpers=no
   if test "x$enable_builtin_rom_dumpers" = "xno" ; then
-    AC_MSG_FAILURE([spasm and/or tipack are not installed or are not usable.])
+    AC_MSG_FAILURE([spasm and/or tifileutil are not installed or are not usable.])
   fi
 fi
 

diff --git a/libticalcs/trunk/src/Makefile.am b/libticalcs/trunk/src/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CFLAGS = -Wall -W
 
-SUBDIRS = tf2hex romdump_8x romdump_84p_usb romdump_834pce_usb romdump_9x
+SUBDIRS = romdump_8x romdump_84p_usb romdump_834pce_usb romdump_9x
 
 # libraries and files to compile and install
 lib_LTLIBRARIES = libticalcs2.la
@@ -46,9 +46,6 @@ if OS_WIN32
   libticalcs2_la_DEPENDENCIES = ../build/mingw/ticalcs2-rc.o
   libticalcs2_la_LDFLAGS += -Wl,../build/mingw/ticalcs2-rc.o -Wl,--output-def,libticalcs2.def
   EXTRA_DIST = libticalcs2.def
-  tf2hex = ./tf2hex/tf2hex.exe
-else
-  tf2hex = ./tf2hex/tf2hex
 endif
 
 
@@ -58,41 +55,41 @@ if BUILD_Z80_ROM_DUMPERS
 
 BUILT_SOURCES += rom73.h rom82.h rom83.h rom83p.h rom84p.h rom84pc.h rom84pcu.h rom834pceu.h rom85.h rom86.h
 
-rom73.h: romdump_8x/dump73.73p $(tf2hex)
-	$(tf2hex) romdump_8x/dump73.73p $(srcdir)/rom73.h 73
+rom73.h: romdump_8x/dump73.73p
+	$(TIFILEUTIL) dump -f chexarray romdump_8x/dump73.73p -o $(srcdir)/rom73.h -n romDump73 -s romDumpSize73 -c 8 -m 64
 
-rom82.h: romdump_8x/dump82.82y $(tf2hex)
-	$(tf2hex) romdump_8x/dump82.82y $(srcdir)/rom82.h 82
+rom82.h: romdump_8x/dump82.82y
+	$(TIFILEUTIL) dump -f chexarray romdump_8x/dump82.82y -o $(srcdir)/rom82.h -n romDump82 -s romDumpSize82 -c 8 -m 64
 
-rom83.h: romdump_8x/dump83.83p $(tf2hex)
-	$(tf2hex) romdump_8x/dump83.83p $(srcdir)/rom83.h 83
+rom83.h: romdump_8x/dump83.83p
+	$(TIFILEUTIL) dump -f chexarray romdump_8x/dump83.83p -o $(srcdir)/rom83.h -n romDump83 -s romDumpSize83 -c 8 -m 64
 
-rom83p.h: romdump_8x/dump83p.8xp $(tf2hex)
-	$(tf2hex) romdump_8x/dump83p.8xp $(srcdir)/rom83p.h 8Xp
+rom83p.h: romdump_8x/dump83p.8xp
+	$(TIFILEUTIL) dump -f chexarray romdump_8x/dump83p.8xp -o $(srcdir)/rom83p.h -n romDump8Xp -s romDumpSize8Xp -c 8 -m 64
 
-rom84pc.h: romdump_8x/dump84pc.8xp $(tf2hex)
-	$(tf2hex) romdump_8x/dump84pc.8xp $(srcdir)/rom84pc.h 84pc
+rom84pc.h: romdump_8x/dump84pc.8xp
+	$(TIFILEUTIL) dump -f chexarray romdump_8x/dump84pc.8xp -o $(srcdir)/rom84pc.h -n romDump84pc -s romDumpSize84pc -c 8 -m 64
 
-rom85.h: romdump_8x/dump85.85s $(tf2hex)
-	$(tf2hex) romdump_8x/dump85.85s $(srcdir)/rom85.h 85
+rom85.h: romdump_8x/dump85.85s
+	$(TIFILEUTIL) dump -f chexarray romdump_8x/dump85.85s -o $(srcdir)/rom85.h -n romDump85 -s romDumpSize85 -c 8 -m 64
 
-rom86.h: romdump_8x/dump86.86p $(tf2hex)
-	$(tf2hex) romdump_8x/dump86.86p $(srcdir)/rom86.h 86
+rom86.h: romdump_8x/dump86.86p
+	$(TIFILEUTIL) dump -f chexarray romdump_8x/dump86.86p -o $(srcdir)/rom86.h -n romDump86 -s romDumpSize86 -c 8 -m 64
 
 romdump_8x/dump73.73p romdump_8x/dump82.82y romdump_8x/dump83.83p romdump_8x/dump83p.8xp romdump_8x/dump85.85s romdump_8x/dump86.86p romdump_8x/dump84pc.8xp:
 	cd romdump_8x && $(MAKE)
 
-rom84p.h: romdump_84p_usb/dump84p.8xp $(tf2hex)
-	$(tf2hex) romdump_84p_usb/dump84p.8xp $(srcdir)/rom84p.h 84p
+rom84p.h: romdump_84p_usb/dump84p.8xp
+	$(TIFILEUTIL) dump -f chexarray romdump_84p_usb/dump84p.8xp -o $(srcdir)/rom84p.h -n romDump84p -s romDumpSize84p -c 8 -m 64
 
-rom84pcu.h: romdump_84p_usb/dump84pcu.8xp $(tf2hex)
-	$(tf2hex) romdump_84p_usb/dump84pcu.8xp $(srcdir)/rom84pcu.h 84pcu
+rom84pcu.h: romdump_84p_usb/dump84pcu.8xp
+	$(TIFILEUTIL) dump -f chexarray romdump_84p_usb/dump84pcu.8xp -o $(srcdir)/rom84pcu.h -n romDump84pcu -s romDumpSize84pcu -c 8 -m 64
 
 romdump_84p_usb/dump84p.8xp romdump_84p_usb/dump84pcu.8xp:
 	cd romdump_84p_usb && $(MAKE)
 
-rom834pceu.h: romdump_834pce_usb/dump834pceu.8xp $(tf2hex)
-	$(tf2hex) romdump_834pce_usb/dump834pceu.8xp $(srcdir)/rom834pceu.h 834pceu
+rom834pceu.h: romdump_834pce_usb/dump834pceu.8xp
+	$(TIFILEUTIL) dump -f chexarray romdump_834pce_usb/dump834pceu.8xp -o $(srcdir)/rom834pceu.h -n romDump834pceu -s romDumpSize834pceu -c 8 -m 64
 
 romdump_834pce_usb/dump834pceu.8xp:
 	cd romdump_834pce_usb && $(MAKE)
@@ -103,14 +100,14 @@ if BUILD_68K_ROM_DUMPERS
 
 BUILT_SOURCES += rom89.h rom89t.h rom92f2.h
 
-rom89.h: romdump_9x/romdump.89z $(tf2hex)
-	$(tf2hex) romdump_9x/romdump.89z $(srcdir)/rom89.h 89
+rom89.h: romdump_9x/romdump.89z
+	$(TIFILEUTIL) dump -f chexarray romdump_9x/romdump.89z -o $(srcdir)/rom89.h -n romDump89 -s romDumpSize89 -c 8 -m 64
 
-rom89t.h: romdump_9x/romdumpu.89z $(tf2hex)
-	$(tf2hex) romdump_9x/romdumpu.89z $(srcdir)/rom89t.h 89t
+rom89t.h: romdump_9x/romdumpu.89z
+	$(TIFILEUTIL) dump -f chexarray romdump_9x/romdumpu.89z -o $(srcdir)/rom89t.h -n romDump89t -s romDumpSize89t -c 8 -m 64
 
-rom92f2.h: romdump_9x/romdump.92p $(tf2hex)
-	$(tf2hex) romdump_9x/romdump.92p $(srcdir)/rom92f2.h 92
+rom92f2.h: romdump_9x/romdump.92p
+	$(TIFILEUTIL) dump -f chexarray romdump_9x/romdump.92p -o $(srcdir)/rom92f2.h -n romDump92 -s romDumpSize92 -c 8 -m 64
 
 romdump_9x/romdump.89z:
 	cd romdump_9x && $(MAKE)

diff --git a/libticalcs/trunk/src/rom73.h b/libticalcs/trunk/src/rom73.h
@@ -2,8 +2,8 @@ static unsigned char romDump73[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x37, 0x33, 0x2a, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0b, 
 0x00, 0xf1, 0x02, 0x06, 0x52, 0x4f, 0x4d, 0x44, 
@@ -104,4 +104,4 @@ static unsigned char romDump73[] = {
 0x31, 0x32, 0x4b, 0x00, 0x00, 0x08, 0x00, 0x2e, 
 0x2d, 
 };
-static unsigned int romDumpSize73 = 825;
+static unsigned int romDumpSize73 = sizeof(romDump73)/sizeof(romDump73[0]); // 825
diff --git a/libticalcs/trunk/src/rom82.h b/libticalcs/trunk/src/rom82.h
@@ -2,8 +2,8 @@ static unsigned char romDump82[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x32, 0x2a, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x04, 0x0b, 
 0x00, 0xa5, 0x04, 0x03, 0x24, 0x52, 0x44, 0x00, 
@@ -158,4 +158,4 @@ static unsigned char romDump82[] = {
 0x10, 0x12, 0x0c, 0x75, 0x00, 0x00, 0x22, 0x22, 
 0x22, 0x26, 0x1a, 0xde, 0x86, 
 };
-static unsigned int romDumpSize82 = 1261;
+static unsigned int romDumpSize82 = sizeof(romDump82)/sizeof(romDump82[0]); // 1261
diff --git a/libticalcs/trunk/src/rom83.h b/libticalcs/trunk/src/rom83.h
@@ -2,8 +2,8 @@ static unsigned char romDump83[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x33, 0x2a, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0x02, 0x0b, 
 0x00, 0xbb, 0x02, 0x06, 0x52, 0x4f, 0x4d, 0x44, 
@@ -97,4 +97,4 @@ static unsigned char romDump83[] = {
 0x00, 0xd4, 0x3f, 0x30, 0x30, 0x30, 0x30, 0x3f, 
 0xd4, 0x93, 0x1b, 
 };
-static unsigned int romDumpSize83 = 771;
+static unsigned int romDumpSize83 = sizeof(romDump83)/sizeof(romDump83[0]); // 771
diff --git a/libticalcs/trunk/src/rom834pceu.h b/libticalcs/trunk/src/rom834pceu.h
@@ -2,8 +2,8 @@ static unsigned char romDump834pceu[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x33, 0x46, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x02, 0x0d, 
 0x00, 0x82, 0x02, 0x06, 0x52, 0x4f, 0x4d, 0x44, 
@@ -90,4 +90,4 @@ static unsigned char romDump834pceu[] = {
 0x00, 0x07, 0x04, 0x00, 0x00, 0x00, 0x01, 0xaa, 
 0x00, 0x01, 0xa7, 0x2c, 
 };
-static unsigned int romDumpSize834pceu = 716;
+static unsigned int romDumpSize834pceu = sizeof(romDump834pceu)/sizeof(romDump834pceu[0]); // 716
diff --git a/libticalcs/trunk/src/rom83p.h b/libticalcs/trunk/src/rom83p.h
@@ -2,8 +2,8 @@ static unsigned char romDump8Xp[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x33, 0x46, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x03, 0x0d, 
 0x00, 0x2d, 0x03, 0x06, 0x52, 0x4f, 0x4d, 0x44, 
@@ -111,4 +111,4 @@ static unsigned char romDump8Xp[] = {
 0x73, 0x3a, 0x00, 0x30, 0x4b, 0x20, 0x6f, 0x66, 
 0x20, 0x00, 0x00, 0x08, 0x00, 0x66, 0x5b, 
 };
-static unsigned int romDumpSize8Xp = 887;
+static unsigned int romDumpSize8Xp = sizeof(romDump8Xp)/sizeof(romDump8Xp[0]); // 887
diff --git a/libticalcs/trunk/src/rom84p.h b/libticalcs/trunk/src/rom84p.h
@@ -2,8 +2,8 @@ static unsigned char romDump84p[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x33, 0x46, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0xcb, 0x05, 0x0d, 
 0x00, 0xba, 0x05, 0x06, 0x52, 0x4f, 0x4d, 0x44, 
@@ -193,4 +193,4 @@ static unsigned char romDump84p[] = {
 0xd3, 0x06, 0xc9, 0xbe, 0x23, 0x3f, 0xc0, 0x7e, 
 0xb8, 0xc9, 0x6f, 0x6d, 
 };
-static unsigned int romDumpSize84p = 1540;
+static unsigned int romDumpSize84p = sizeof(romDump84p)/sizeof(romDump84p[0]); // 1540
diff --git a/libticalcs/trunk/src/rom84pc.h b/libticalcs/trunk/src/rom84pc.h
@@ -2,8 +2,8 @@ static unsigned char romDump84pc[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x33, 0x46, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x02, 0x0d, 
 0x00, 0x42, 0x02, 0x06, 0x52, 0x4f, 0x4d, 0x44, 
@@ -82,4 +82,4 @@ static unsigned char romDump84pc[] = {
 0x20, 0x34, 0x30, 0x39, 0x36, 0x4b, 0x00, 0x00, 
 0x40, 0x00, 0x8e, 0xf0, 
 };
-static unsigned int romDumpSize84pc = 652;
+static unsigned int romDumpSize84pc = sizeof(romDump84pc)/sizeof(romDump84pc[0]); // 652
diff --git a/libticalcs/trunk/src/rom84pcu.h b/libticalcs/trunk/src/rom84pcu.h
@@ -2,8 +2,8 @@ static unsigned char romDump84pcu[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x33, 0x46, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x05, 0x0d, 
 0x00, 0xfa, 0x04, 0x06, 0x52, 0x4f, 0x4d, 0x44, 
@@ -169,4 +169,4 @@ static unsigned char romDump84pcu[] = {
 0xfb, 0x3e, 0x01, 0xd3, 0x5b, 0xfd, 0xcb, 0x41, 
 0x86, 0xc9, 0xe3, 0x1d, 
 };
-static unsigned int romDumpSize84pcu = 1348;
+static unsigned int romDumpSize84pcu = sizeof(romDump84pcu)/sizeof(romDump84pcu[0]); // 1348
diff --git a/libticalcs/trunk/src/rom85.h b/libticalcs/trunk/src/rom85.h
@@ -2,8 +2,8 @@ static unsigned char romDump85[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x35, 0x2a, 0x2a, 
 0x1a, 0x0c, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x04, 0x07, 
 0x00, 0x7e, 0x04, 0x0c, 0x03, 0x24, 0x52, 0x44, 
@@ -153,4 +153,4 @@ static unsigned char romDump85[] = {
 0x75, 0x00, 0x00, 0x22, 0x22, 0x22, 0x26, 0x1a, 
 0x99, 0x72, 
 };
-static unsigned int romDumpSize85 = 1218;
+static unsigned int romDumpSize85 = sizeof(romDump85)/sizeof(romDump85[0]); // 1218
diff --git a/libticalcs/trunk/src/rom86.h b/libticalcs/trunk/src/rom86.h
@@ -2,8 +2,8 @@ static unsigned char romDump86[] = {
 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x36, 0x2a, 0x2a, 
 0x1a, 0x0a, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 
 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 
-0x70, 0x61, 0x63, 0x6b, 0x20, 0x30, 0x2e, 0x31, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x66, 0x69, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x6c, 
+0x20, 0x30, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x02, 0x0c, 
 0x00, 0x63, 0x02, 0x12, 0x07, 0x52, 0x4f, 0x4d, 
@@ -86,4 +86,4 @@ static unsigned char romDump86[] = {
 0x66, 0x20, 0x32, 0x35, 0x36, 0x4b, 0x00, 0x00, 
 0x04, 0x00, 0x5d, 0xf9, 
 };
-static unsigned int romDumpSize86 = 684;
+static unsigned int romDumpSize86 = sizeof(romDump86)/sizeof(romDump86[0]); // 684
diff --git a/libticalcs/trunk/src/rom89.h b/libticalcs/trunk/src/rom89.h
@@ -178,4 +178,4 @@ static unsigned char romDump89[] = {
 0x00, 0x00, 0x04, 0x62, 0x01, 0x5c, 0xf3, 0x3e, 
 0x78, 
 };
-static unsigned int romDumpSize89 = 1417;
+static unsigned int romDumpSize89 = sizeof(romDump89)/sizeof(romDump89[0]); // 1417
diff --git a/libticalcs/trunk/src/rom89t.h b/libticalcs/trunk/src/rom89t.h
@@ -179,4 +179,4 @@ static unsigned char romDump89t[] = {
 0x4e, 0x75, 0x00, 0x00, 0x04, 0x5a, 0x01, 0x80, 
 0xf3, 0xfd, 0x7b, 
 };
-static unsigned int romDumpSize89t = 1427;
+static unsigned int romDumpSize89t = sizeof(romDump89t)/sizeof(romDump89t[0]); // 1427
diff --git a/libticalcs/trunk/src/rom92f2.h b/libticalcs/trunk/src/rom92f2.h
@@ -151,4 +151,4 @@ static unsigned char romDump92[] = {
 0xe4, 0x00, 0xe8, 0x19, 0xe4, 0xe5, 0x00, 0x00, 
 0x40, 0xdc, 0x5f, 0x28, 
 };
-static unsigned int romDumpSize92 = 1204;
++static unsigned int romDumpSize92 = sizeof(romDump92)/sizeof(romDump92[0]); // 1204
diff --git a/libticalcs/trunk/src/romdump_834pce_usb/Makefile.am b/libticalcs/trunk/src/romdump_834pce_usb/Makefile.am
@@ -10,4 +10,4 @@ endif
 dump834pceu.bin: romdump.z80
 	$(SPASM) $(SPASMFLAGS) -A -DTI834PCE $(srcdir)/romdump.z80 dump834pceu.bin
 dump834pceu.8xp: dump834pceu.bin
-	$(TIPACK) -n 'ROMDUMP' dump834pceu.bin -p -o dump834pceu.8xp
+	$(TIFILEUTIL) wrap -n 'ROMDUMP' dump834pceu.bin -p -o dump834pceu.8xp
diff --git a/libticalcs/trunk/src/romdump_84p_usb/Makefile.am b/libticalcs/trunk/src/romdump_84p_usb/Makefile.am
@@ -10,9 +10,9 @@ endif
 dump84p.bin: romdump.z80
 	$(SPASM) $(SPASMFLAGS) -A -DTI84P $(srcdir)/romdump.z80 dump84p.bin
 dump84p.8xp: dump84p.bin
-	$(TIPACK) -n 'ROMDUMP' dump84p.bin -p -o dump84p.8xp
+	$(TIFILEUTIL) wrap -n 'ROMDUMP' dump84p.bin -p -o dump84p.8xp
 
 dump84pcu.bin: romdump.z80
 	$(SPASM) $(SPASMFLAGS) -A -DTI84PC $(srcdir)/romdump.z80 dump84pcu.bin
 dump84pcu.8xp: dump84pcu.bin
-	$(TIPACK) -n 'ROMDUMP' dump84pcu.bin -p -o dump84pcu.8xp
+	$(TIFILEUTIL) wrap -n 'ROMDUMP' dump84pcu.bin -p -o dump84pcu.8xp