github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-02-27 01:00:07 +00:00
Code Releases Activity

AltairZ80: M68K: Move Musashi to m68k directory.

Browse Source 
The M68K CPU is from https://github.com/kstenerud/Musashi.  Move into
its own directory to facilitate easier synchronization with upstream
Musashi.
This commit is contained in:
Howard M. Harte
2022-10-08 00:24:49 -07:00
committed by Mark Pizzolato
parent 46be5f5bf0
commit f2a1e15d13
18 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AltairZ80/altairz80_cpu.c
View File

@@ -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 <ctype.h>
#define SWITCHCPU_DEFAULT 0xfd

2
AltairZ80/altairz80_hdsk.c
View File

@@ -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 */

2
AltairZ80/altairz80_sys.c
View File

@@ -29,7 +29,7 @@
03/27/14 -- MWD Add MITS Hard Disk device (mhdsk_dev)
*/
#include "m68k.h"
#include "m68k/m68k.h"
#include <ctype.h>
#define SIM_EMAX 6

0
AltairZ80/m68k.h → AltairZ80/m68k/m68k.h
View File

0
AltairZ80/m68kasm.c → AltairZ80/m68k/m68kasm.c
View File

0
AltairZ80/m68kasm.y.txt → AltairZ80/m68k/m68kasm.y.txt
View File

0
AltairZ80/m68kconf.h → AltairZ80/m68k/m68kconf.h
View File

0
AltairZ80/m68kcpu.c → AltairZ80/m68k/m68kcpu.c
View File

0
AltairZ80/m68kcpu.h → AltairZ80/m68k/m68kcpu.h
View File

0
AltairZ80/m68kdasm.c → AltairZ80/m68k/m68kdasm.c
View File

0
AltairZ80/m68kopac.c → AltairZ80/m68k/m68kopac.c
View File

0
AltairZ80/m68kopdm.c → AltairZ80/m68k/m68kopdm.c
View File

0
AltairZ80/m68kopnz.c → AltairZ80/m68k/m68kopnz.c
View File

0
AltairZ80/m68kops.c → AltairZ80/m68k/m68kops.c
View File

0
AltairZ80/m68kops.h → AltairZ80/m68k/m68kops.h
View File

2
AltairZ80/m68ksim.c
View File

@@ -77,7 +77,7 @@
*/
#include "m68k.h"
#include "m68k/m68k.h"
/* Read/write macros */
#define READ_BYTE(BASE, ADDR) (BASE)[ADDR]

18
Visual Studio Projects/AltairZ80.vcproj
View File

@@ -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 @@
>
</File>
<File
RelativePath="..\AltairZ80\m68kasm.c"
RelativePath="..\AltairZ80\m68k\m68kasm.c"
>
</File>
<File
RelativePath="..\AltairZ80\m68kcpu.c"
RelativePath="..\AltairZ80\m68k\m68kcpu.c"
>
</File>
<File
RelativePath="..\AltairZ80\m68kdasm.c"
RelativePath="..\AltairZ80\m68k\m68kdasm.c"
>
</File>
<File
RelativePath="..\AltairZ80\m68kopac.c"
RelativePath="..\AltairZ80\m68k\m68kopac.c"
>
</File>
<File
RelativePath="..\AltairZ80\m68kopdm.c"
RelativePath="..\AltairZ80\m68k\m68kopdm.c"
>
</File>
<File
RelativePath="..\AltairZ80\m68kopnz.c"
RelativePath="..\AltairZ80\m68k\m68kopnz.c"
>
</File>
<File
RelativePath="..\AltairZ80\m68kops.c"
RelativePath="..\AltairZ80\m68k\m68kops.c"
>
</File>
<File

6
makefile
View File

@@ -1875,9 +1875,9 @@ ALTAIRZ80 = ${ALTAIRZ80D}/altairz80_cpu.c ${ALTAIRZ80D}/altairz80_cpu_nommu.c \
${ALTAIRZ80D}/s100_tarbell.c \
${ALTAIRZ80D}/wd179x.c ${ALTAIRZ80D}/s100_hdc1001.c \
${ALTAIRZ80D}/s100_if3.c ${ALTAIRZ80D}/s100_adcs6.c \
${ALTAIRZ80D}/m68kcpu.c ${ALTAIRZ80D}/m68kdasm.c ${ALTAIRZ80D}/m68kasm.c \
${ALTAIRZ80D}/m68kopac.c ${ALTAIRZ80D}/m68kopdm.c \
${ALTAIRZ80D}/m68kopnz.c ${ALTAIRZ80D}/m68kops.c ${ALTAIRZ80D}/m68ksim.c
${ALTAIRZ80D}/m68k/m68kcpu.c ${ALTAIRZ80D}/m68k/m68kdasm.c ${ALTAIRZ80D}/m68k/m68kasm.c \
${ALTAIRZ80D}/m68k/m68kopac.c ${ALTAIRZ80D}/m68k/m68kopdm.c \
${ALTAIRZ80D}/m68k/m68kopnz.c ${ALTAIRZ80D}/m68k/m68kops.c ${ALTAIRZ80D}/m68ksim.c
ALTAIRZ80_OPT = -I ${ALTAIRZ80D}