From f2a1e15d138721665f31e8a38a4ad6cf360a479b Mon Sep 17 00:00:00 2001 From: "Howard M. Harte" Date: Sat, 8 Oct 2022 00:24:49 -0700 Subject: [PATCH] AltairZ80: M68K: Move Musashi to m68k directory. The M68K CPU is from https://github.com/kstenerud/Musashi. Move into its own directory to facilitate easier synchronization with upstream Musashi. --- AltairZ80/altairz80_cpu.c | 2 +- AltairZ80/altairz80_hdsk.c | 2 +- AltairZ80/altairz80_sys.c | 2 +- AltairZ80/{ => m68k}/m68k.h | 0 AltairZ80/{ => m68k}/m68kasm.c | 0 AltairZ80/{ => m68k}/m68kasm.y.txt | 0 AltairZ80/{ => m68k}/m68kconf.h | 0 AltairZ80/{ => m68k}/m68kcpu.c | 0 AltairZ80/{ => m68k}/m68kcpu.h | 0 AltairZ80/{ => m68k}/m68kdasm.c | 0 AltairZ80/{ => m68k}/m68kopac.c | 0 AltairZ80/{ => m68k}/m68kopdm.c | 0 AltairZ80/{ => m68k}/m68kopnz.c | 0 AltairZ80/{ => m68k}/m68kops.c | 0 AltairZ80/{ => m68k}/m68kops.h | 0 AltairZ80/m68ksim.c | 2 +- Visual Studio Projects/AltairZ80.vcproj | 18 +++++++++--------- makefile | 6 +++--- 18 files changed, 16 insertions(+), 16 deletions(-) rename AltairZ80/{ => m68k}/m68k.h (100%) rename AltairZ80/{ => m68k}/m68kasm.c (100%) rename AltairZ80/{ => m68k}/m68kasm.y.txt (100%) rename AltairZ80/{ => m68k}/m68kconf.h (100%) rename AltairZ80/{ => m68k}/m68kcpu.c (100%) rename AltairZ80/{ => m68k}/m68kcpu.h (100%) rename AltairZ80/{ => m68k}/m68kdasm.c (100%) rename AltairZ80/{ => m68k}/m68kopac.c (100%) rename AltairZ80/{ => m68k}/m68kopdm.c (100%) rename AltairZ80/{ => m68k}/m68kopnz.c (100%) rename AltairZ80/{ => m68k}/m68kops.c (100%) rename AltairZ80/{ => m68k}/m68kops.h (100%) diff --git a/AltairZ80/altairz80_cpu.c b/AltairZ80/altairz80_cpu.c index 01ab2fe2..09525439 100644 --- a/AltairZ80/altairz80_cpu.c +++ b/AltairZ80/altairz80_cpu.c @@ -27,7 +27,7 @@ Code for Z80 CPU from Frank D. Cringle ((c) 1995 under GNU license) */ -#include "m68k.h" +#include "m68k/m68k.h" #include #define SWITCHCPU_DEFAULT 0xfd diff --git a/AltairZ80/altairz80_hdsk.c b/AltairZ80/altairz80_hdsk.c index fb86e726..ea0eae57 100644 --- a/AltairZ80/altairz80_hdsk.c +++ b/AltairZ80/altairz80_hdsk.c @@ -26,7 +26,7 @@ Contains code from Howard M. Harte for defining and changing disk geometry. */ -#include "m68k.h" +#include "m68k/m68k.h" #include "sim_imd.h" /* Debug flags */ diff --git a/AltairZ80/altairz80_sys.c b/AltairZ80/altairz80_sys.c index ff523051..ed73eb46 100644 --- a/AltairZ80/altairz80_sys.c +++ b/AltairZ80/altairz80_sys.c @@ -29,7 +29,7 @@ 03/27/14 -- MWD Add MITS Hard Disk device (mhdsk_dev) */ -#include "m68k.h" +#include "m68k/m68k.h" #include #define SIM_EMAX 6 diff --git a/AltairZ80/m68k.h b/AltairZ80/m68k/m68k.h similarity index 100% rename from AltairZ80/m68k.h rename to AltairZ80/m68k/m68k.h diff --git a/AltairZ80/m68kasm.c b/AltairZ80/m68k/m68kasm.c similarity index 100% rename from AltairZ80/m68kasm.c rename to AltairZ80/m68k/m68kasm.c diff --git a/AltairZ80/m68kasm.y.txt b/AltairZ80/m68k/m68kasm.y.txt similarity index 100% rename from AltairZ80/m68kasm.y.txt rename to AltairZ80/m68k/m68kasm.y.txt diff --git a/AltairZ80/m68kconf.h b/AltairZ80/m68k/m68kconf.h similarity index 100% rename from AltairZ80/m68kconf.h rename to AltairZ80/m68k/m68kconf.h diff --git a/AltairZ80/m68kcpu.c b/AltairZ80/m68k/m68kcpu.c similarity index 100% rename from AltairZ80/m68kcpu.c rename to AltairZ80/m68k/m68kcpu.c diff --git a/AltairZ80/m68kcpu.h b/AltairZ80/m68k/m68kcpu.h similarity index 100% rename from AltairZ80/m68kcpu.h rename to AltairZ80/m68k/m68kcpu.h diff --git a/AltairZ80/m68kdasm.c b/AltairZ80/m68k/m68kdasm.c similarity index 100% rename from AltairZ80/m68kdasm.c rename to AltairZ80/m68k/m68kdasm.c diff --git a/AltairZ80/m68kopac.c b/AltairZ80/m68k/m68kopac.c similarity index 100% rename from AltairZ80/m68kopac.c rename to AltairZ80/m68k/m68kopac.c diff --git a/AltairZ80/m68kopdm.c b/AltairZ80/m68k/m68kopdm.c similarity index 100% rename from AltairZ80/m68kopdm.c rename to AltairZ80/m68k/m68kopdm.c diff --git a/AltairZ80/m68kopnz.c b/AltairZ80/m68k/m68kopnz.c similarity index 100% rename from AltairZ80/m68kopnz.c rename to AltairZ80/m68k/m68kopnz.c diff --git a/AltairZ80/m68kops.c b/AltairZ80/m68k/m68kops.c similarity index 100% rename from AltairZ80/m68kops.c rename to AltairZ80/m68k/m68kops.c diff --git a/AltairZ80/m68kops.h b/AltairZ80/m68k/m68kops.h similarity index 100% rename from AltairZ80/m68kops.h rename to AltairZ80/m68k/m68kops.h diff --git a/AltairZ80/m68ksim.c b/AltairZ80/m68ksim.c index cfb5a04d..1006febd 100644 --- a/AltairZ80/m68ksim.c +++ b/AltairZ80/m68ksim.c @@ -77,7 +77,7 @@ */ -#include "m68k.h" +#include "m68k/m68k.h" /* Read/write macros */ #define READ_BYTE(BASE, ADDR) (BASE)[ADDR] diff --git a/Visual Studio Projects/AltairZ80.vcproj b/Visual Studio Projects/AltairZ80.vcproj index 13c021a4..b28b2ad9 100644 --- a/Visual Studio Projects/AltairZ80.vcproj +++ b/Visual Studio Projects/AltairZ80.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../AltairZ80/;./;../;../slirp;../slirp_glue;../slirp_glue/qemu;../slirp_glue/qemu/win32/include;../../windows-build/include;;../../windows-build/include/SDL2" - PreprocessorDefinitions="NO_INLINE;SIM_BUILD_TOOL=simh-Visual-Studio-Project;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCRE_H;PCRE_STATIC;HAVE_LIBEDIT" + PreprocessorDefinitions="inline=__inline;SIM_BUILD_TOOL=simh-Visual-Studio-Project;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCRE_H;PCRE_STATIC;HAVE_LIBEDIT" KeepComments="false" BasicRuntimeChecks="0" RuntimeLibrary="1" @@ -125,7 +125,7 @@ OmitFramePointers="true" WholeProgramOptimization="true" AdditionalIncludeDirectories="../AltairZ80/;./;../;../slirp;../slirp_glue;../slirp_glue/qemu;../slirp_glue/qemu/win32/include;../../windows-build/include;;../../windows-build/include/SDL2" - PreprocessorDefinitions="NO_INLINE;SIM_BUILD_TOOL=simh-Visual-Studio-Project;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCRE_H;PCRE_STATIC;HAVE_LIBEDIT" + PreprocessorDefinitions="inline=__inline;SIM_BUILD_TOOL=simh-Visual-Studio-Project;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCRE_H;PCRE_STATIC;HAVE_LIBEDIT" StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -252,31 +252,31 @@ >