From 9065934160812c33c524d0e7d4d7f80105d39195 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 30 Mar 2018 22:24:20 +0100 Subject: [PATCH] kernel: pre-empt should now call the platform method directly --- Kernel/lowlevel-65c816.s | 4 ++-- Kernel/lowlevel-6809.s | 2 +- Kernel/lowlevel-z80-banked.s | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Kernel/lowlevel-65c816.s b/Kernel/lowlevel-65c816.s index fe2a79fb..210a06bc 100644 --- a/Kernel/lowlevel-65c816.s +++ b/Kernel/lowlevel-65c816.s @@ -43,7 +43,7 @@ .import platform_doexec .import _inint .import _platform_monitor - .import _switchout + .import _platform_switchout .import push0 .import incaxy @@ -639,7 +639,7 @@ ret_to_user: .i8 lda U_DATA__U_PTAB ldx U_DATA__U_PTAB+1 - jsr _switchout + jsr _platform_switchout ; ; We will (one day maybe) pop back out here. It's not ; guaranteed (we might be killed off) diff --git a/Kernel/lowlevel-6809.s b/Kernel/lowlevel-6809.s index 385ae8ea..d32759a8 100644 --- a/Kernel/lowlevel-6809.s +++ b/Kernel/lowlevel-6809.s @@ -311,7 +311,7 @@ in_kernel: sta P_TAB__P_STATUS_OFFSET,x ; Sleep on the kernel stack, IRQs will get re-enabled if need ; be - jsr _switchout + jsr _platform_switchout ; ; We will resume here after the pre-emption. Get back onto ; the user stack and map ourself in diff --git a/Kernel/lowlevel-z80-banked.s b/Kernel/lowlevel-z80-banked.s index fbcc2cce..c2ae3b58 100644 --- a/Kernel/lowlevel-z80-banked.s +++ b/Kernel/lowlevel-z80-banked.s @@ -32,7 +32,7 @@ .globl _inint .globl _platform_interrupt .globl platform_interrupt_all - .globl _switchout + .globl _platform_switchout ; exported symbols .globl _chksigs @@ -535,7 +535,7 @@ intret2:call map_kernel ; ld hl, (U_DATA__U_PTAB) ld (hl), #P_READY - call _switchout + call _platform_switchout ; ; We are no longer in an interrupt or a syscall ; -- 2.34.1