Browse Source

z80-zxspectrum: delete and remove the prt0.asm file. it's not used any more, as it doesn't contain the interrupt code required for stable operation of the target, and this removes sdasz80 dependency from the RTL build process, if another assembler is used by the compiler

git-svn-id: trunk@46950 -
Károly Balogh 4 years ago
parent
commit
882ab946ed
4 changed files with 1 additions and 357 deletions
  1. 0 1
      .gitattributes
  2. 0 339
      rtl/zxspectrum/Makefile
  3. 1 7
      rtl/zxspectrum/Makefile.fpc
  4. 0 10
      rtl/zxspectrum/prt0.asm

+ 0 - 1
.gitattributes

@@ -12268,7 +12268,6 @@ rtl/z80/stringss.inc svneol=native#text/plain
 rtl/z80/z80.inc svneol=native#text/plain
 rtl/z80/z80.inc svneol=native#text/plain
 rtl/zxspectrum/Makefile svneol=native#text/plain
 rtl/zxspectrum/Makefile svneol=native#text/plain
 rtl/zxspectrum/Makefile.fpc svneol=native#text/plain
 rtl/zxspectrum/Makefile.fpc svneol=native#text/plain
-rtl/zxspectrum/prt0.asm svneol=native#text/plain
 rtl/zxspectrum/rtldefs.inc svneol=native#text/plain
 rtl/zxspectrum/rtldefs.inc svneol=native#text/plain
 rtl/zxspectrum/si_prc.pp svneol=native#text/plain
 rtl/zxspectrum/si_prc.pp svneol=native#text/plain
 rtl/zxspectrum/sysdir.inc svneol=native#text/plain
 rtl/zxspectrum/sysdir.inc svneol=native#text/plain

+ 0 - 339
rtl/zxspectrum/Makefile

@@ -673,315 +673,6 @@ endif
 ifeq ($(FULL_TARGET),z80-amstradcpc)
 ifeq ($(FULL_TARGET),z80-amstradcpc)
 override TARGET_UNITS+=system si_prc
 override TARGET_UNITS+=system si_prc
 endif
 endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-android)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i386-aros)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),m68k-macosclassic)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-macosclassic)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-haiku)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-android)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-netbsd)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-android)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-aros)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),arm-ios)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),mipsel-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),mipsel-android)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i8086-msdos)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),i8086-win16)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),aarch64-android)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),aarch64-ios)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override TARGET_LOADERS+=prt0
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override TARGET_LOADERS+=prt0
-endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
@@ -2521,33 +2212,6 @@ else
 EXECPPAS:=@$(PPAS)
 EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
 endif
-.PHONY: fpc_loaders
-ifneq ($(TARGET_LOADERS),)
-override ALLTARGET+=fpc_loaders
-override CLEANTARGET+=fpc_loaders_clean
-override INSTALLTARGET+=fpc_loaders_install
-override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))
-endif
-%$(OEXT): %$(LOADEREXT)
-ifdef COMPILER_UNITTARGETDIR
-	$(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<
-else
-	$(AS) -o $*$(OEXT) $<
-endif
-fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)
-fpc_loaders_clean:
-ifdef COMPILER_UNITTARGETDIR
-	-$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES))
-else
-	-$(DEL) $(LOADEROFILES)
-endif
-fpc_loaders_install:
-	$(MKDIR) $(INSTALL_UNITDIR)
-ifdef COMPILER_UNITTARGETDIR
-	$(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)) $(INSTALL_UNITDIR)
-else
-	$(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)
-endif
 .PHONY: fpc_units
 .PHONY: fpc_units
 ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
 ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
 override ALLTARGET+=fpc_units
 override ALLTARGET+=fpc_units
@@ -2931,9 +2595,6 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
 include $(PROCINC)/makefile.cpu
 include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-prt0$(OEXT) : prt0.asm
-	$(MAKE) $(COMPILER_UNITTARGETDIR)
-	sdasz80 -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) prt0.asm
 system$(PPUEXT) : system.pp $(SYSDEPS)
 system$(PPUEXT) : system.pp $(SYSDEPS)
 	$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
 	$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
 	$(EXECPPAS)
 	$(EXECPPAS)

+ 1 - 7
rtl/zxspectrum/Makefile.fpc

@@ -4,7 +4,7 @@
 [package]
 [package]
 main=rtl
 main=rtl
 [target]
 [target]
-loaders=prt0
+loaders=
 units=system si_prc
 units=system si_prc
 
 
 [require]
 [require]
@@ -49,13 +49,7 @@ include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 # Put system unit dependencies together.
 # Put system unit dependencies together.
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-#
-# Loaders
-#
 
 
-prt0$(OEXT) : prt0.asm
-        $(MAKE) $(COMPILER_UNITTARGETDIR)
-        sdasz80 -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) prt0.asm
 #
 #
 # System Units (System, Objpas, Strings)
 # System Units (System, Objpas, Strings)
 #
 #

+ 0 - 10
rtl/zxspectrum/prt0.asm

@@ -1,10 +0,0 @@
-                        .area _CODE
-                        .globl PASCALMAIN
-                        .globl FPC_SAVE_IY
-                        .globl __fpc_stackarea_start
-                        .globl __fpc_stackarea_end
-
-start::
-                        ld sp, #__fpc_stackarea_end
-                        ld (FPC_SAVE_IY), iy
-                        jp PASCALMAIN