From d0d37425046a1a969ba99697523368f4b5dcde8a Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Mon, 24 Feb 2014 18:13:12 -0800 Subject: [PATCH] SWTP6800: Added build support for internally contained swtbug.bin as a built-in ROM image --- Visual Studio Projects/Simh.sln | 6 +++ descrip.mms | 2 + makefile | 4 +- sim_BuildROMs.c | 13 ++--- swtp6800/swtp6800/swtp_swtbug_bin.h | 77 +++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 swtp6800/swtp6800/swtp_swtbug_bin.h diff --git a/Visual Studio Projects/Simh.sln b/Visual Studio Projects/Simh.sln index 7e389d71..e5745852 100644 --- a/Visual Studio Projects/Simh.sln +++ b/Visual Studio Projects/Simh.sln @@ -60,8 +60,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I7094", "I7094.vcproj", "{927C3BD9-BD0C-4A23-99F9-DEAD402BEEF9}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swtp6800mp-a", "swtp6800mp-a.vcproj", "{0ABAF350-853E-4A8F-8435-B583E29FB78C}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swtp6800mp-a2", "swtp6800mp-a2.vcproj", "{A0BAF350-853E-4A8F-8435-B583E29FFACE}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildROMs", "BuildROMs.vcproj", "{D40F3AF1-EEE7-4432-9807-2AD287B490F8}" EndProject diff --git a/descrip.mms b/descrip.mms index 5b1be18e..73c5ebed 100644 --- a/descrip.mms +++ b/descrip.mms @@ -1854,6 +1854,7 @@ $(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SWTP6800MP $! $! Building The $(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE Simulator. $! + $ RUN/NODEBUG $(BIN_DIR)BuildROMs-$(ARCH).EXE $ $(CC)$(SWTP6800MP_A_OPTIONS)/OBJ=$(BLD_DIR) SCP.C $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE - $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY @@ -1866,6 +1867,7 @@ $(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SWTP6800M $! $! Building The $(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE Simulator. $! + $ RUN/NODEBUG $(BIN_DIR)BuildROMs-$(ARCH).EXE $ $(CC)$(SWTP6800MP_A2_OPTIONS)/OBJ=$(BLD_DIR) SCP.C $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE - $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A2_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY diff --git a/makefile b/makefile index ba7def15..f8afd828 100644 --- a/makefile +++ b/makefile @@ -1307,13 +1307,13 @@ ${BIN}sds${EXE} : ${SDS} ${SIM} swtp6800mp-a : ${BIN}swtp6800mp-a${EXE} -${BIN}swtp6800mp-a${EXE} : ${SWTP6800MP-A} ${SIM} +${BIN}swtp6800mp-a${EXE} : ${SWTP6800MP-A} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${SWTP6800MP-A} ${SIM} ${SWTP6800_OPT} $(CC_OUTSPEC) ${LDFLAGS} swtp6800mp-a2 : ${BIN}swtp6800mp-a2${EXE} -${BIN}swtp6800mp-a2${EXE} : ${SWTP6800MP-A2} ${SIM} +${BIN}swtp6800mp-a2${EXE} : ${SWTP6800MP-A2} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${SWTP6800MP-A2} ${SIM} ${SWTP6800_OPT} $(CC_OUTSPEC) ${LDFLAGS} diff --git a/sim_BuildROMs.c b/sim_BuildROMs.c index f52bda0f..638e0249 100644 --- a/sim_BuildROMs.c +++ b/sim_BuildROMs.c @@ -38,12 +38,13 @@ ======================================================================================= */ struct ROM_File_Descriptor { - char *BinaryName; char *IncludeFileName; size_t expected_size; unsigned int checksum; char *ArrayName;} ROMs[] = { - {"VAX/ka655x.bin", "VAX/vax_ka655x_bin.h", 131072, 0xFF7673B6, "vax_ka655x_bin"}, - {"VAX/ka620.bin", "VAX/vax_ka620_bin.h", 65536, 0xFF7F930F, "vax_ka620_bin"}, - {"VAX/ka630.bin", "VAX/vax_ka630_bin.h", 65536, 0xFF7F73EF, "vax_ka630_bin"}, - {"VAX/ka610.bin", "VAX/vax_ka610_bin.h", 16384, 0xFFEF3312, "vax_ka610_bin"}, - {"VAX/vmb.exe", "VAX/vax_vmb_exe.h", 44544, 0xFFC014CC, "vax_vmb_exe"}, + char *BinaryName; char *IncludeFileName; size_t expected_size; unsigned int checksum; char *ArrayName;} ROMs[] = { + {"VAX/ka655x.bin", "VAX/vax_ka655x_bin.h", 131072, 0xFF7673B6, "vax_ka655x_bin"}, + {"VAX/ka620.bin", "VAX/vax_ka620_bin.h", 65536, 0xFF7F930F, "vax_ka620_bin"}, + {"VAX/ka630.bin", "VAX/vax_ka630_bin.h", 65536, 0xFF7F73EF, "vax_ka630_bin"}, + {"VAX/ka610.bin", "VAX/vax_ka610_bin.h", 16384, 0xFFEF3312, "vax_ka610_bin"}, + {"VAX/vmb.exe", "VAX/vax_vmb_exe.h", 44544, 0xFFC014CC, "vax_vmb_exe"}, + {"swtp6800/swtp6800/swtbug.bin", "swtp6800/swtp6800/swtp_swtbug_bin.h", 1024, 0xFFFE4FBC, "swtp_swtbug_bin"}, }; diff --git a/swtp6800/swtp6800/swtp_swtbug_bin.h b/swtp6800/swtp6800/swtp_swtbug_bin.h new file mode 100644 index 00000000..8e19ab19 --- /dev/null +++ b/swtp6800/swtp6800/swtp_swtbug_bin.h @@ -0,0 +1,77 @@ +#ifndef ROM_swtp_swtbug_bin_H +#define ROM_swtp_swtbug_bin_H 0 +/* + swtp6800/swtp6800/swtp_swtbug_bin.h produced at Mon Feb 24 17:21:03 2014 + from swtp6800/swtp6800/swtbug.bin which was last modified at Sun Feb 09 12:56:56 2014 + file size: 1024 (0x400) - checksum: 0xFFFE4FBC + This file is a generated file and should NOT be edited or changed by hand. +*/ +#define BOOT_CODE_SIZE 0x400 +#define BOOT_CODE_FILENAME "swtbug.bin" +#define BOOT_CODE_ARRAY swtp_swtbug_bin +unsigned char swtp_swtbug_bin[] = { +0xFE,0xA0,0x00,0x6E,0x00,0x8D,0x40,0x6E,0x00,0x10,0x16,0x04,0xBD,0xE3,0x34,0x8D, +0x67,0x81,0x53,0x26,0xFA,0x8D,0x61,0x81,0x39,0x27,0x29,0x81,0x31,0x26,0xF0,0x7F, +0xA0,0x0F,0x8D,0x31,0x80,0x02,0xB7,0xA0,0x47,0x8D,0x1C,0x8D,0x28,0x7A,0xA0,0x47, +0x27,0x09,0xA7,0x00,0xA1,0x00,0x26,0x08,0x08,0x20,0xF0,0x7C,0xA0,0x0F,0x27,0xCF, +0x86,0x3F,0x8D,0x31,0x7E,0xE2,0xD4,0x8D,0x0C,0xB7,0xA0,0x0D,0x8D,0x07,0xB7,0xA0, +0x0E,0xFE,0xA0,0x0D,0x39,0x8D,0x53,0x48,0x48,0x48,0x48,0x16,0x8D,0x4C,0x1B,0x16, +0xFB,0xA0,0x0F,0xF7,0xA0,0x0F,0x39,0x44,0x44,0x44,0x44,0x84,0x0F,0x8B,0x30,0x81, +0x39,0x23,0x02,0x8B,0x07,0x7E,0xE1,0xD1,0x7E,0xE1,0xAC,0x8D,0xF8,0x08,0xA6,0x00, +0x81,0x04,0x26,0xF7,0x39,0x7E,0xE1,0x4A,0x8D,0xBD,0xCE,0xE1,0x9D,0x8D,0xEF,0xCE, +0xA0,0x0D,0x8D,0x34,0xFE,0xA0,0x0D,0x8D,0x31,0x8D,0x31,0x8D,0xDB,0x81,0x20,0x27, +0xFA,0x81,0x0D,0x27,0xE0,0x81,0x5E,0x20,0x2C,0x01,0x8D,0xCC,0x80,0x30,0x2B,0x4C, +0x81,0x09,0x2F,0x0A,0x81,0x11,0x2B,0x44,0x81,0x16,0x2E,0x40,0x80,0x07,0x39,0xA6, +0x00,0x8D,0xA4,0xA6,0x00,0x08,0x20,0xA3,0x8D,0xF5,0x8D,0xF3,0x86,0x20,0x20,0xA5, +0x8E,0xA0,0x42,0x20,0x2C,0x26,0x07,0x09,0x09,0xFF,0xA0,0x0D,0x20,0xAC,0xFF,0xA0, +0x0D,0x20,0x02,0x20,0x6D,0x81,0x30,0x25,0xA1,0x81,0x46,0x22,0x9D,0x8D,0xBD,0xBD, +0xE0,0x57,0x09,0xA7,0x00,0xA1,0x00,0x27,0x91,0x7E,0xE0,0x40,0xBE,0xA0,0x08,0x20, +0x49,0xBF,0xA0,0x08,0x86,0xFF,0xBD,0xE3,0x08,0xCE,0x80,0x04,0xBD,0xE2,0x84,0xA6, +0x00,0xA1,0x02,0x20,0x02,0x20,0x19,0x26,0x39,0x86,0x03,0xA7,0x00,0x86,0x11,0xA7, +0x00,0x20,0x2F,0x01,0xBF,0xA0,0x08,0x30,0x6D,0x06,0x26,0x02,0x6A,0x05,0x6A,0x06, +0xCE,0xE1,0x9D,0xBD,0xE0,0x7E,0xFE,0xA0,0x08,0x08,0x8D,0x8E,0x8D,0x8C,0x8D,0x8A, +0x8D,0x86,0x8D,0x84,0xCE,0xA0,0x08,0xBD,0xE0,0xC8,0xFE,0xA0,0x12,0x8C,0xE1,0x23, +0x27,0x19,0x8E,0xA0,0x42,0xCE,0x80,0x04,0xFF,0xA0,0x0A,0x7F,0xA0,0x0C,0x8D,0x73, +0x27,0x03,0xBD,0xE2,0x7D,0xBD,0xE3,0x53,0xBD,0xE3,0x47,0xCE,0xE1,0x9C,0xBD,0xE0, +0x7E,0x8D,0x39,0xCE,0xE3,0xD1,0xA1,0x00,0x26,0x07,0xBD,0xE0,0xCC,0xEE,0x01,0x6E, +0x00,0x08,0x08,0x08,0x8C,0xE3,0xF8,0x26,0xED,0x20,0xBF,0xFE,0xA0,0x12,0x6E,0x00, +0x53,0x39,0x04,0x0D,0x0A,0x15,0x00,0x00,0x00,0x53,0x31,0x04,0x13,0x0D,0x0A,0x15, +0x00,0x00,0x00,0x24,0x04,0x20,0x4C,0xFE,0xA0,0x06,0x6E,0x00,0x20,0x40,0xBD,0xE0, +0x47,0xFF,0xA0,0x04,0xBD,0xE0,0x47,0xBD,0xE0,0x55,0x16,0xA6,0x00,0xFF,0xA0,0x0D, +0x11,0x27,0x02,0x20,0x21,0xCE,0xE1,0x9D,0xBD,0xE0,0x7E,0xCE,0xA0,0x0D,0x20,0x10, +0x3B,0x20,0x3A,0xFF,0xA0,0x10,0xFE,0xA0,0x0A,0x37,0xE6,0x01,0xE1,0x03,0x33,0x39, +0xBD,0xE0,0xC8,0xFE,0xA0,0x0D,0xBC,0xA0,0x04,0x27,0x9E,0x08,0x20,0xCD,0x8D,0x06, +0x84,0x7F,0x39,0x31,0x31,0x31,0x37,0x8D,0xDA,0x26,0x28,0x86,0x15,0xA7,0x00,0xA6, +0x00,0x47,0x24,0xFB,0xA6,0x01,0xF6,0xA0,0x0C,0x27,0x07,0x20,0x11,0x37,0x8D,0xC3, +0x26,0x2E,0xC6,0x11,0xE7,0x00,0xE6,0x00,0x57,0x57,0x24,0xFA,0xA7,0x01,0x33,0xFE, +0xA0,0x10,0x39,0xA6,0x00,0x2B,0xFC,0x8D,0x3A,0xC6,0x04,0xE7,0x02,0x58,0x8D,0x2A, +0x0D,0x69,0x00,0x46,0x5A,0x26,0xF7,0x8D,0x21,0xF6,0xA0,0x0C,0x27,0x13,0x20,0xDE, +0x8D,0x23,0xC6,0x0A,0x6A,0x00,0x8D,0x16,0x8D,0x10,0xA7,0x00,0x0D,0x46,0x5A,0x26, +0xF7,0xE6,0x02,0x58,0x2A,0xC8,0x8D,0x02,0x20,0xC4,0x6D,0x02,0x2A,0xFC,0x6C,0x02, +0x6A,0x02,0x39,0x6F,0x02,0x8D,0xF7,0x20,0xF1,0x8D,0x83,0x16,0x7F,0xA0,0x0B,0xFE, +0xA0,0x0A,0x8D,0x10,0x8D,0x07,0xCE,0xE3,0xEF,0x17,0x7E,0xE1,0x76,0x86,0x34,0xA7, +0x03,0xA7,0x02,0x39,0x6C,0x00,0x86,0x07,0xA7,0x01,0x6C,0x00,0xA7,0x02,0x39,0x7F, +0x80,0x14,0x8D,0x2E,0xC6,0x0B,0x8D,0x25,0xE6,0x04,0xC5,0x01,0x26,0xFA,0x6F,0x06, +0x8D,0x1D,0xC6,0x9C,0x8D,0x17,0xCE,0x24,0x00,0xC5,0x02,0x27,0x06,0xB6,0x80,0x1B, +0xA7,0x00,0x08,0xF6,0x80,0x18,0xC5,0x01,0x26,0xEF,0x7E,0x24,0x00,0xE7,0x04,0x8D, +0x00,0x39,0xCE,0xFF,0xFF,0x09,0x8C,0x80,0x14,0x26,0xFA,0x39,0xCE,0xE0,0x09,0xBD, +0xE0,0x7E,0x8D,0xF1,0xBD,0xE3,0x47,0x20,0x58,0xCE,0xE1,0x23,0xBC,0xA0,0x12,0x27, +0x1A,0x08,0x8D,0x32,0xBD,0xE0,0x47,0xFF,0xA0,0x14,0xA6,0x00,0xB7,0xA0,0x16,0x86, +0x3F,0xA7,0x00,0xCE,0xE1,0x23,0x8D,0x1E,0x7E,0xE1,0x6B,0xFE,0xA0,0x14,0xB6,0xA0, +0x16,0xA7,0x00,0xCE,0xE1,0x24,0x20,0xDA,0xB7,0xA0,0x43,0xFE,0xA0,0x12,0x8C,0xE1, +0x23,0x27,0x06,0xCE,0xE1,0x24,0xFF,0xA0,0x12,0x39,0x8D,0x5A,0x20,0x0F,0xCE,0xA0, +0x49,0xFF,0xA0,0x04,0x09,0x8D,0x52,0xCE,0xE1,0x90,0xBD,0xE0,0x7E,0x8D,0x24,0x8D, +0x91,0x7E,0xE1,0x52,0x73,0xA0,0x0C,0x86,0x11,0xC6,0x20,0x8D,0x1A,0xBD,0xE1,0xD9, +0x27,0x04,0x86,0x3C,0xA7,0x03,0x39,0x86,0x13,0xC6,0x10,0x20,0x0A,0x86,0x12,0xC6, +0x04,0x20,0x04,0x86,0x14,0xC6,0x08,0xBD,0xE0,0x75,0xBD,0xE1,0xD6,0x27,0x16,0x86, +0x02,0xCA,0x01,0x8D,0x0C,0x8D,0x08,0x86,0x02,0xC6,0x01,0xE7,0x00,0x8D,0x02,0x86, +0x06,0xA7,0x01,0xE7,0x00,0x39,0xFE,0xA0,0x02,0xFF,0xA0,0x44,0x8D,0xCF,0xB6,0xA0, +0x05,0xB0,0xA0,0x45,0xF6,0xA0,0x04,0xF2,0xA0,0x44,0x26,0x04,0x81,0x10,0x25,0x02, +0x86,0x0F,0x8B,0x04,0xB7,0xA0,0x47,0x80,0x03,0xB7,0xA0,0x46,0xCE,0xE1,0x93,0xBD, +0xE0,0x7E,0x5F,0xCE,0xA0,0x47,0x8D,0x24,0xCE,0xA0,0x44,0x8D,0x1F,0x8D,0x1D,0xFE, +0xA0,0x44,0x8D,0x18,0x7A,0xA0,0x46,0x26,0xF9,0xFF,0xA0,0x44,0x53,0x37,0x30,0x8D, +0x0B,0x33,0xFE,0xA0,0x44,0x09,0xBC,0xA0,0x04,0x26,0xB3,0x39,0xEB,0x00,0x7E,0xE0, +0xBF,0x47,0xE1,0xD0,0x5A,0xC0,0x00,0x4D,0xE0,0x88,0x46,0xE1,0xAE,0x52,0xE1,0x30, +0x4A,0xE0,0x05,0x43,0xE2,0xCC,0x44,0xE2,0x8F,0x42,0xE2,0xD9,0x4F,0xE2,0x69,0x50, +0xE3,0x1A,0x4C,0xE0,0x0C,0x45,0xE3,0x1E,0xE0,0x00,0xE1,0x8B,0xE1,0xA7,0xE0,0xD0,}; +#endif /* ROM_swtp_swtbug_bin_H */