folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
parent 7b494542ef
commit 9fa55d0013
18 changed files with 14 additions and 14 deletions
Show stats 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) Code for Z80 CPU from Frank D. Cringle ((c) 1995 under GNU license)
*/ */
#include "m68k.h" #include "m68k/m68k.h"
#include <ctype.h> #include <ctype.h>
#define SWITCHCPU_DEFAULT 0xfd #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. Contains code from Howard M. Harte for defining and changing disk geometry.
*/ */
#include "m68k.h" #include "m68k/m68k.h"
#include "sim_imd.h" #include "sim_imd.h"
/* Debug flags */ /* Debug flags */

2
AltairZ80/altairz80_sys.c
View file

@ -29,7 +29,7 @@
03/27/14 -- MWD Add MITS Hard Disk device (mhdsk_dev) 03/27/14 -- MWD Add MITS Hard Disk device (mhdsk_dev)
*/ */
#include "m68k.h" #include "m68k/m68k.h"
#include <ctype.h> #include <ctype.h>
#define SIM_EMAX 6 #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 */ /* Read/write macros */
#define READ_BYTE(BASE, ADDR) (BASE)[ADDR] #define READ_BYTE(BASE, ADDR) (BASE)[ADDR]

14
Visual Studio Projects/AltairZ80.vcproj
View file

@ -252,31 +252,31 @@
> >
</File> </File>
<File <File
RelativePath="..\AltairZ80\m68kasm.c" RelativePath="..\AltairZ80\m68k\m68kasm.c"
> >
</File> </File>
<File <File
RelativePath="..\AltairZ80\m68kcpu.c" RelativePath="..\AltairZ80\m68k\m68kcpu.c"
> >
</File> </File>
<File <File
RelativePath="..\AltairZ80\m68kdasm.c" RelativePath="..\AltairZ80\m68k\m68kdasm.c"
> >
</File> </File>
<File <File
RelativePath="..\AltairZ80\m68kopac.c" RelativePath="..\AltairZ80\m68k\m68kopac.c"
> >
</File> </File>
<File <File
RelativePath="..\AltairZ80\m68kopdm.c" RelativePath="..\AltairZ80\m68k\m68kopdm.c"
> >
</File> </File>
<File <File
RelativePath="..\AltairZ80\m68kopnz.c" RelativePath="..\AltairZ80\m68k\m68kopnz.c"
> >
</File> </File>
<File <File
RelativePath="..\AltairZ80\m68kops.c" RelativePath="..\AltairZ80\m68k\m68kops.c"
> >
</File> </File>
<File <File

6
makefile
View file

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