Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
udo-munk committed Jun 1, 2024
2 parents 4bee628 + ae41546 commit ed7d379
Show file tree
Hide file tree
Showing 645 changed files with 122,301 additions and 81,358 deletions.
22 changes: 22 additions & 0 deletions .astylerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
style=kr
lineend=linux
indent=force-tab=8

keep-one-line-blocks
attach-closing-while
indent-preproc-define
min-conditional-indent=3
pad-comma
pad-header
unpad-brackets
squeeze-lines=1
align-pointer=name
attach-return-type
attach-return-type-decl
max-code-length=80

# don't use these for automatic formatting
# since they remove the space in "(int) 4"
# and change "(BYTE) *s" to "(BYTE) * s"
pad-oper
unpad-paren
31 changes: 31 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
*.[ado]
*/*/bios.bin
*/*/bios.lis
*/*/boot.bin
*/*/boot.lis
*/*/putsys
*/auxiliaryin.txt
*/auxiliaryout.txt
*/disks/*.dsk
*/disks/backups/
*/lpt[12].txt
*/printer.txt
*~
altairsim/altairsim
cpmsim/cpmsim
cpmsim/srctools/bin2hex
cpmsim/srctools/cpmrecv
cpmsim/srctools/cpmsend
cpmsim/srctools/mkdskimg
cpmsim/srctools/ptp2bin
cpmtools/*.com
cpmtools/*.lis
cromemcosim/cromemcosim
imsaisim/imsaisim
mosteksim/mosteksim
picosim/build
z80asm/z80asm
z80sim/*.hex
z80sim/*.lis
z80sim/z80sim
intelmdssim/intelmdssim
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "picosim/no-OS-FatFS-SD-SPI-RPi-Pico"]
path = picosim/no-OS-FatFS-SD-SPI-RPi-Pico
url = [email protected]:carlk3/no-OS-FatFS-SD-SPI-RPi-Pico.git
40 changes: 40 additions & 0 deletions HISTORY
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
28-SEP-1987 Development on TARGON/35 with AT&T Unix System V.3
11-JAN-1989 Release 1.1 <included proprietary hardware emulation, not publicly available>
08-FEB-1989 Release 1.2 <included proprietary hardware emulation, not publicly available>
13-MAR-1989 Release 1.3 <included proprietary hardware emulation, not publicly available>
09-FEB-1990 Release 1.4 Ported to TARGON/31 M10/30
20-DEC-1990 Release 1.5 Ported to COHERENT 3.0
10-JUN-1992 Release 1.6 long casting problem solved with COHERENT 3.2
and some optimization
25-JUN-1992 Release 1.7 comments in english and ported to COHERENT 4.0
02-OCT-2006 Release 1.8 modified to compile on modern POSIX OS's
18-NOV-2006 Release 1.9 modified to work with CP/M sources
08-DEC-2006 Release 1.10 modified MMU for working with CP/NET
17-DEC-2006 Release 1.11 TCP/IP sockets for CP/NET
25-DEC-2006 Release 1.12 CPU speed option
19-FEB-2007 Release 1.13 various improvements
06-OCT-2007 Release 1.14 bug fixes and improvements
06-AUG-2008 Release 1.15 many improvements and Windows support via Cygwin
25-AUG-2008 Release 1.16 console status I/O loop detection and line discipline
20-OCT-2008 Release 1.17 frontpanel integrated and Altair/IMSAI emulations
24-JAN-2014 Release 1.18 bug fixes and improvements
02-MAR-2014 Release 1.19 source cleanup and improvements
14-MAR-2014 Release 1.20 added Tarbell SD FDC and printer port to Altair
29-MAR-2014 Release 1.21 many improvements
29-MAY-2014 Release 1.22 improved networking and bugfixes
04-JUN-2014 Release 1.23 added 8080 emulation
06-SEP-2014 Release 1.24 bugfixes and improvements
18-FEB-2015 Release 1.25 bugfixes, improvements, added Cromemco Z-1
18-APR-2015 Release 1.26 bugfixes and improvements
18-JAN-2016 Release 1.27 bugfixes and improvements
05-MAY-2016 Release 1.28 improved usability
20-NOV-2016 Release 1.29 bugfixes and improvements
15-DEC-2016 Release 1.30 improved memory management, machine cycle correct CPUs
28-DEC-2016 Release 1.31 improved memory management, reimplemented MMUs
12-JAN-2017 Release 1.32 improved configurations, front panel, added IMSAI VIO
07-FEB-2017 Release 1.33 bugfixes, improvements, better front panels
16-MAR-2017 Release 1.34 improvements, added ProcTec VDM-1
03-AUG-2017 Release 1.35 added UNIX sockets, bugfixes, improvements
21-DEC-2017 Release 1.36 bugfixes and improvements
06-JAN-2021 Release 1.37 bugfixes and improvements
01-JUN-2024 Release 1.38 bugfixes, improvements, better support for bare metal
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 1987-2021 Udo Munk
Copyright (c) 1987-2024 Udo Munk

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
145 changes: 145 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
PACKAGE = z80pack
PREFIX = $(HOME)
#PREFIX = /usr/local
EXEC_PREFIX = $(PREFIX)
BINDIR = $(EXEC_PREFIX)/bin
DATAROOTDIR = $(PREFIX)/share
DATADIR = $(DATAROOTDIR)/$(PACKAGE)
DOCDIR = $(DATAROOTDIR)/doc/$(PACKAGE)

TOOLS = z80asm cpmsim/srctools
LIBS = frontpanel webfrontend/civetweb
BIOSES = cpmsim/srccpm2 cpmsim/srccpm3 cpmsim/srcmpm cpmsim/srcucsd-iv \
imsaisim/srcucsd-iv
MISC = z80sim cpmtools
MACHINES = altairsim cpmsim cromemcosim imsaisim mosteksim z80sim

Z80ASMDIR = z80asm
Z80ASM = $(Z80ASMDIR)/z80asm
Z80ASMFLAGS = -l -T -sn -p0

ALTAIR_8080 = \
altairsim/basic8k78.asm \
altairsim/dzmation.asm \
altairsim/fdct1.asm \
altairsim/killbits.asm \
altairsim/killbits2.asm \
altairsim/kscope.asm \
altairsim/life.asm \
altairsim/microchess.asm \
altairsim/roms/als8-rom.asm \
altairsim/roms/apple.asm \
altairsim/roms/bootromt.asm \
altairsim/roms/bootromt-old.asm \
altairsim/roms/cuter-mits.asm \
altairsim/roms/dbl.asm \
altairsim/roms/mbl.asm \
altairsim/roms/miniboot.asm \
altairsim/roms/tinybasic-1.0.asm \
altairsim/roms/tinybasic-2.0.asm \
altairsim/roms/turnmon.asm

ALTAIR_Z80 = \
altairsim/roms/umzapex.asm \
altairsim/roms/zapple.asm

CROMEMCO_8080 = \
cromemcosim/dzmation.asm \
cromemcosim/kscope.asm \
cromemcosim/life.asm \
cromemcosim/microchess.asm \
cromemcosim/roms/z1mon-1.0.asm

CROMEMCO_Z80 = \
cromemcosim/roms/rdos1.asm \
cromemcosim/roms/rdos252.asm \
cromemcosim/roms/z1mon-1.4.asm

IMSAI_8080 = \
imsaisim/dzmation.asm \
imsaisim/kscope.asm \
imsaisim/life.asm \
imsaisim/microchess.asm \
imsaisim/roms/basic8k.asm \
imsaisim/roms/memon80.asm \
imsaisim/roms/viofm1.asm \
imsaisim/scs1.asm

IMSAI_Z80 = \
imsaisim/roms/basic4k.asm

all: tools libs bioses misc machines

tools:
@set -e; for subdir in $(TOOLS); do \
$(MAKE) -C $$subdir; \
done

libs:
@set -e; for subdir in $(LIBS); do \
$(MAKE) -C $$subdir; \
done

bioses:
@set -e; for subdir in $(BIOSES); do \
$(MAKE) -C $$subdir; \
done

misc:
@set -e; for subdir in $(MISC); do \
$(MAKE) -C $$subdir; \
done

machines:
@set -e; for subdir in $(MACHINES); do \
$(MAKE) -C $$subdir/srcsim; \
done

reassemble: $(Z80ASM)
@set -e; for file in $(ALTAIR_8080) $(CROMEMCO_8080) $(IMSAI_8080); do \
$(Z80ASM) $(Z80ASMFLAGS) -8 -fh -e16 "$$file"; \
done
@set -e; for file in $(ALTAIR_Z80) $(CROMEMCO_Z80) $(IMSAI_Z80); do \
$(Z80ASM) $(Z80ASMFLAGS) -fh -e16 "$$file"; \
done

$(Z80ASM): FORCE
$(MAKE) -C $(Z80ASMDIR)

FORCE:

install:
# @set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
# $(MAKE) -C $$subdir "PREFIX=$(PREFIX)" install; \
# done
# @set -e; for subdir in $(MACHINES); do \
# $(MAKE) -C $$subdir/srcsim "PREFIX=$(PREFIX)" install; \
# done

uninstall:
# @set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
# $(MAKE) -C $$subdir "PREFIX=$(PREFIX)" uninstall; \
# done
# @set -e; for subdir in $(MACHINES); do \
# $(MAKE) -C $$subdir/srcsim "PREFIX=$(PREFIX)" uninstall; \
# done
# rmdir $(DESTDIR)$(DATADIR)

clean:
@set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
$(MAKE) -C $$subdir clean; \
done
@set -e; for subdir in $(MACHINES); do \
$(MAKE) -C $$subdir/srcsim clean; \
done

distclean:
@set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
$(MAKE) -C $$subdir distclean; \
done
@set -e; for subdir in $(MACHINES); do \
$(MAKE) -C $$subdir/srcsim distclean; \
done

.PHONY: all tools libs bioses misc machines reassemble FORCE \
install uninstall clean distclean
4 changes: 0 additions & 4 deletions altairsim/README

This file was deleted.

Loading

0 comments on commit ed7d379

Please sign in to comment.