sdk/include: moved `wreg` macro from `zxuno.def` to `rst28.mac`

This commit is contained in:
Ivan Tatarinov 2021-05-17 14:51:34 +03:00
parent a049ad914d
commit a7525a98da
13 changed files with 57 additions and 23 deletions

18
sdk/include/rst28.mac Normal file
View File

@ -0,0 +1,18 @@
; rst28.mac - macros definition for `rst28.inc'.
;
; SPDX-FileCopyrightText: Copyright (C) 2019, 2021 Antonio Villena
;
; SPDX-License-Identifier: GPL-3.0-only
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
ifndef rst28_mac_included
define rst28_mac_included
macro wreg dir, dato
call rst28
defb dir, dato
endm
endif ; !rst28_mac_included

View File

@ -43,9 +43,4 @@
define CMD55 $77
define CMD58 $7a
macro wreg dir, dato
call rst28
defb dir, dato
endm
endif ; !zxuno_def_included

View File

@ -70,6 +70,7 @@ $(DESTDIR)$(bindir):
build/BACK16M: $(srcdir)/back16m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@ -79,6 +80,7 @@ build/BACK16M: $(srcdir)/back16m.asm\
build/BACKZX2: $(srcdir)/back32m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@ -90,6 +92,7 @@ build/BACKZX2: $(srcdir)/back32m.asm\
build/BACKZXD: $(srcdir)/back32m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@ -101,6 +104,7 @@ build/BACKZXD: $(srcdir)/back32m.asm\
build/BACKUP: $(srcdir)/backup.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@ -109,6 +113,7 @@ build/BACKUP: $(srcdir)/backup.asm\
build/CORCLEAN: $(srcdir)/corclean.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/wrflsh.inc\
@ -119,6 +124,7 @@ build/CORCLEAN: $(srcdir)/corclean.asm\
build/COREBIOS: $(srcdir)/corebios.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/wrflsh.inc\
@ -129,6 +135,7 @@ build/COREBIOS: $(srcdir)/corebios.asm\
build/ROMSBACK: $(srcdir)/romsback.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@ -138,6 +145,7 @@ build/ROMSBACK: $(srcdir)/romsback.asm\
build/ROMSUPGR: $(srcdir)/romsupgr.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/rdflsh.inc\
$(INCLUDEDIR)/wrflsh.inc\
@ -148,6 +156,7 @@ build/ROMSUPGR: $(srcdir)/romsupgr.asm\
build/UPGR16M: $(srcdir)/upgr16m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/wrflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@ -157,6 +166,7 @@ build/UPGR16M: $(srcdir)/upgr16m.asm\
build/UPGRZX2: $(srcdir)/upgr32m.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/wrflsh.inc\
$(INCLUDEDIR)/rst28.inc\
@ -179,6 +189,7 @@ build/UPGRZXD: $(srcdir)/upgr32m.asm\
build/UPGRADE: $(srcdir)/upgrade.asm\
$(INCLUDEDIR)/zxuno.def\
$(INCLUDEDIR)/esxdos.def\
$(INCLUDEDIR)/rst28.mac\
$(INCLUDEDIR)/Print.inc\
$(INCLUDEDIR)/wrflsh.inc\
$(INCLUDEDIR)/rst28.inc\

View File

@ -32,10 +32,11 @@
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
output BACK16M
; output BACK16M
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1"
define FLASH_FILE "FLASH.ZX1"

View File

@ -36,14 +36,15 @@
; definition of "zxdos" flag
include back32m.def
IF zxdos=1
output BACKZX2
ELSE
output BACKZXD
ENDIF
; IF zxdos=1
; output BACKZX2
; ELSE
; output BACKZXD
; ENDIF
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1.1"
IF zxdos=1

View File

@ -27,10 +27,11 @@
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
output BACKUP
; output BACKUP
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1"
define FLASH_FILE "FLASH.ZX1"

View File

@ -25,9 +25,10 @@
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
output CORCLEAN
; output CORCLEAN
include zxuno.def
include rst28.mac
define VERSION "0.1"
; define ROMS_FILE "ROMS.ZX1"

View File

@ -25,10 +25,11 @@
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
output COREBIOS
; output COREBIOS
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1"
define CORE_FILE "SPECTRUM.ZX1"

View File

@ -32,10 +32,11 @@
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
output ROMSBACK
; output ROMSBACK
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1"
define ROMS_FILE "ROMS.ZX1"

View File

@ -29,10 +29,11 @@
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
output ROMSUPGR
; output ROMSUPGR
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1"
define ROMS_FILE "ROMS.ZX1"

View File

@ -28,10 +28,11 @@
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
output UPGR16M
; output UPGR16M
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1"
define FLASH_FILE "FLASH.ZX1"

View File

@ -33,14 +33,15 @@
; definition of "zxdos" flag
include upgr32m.def
IF zxdos=1
output UPGRZX2
ELSE
output UPGRZXD
ENDIF
; IF zxdos=1
; output UPGRZX2
; ELSE
; output UPGRZXD
; ENDIF
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1.1"
IF zxdos=1

View File

@ -25,10 +25,11 @@
; Compatible compilers:
; SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
output UPGRADE
; output UPGRADE
include zxuno.def
include esxdos.def
include rst28.mac
define VERSION "0.1"
define FLASH_FILE "FLASH.ZX1"