From: Alan Cox Date: Fri, 6 Apr 2018 18:36:46 +0000 (+0100) Subject: z80: allow fixedbank to used swapless X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=7218358b58107b054269c9ae4770443f9bc4cd74;p=FUZIX.git z80: allow fixedbank to used swapless --- diff --git a/Kernel/lib/z80fixedbank.s b/Kernel/lib/z80fixedbank.s index e39369c9..03705f2d 100644 --- a/Kernel/lib/z80fixedbank.s +++ b/Kernel/lib/z80fixedbank.s @@ -21,7 +21,6 @@ .globl _runticks .globl unix_syscall_entry .globl interrupt_handler - .globl _swapper .globl _need_resched .globl _nready .globl _platform_idle @@ -93,6 +92,8 @@ _switchin: add hl, de ; process ptr pop de +.ifne CONFIG_SWAP + .globl _swapper ; ; Always use the swapstack, otherwise when we call map_kernel ; having copied the udata stash back to udata we will crap @@ -124,7 +125,7 @@ _switchin: pop de pop hl di - +.endif ld a, (hl) not_swapped: ld hl, (U_DATA__U_PTAB) diff --git a/Kernel/platform-mtx/kernel.def b/Kernel/platform-mtx/kernel.def index 4810f868..92367f44 100644 --- a/Kernel/platform-mtx/kernel.def +++ b/Kernel/platform-mtx/kernel.def @@ -13,3 +13,5 @@ Z80_TYPE .equ 0 VRAM_CH .equ 3 ; font data 0x1800-1BFF ? Z80_MMU_HOOKS .equ 0 + +CONFIG_SWAP .equ 1 diff --git a/Kernel/platform-trs80/kernel.def b/Kernel/platform-trs80/kernel.def index d1803954..9e704d69 100644 --- a/Kernel/platform-trs80/kernel.def +++ b/Kernel/platform-trs80/kernel.def @@ -13,3 +13,5 @@ Z80_TYPE .equ 1 NBUFS .equ 10 Z80_MMU_HOOKS .equ 0 + +CONFIG_SWAP .equ 1 diff --git a/Kernel/platform-ubee/kernel.def b/Kernel/platform-ubee/kernel.def index 1211ad48..86bb8dbd 100644 --- a/Kernel/platform-ubee/kernel.def +++ b/Kernel/platform-ubee/kernel.def @@ -11,3 +11,5 @@ PROGLOAD .equ 0x0100 Z80_TYPE .equ 0 Z80_MMU_HOOKS .equ 0 + +CONFIG_SWAP .equ 1