From: Alan Cox Date: Fri, 30 Mar 2018 19:31:16 +0000 (+0100) Subject: trap/platform rename: Make more consistent use of platform_ naming X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=e459618498bd36e8291d1a4650976dbe6f288640;p=FUZIX.git trap/platform rename: Make more consistent use of platform_ naming --- diff --git a/Kernel/include/kernel.h b/Kernel/include/kernel.h index 144817f0..889a6c0a 100644 --- a/Kernel/include/kernel.h +++ b/Kernel/include/kernel.h @@ -762,7 +762,6 @@ struct selmap { /* functions in common memory */ /* debug functions */ -extern void trap_monitor(void); extern void idump(void); /* platform/device.c */ @@ -993,21 +992,26 @@ extern int pagemap_alloc(ptptr p); extern int pagemap_realloc(usize_t c, usize_t d, usize_t s); extern usize_t pagemap_mem_used(void); extern void map_init(void); + +/* Platform interfaces */ + #ifndef platform_discard extern void platform_discard(void); #endif extern void platform_idle(void); -extern uint8_t rtc_secs(void); -extern void trap_reboot(void); +extern uint8_t platform_rtc_secs(void); +extern int platform_rtc_read(void); +extern int platform_rtc_write(void); +extern void platform_reboot(void); +extern void platform_monitor(void); extern uint8_t platform_param(char *p); extern void platform_switchout(void); +extern void platform_interrupt(void); extern irqflags_t __hard_di(void); extern void __hard_irqrestore(irqflags_t f); extern void __hard_ei(void); -extern int platform_rtc_read(void); -extern int platform_rtc_write(void); #ifndef CONFIG_SOFT_IRQ #define di __hard_di @@ -1017,7 +1021,6 @@ extern int platform_rtc_write(void); /* Will need a uptr_t eventually */ extern uaddr_t ramtop; /* Note: ramtop must be in common in some cases */ -extern void platform_interrupt(void); extern void invalidate_cache(uint16_t page); extern void flush_cache(ptptr p); diff --git a/Kernel/lib/z80fixedbank.s b/Kernel/lib/z80fixedbank.s index 0c3d693e..e39369c9 100644 --- a/Kernel/lib/z80fixedbank.s +++ b/Kernel/lib/z80fixedbank.s @@ -12,7 +12,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _platform_switchout .globl _switchin @@ -69,7 +69,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -188,7 +188,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/lowlevel-6502.s b/Kernel/lowlevel-6502.s index 2ed02747..f5d4c462 100644 --- a/Kernel/lowlevel-6502.s +++ b/Kernel/lowlevel-6502.s @@ -25,7 +25,7 @@ .import platform_doexec .import _inint .import CTemp - .import _trap_monitor + .import _platform_monitor .include "platform/zeropage.inc" .include "platform/kernel.def" @@ -135,7 +135,7 @@ nmi_handler: lda #itrap_msg outfail: jsr outstring - jmp _trap_monitor + jmp _platform_monitor itrap_msg: .byte "itrap!", 0 @@ -909,7 +909,7 @@ nmi_handler: lda #emu_trap lda #badswitchmsg jsr outstring ; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor ; diff --git a/Kernel/platform-atarist/p68000.S b/Kernel/platform-atarist/p68000.S index 76bf8b77..ba936dd4 100644 --- a/Kernel/platform-atarist/p68000.S +++ b/Kernel/platform-atarist/p68000.S @@ -4,22 +4,21 @@ * We need pretty much nothing here as we don't do page mapping. */ - .globl _trap_reboot .globl init_early .globl init_hardware .globl _program_vectors .globl outchar - .globl _trap_reboot,_trap_monitor + .globl _platform_reboot,_platform_monitor .globl _scroll_down,_scroll_up,_plot_char,_clear_lines .globl _clear_across,_cursor_on,_cursor_off .globl _fontdata_8x8, _screenbase .globl _uarea_block .mri 1 -_trap_reboot: -_trap_monitor: +_platform_reboot: +_platform_monitor: or #0700,sr - bra _trap_monitor + bra _platform_monitor init_early: lea.l _uarea_block,a5 ; udata ptr rts diff --git a/Kernel/platform-atarist/tricks.S b/Kernel/platform-atarist/tricks.S index 70d010d8..0e73c147 100644 --- a/Kernel/platform-atarist/tricks.S +++ b/Kernel/platform-atarist/tricks.S @@ -29,7 +29,7 @@ _platform_switchout: bsr _switchin ; we should never get here - bra _trap_monitor + bra _platform_monitor badswitchmsg: ascii "_switchin: FAIL" byte 13,10,0 @@ -67,4 +67,4 @@ switchinfail: lea badswitchmsg,a0 bsr outstring ; something went wrong and we didn't switch in what we asked for - bra _trap_monitor + bra _platform_monitor diff --git a/Kernel/platform-coco2/coco2.s b/Kernel/platform-coco2/coco2.s index b1bdcfa3..9dfcc41c 100644 --- a/Kernel/platform-coco2/coco2.s +++ b/Kernel/platform-coco2/coco2.s @@ -29,8 +29,8 @@ .globl _vtoutput ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar .globl ___hard_di .globl ___hard_ei @@ -89,16 +89,16 @@ init_hardware: .area .common -_trap_reboot: +_platform_reboot: orcc #0x10 clr 0xFFBE lda #0x7e sta 0x0071 ; in case IRQ left it looking valid jmp [0xFFFE] -_trap_monitor: +_platform_monitor: orcc #0x10 - bra _trap_monitor + bra _platform_monitor ___hard_di: tfr cc,b ; return the old irq state diff --git a/Kernel/platform-coco2/tricks.s b/Kernel/platform-coco2/tricks.s index 59749932..379ea38b 100644 --- a/Kernel/platform-coco2/tricks.s +++ b/Kernel/platform-coco2/tricks.s @@ -8,7 +8,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl _inint .globl map_kernel .globl map_process @@ -51,7 +51,7 @@ _platform_switchout: jsr _getproc jsr _switchin ; we should never get here - jsr _trap_monitor + jsr _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" @@ -114,7 +114,7 @@ switchinfail: ldx #badswitchmsg jsr outstring ; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor .area .data diff --git a/Kernel/platform-coco2cart/coco2.s b/Kernel/platform-coco2cart/coco2.s index a0c967e9..79835617 100644 --- a/Kernel/platform-coco2cart/coco2.s +++ b/Kernel/platform-coco2cart/coco2.s @@ -35,8 +35,8 @@ .globl ___hard_irqrestore ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar include "kernel.def" @@ -93,16 +93,16 @@ init_hardware: .area .common -_trap_reboot: +_platform_reboot: orcc #0x10 clr 0xFFBE lda #0x7e sta 0x0071 ; in case IRQ left it looking valid jmp [0xFFFE] -_trap_monitor: +_platform_monitor: orcc #0x10 - bra _trap_monitor + bra _platform_monitor ___hard_di: tfr cc,b ; return the old irq state diff --git a/Kernel/platform-coco2cart/tricks.s b/Kernel/platform-coco2cart/tricks.s index b5ca7b5c..ab47a489 100644 --- a/Kernel/platform-coco2cart/tricks.s +++ b/Kernel/platform-coco2cart/tricks.s @@ -8,7 +8,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl _inint .globl map_kernel .globl map_process @@ -55,7 +55,7 @@ _platform_switchout: jsr _getproc jsr _switchin ; we should never get here - jsr _trap_monitor + jsr _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" @@ -133,7 +133,7 @@ switchinfail: ldx #badswitchmsg jsr outstring ; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor .area .data diff --git a/Kernel/platform-coco3/coco3.s b/Kernel/platform-coco3/coco3.s index 892b7229..b8dfd347 100644 --- a/Kernel/platform-coco3/coco3.s +++ b/Kernel/platform-coco3/coco3.s @@ -26,8 +26,8 @@ .globl blkdev_unrawflg ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar .globl ___hard_di .globl ___hard_ei @@ -69,11 +69,11 @@ _need_resched .db 0 ; scheduler flag -_trap_monitor: +_platform_monitor: orcc #0x10 - bra _trap_monitor + bra _platform_monitor -_trap_reboot: +_platform_reboot: orcc #0x10 ; turn off interrupts lda #0x38 ; put RAM block in memory sta 0xffa8 ; diff --git a/Kernel/platform-coco3/tricks.s b/Kernel/platform-coco3/tricks.s index 84c45d14..a212a36d 100644 --- a/Kernel/platform-coco3/tricks.s +++ b/Kernel/platform-coco3/tricks.s @@ -7,7 +7,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl _get_common .globl _swap_finish @@ -54,7 +54,7 @@ _platform_switchout: jsr _getproc ; X = next process ptr jsr _switchin ; and switch it in ; we should never get here - jsr _trap_monitor + jsr _platform_monitor badswitchmsg: @@ -145,7 +145,7 @@ switchinfail: ldx #badswitchmsg jsr outstring ;; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor ;;; diff --git a/Kernel/platform-dragon-nx32/dragon.s b/Kernel/platform-dragon-nx32/dragon.s index 4cde363c..44713617 100644 --- a/Kernel/platform-dragon-nx32/dragon.s +++ b/Kernel/platform-dragon-nx32/dragon.s @@ -25,8 +25,8 @@ .globl _vtoutput ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar .globl ___hard_di .globl ___hard_ei @@ -97,15 +97,15 @@ init_hardware: .area .common -_trap_reboot: +_platform_reboot: orcc #0x10 clr 0xFFBE clr 0x0071 jmp [0xFFFE] -_trap_monitor: +_platform_monitor: orcc #0x10 - bra _trap_monitor + bra _platform_monitor ___hard_di: tfr cc,b ; return the old irq state diff --git a/Kernel/platform-dragon-nx32/tricks.s b/Kernel/platform-dragon-nx32/tricks.s index fc50984c..3cfb793f 100644 --- a/Kernel/platform-dragon-nx32/tricks.s +++ b/Kernel/platform-dragon-nx32/tricks.s @@ -7,7 +7,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl _inint .globl map_kernel .globl map_process @@ -64,7 +64,7 @@ stash: ldd ,x++ jsr _getproc jsr _switchin ; we should never get here - jsr _trap_monitor + jsr _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13 @@ -142,7 +142,7 @@ switchinfail: ldx #badswitchmsg jsr outstring ; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor .area .data diff --git a/Kernel/platform-dragon/p6809.s b/Kernel/platform-dragon/p6809.s index b62d4d73..e7675630 100644 --- a/Kernel/platform-dragon/p6809.s +++ b/Kernel/platform-dragon/p6809.s @@ -17,8 +17,8 @@ .globl _need_resched ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar .globl ___hard_di .globl ___hard_ei @@ -35,10 +35,10 @@ .area .common -_trap_reboot: -_trap_monitor: +_platform_reboot: +_platform_monitor: cwai #0 - bra _trap_monitor + bra _platform_monitor ___hard_di: tfr cc,b ; return the old irq state diff --git a/Kernel/platform-dragon/tricks.s b/Kernel/platform-dragon/tricks.s index c68e5448..ac22db54 100644 --- a/Kernel/platform-dragon/tricks.s +++ b/Kernel/platform-dragon/tricks.s @@ -7,7 +7,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl _inint .globl _switchout .globl _switchin @@ -53,7 +53,7 @@ _switchout: jsr _getproc jsr _switchin ; we should never get here - jsr _trap_monitor + jsr _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13 @@ -91,7 +91,7 @@ switchinfail: ldx #badswitchmsg jsr outstring ; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor .area .data fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-ibmpc/ibmpc.S b/Kernel/platform-ibmpc/ibmpc.S index 8c1c09a2..c1b8a852 100644 --- a/Kernel/platform-ibmpc/ibmpc.S +++ b/Kernel/platform-ibmpc/ibmpc.S @@ -20,8 +20,8 @@ istack_top: .global init_early .global init_hardware .global program_vectors - .global trap_monitor - .global trap_reboot + .global platform_monitor + .global platform_reboot .global kernel_ds .global bioshd_param @@ -45,9 +45,9 @@ init_hardware: ret program_vectors: ret -trap_monitor: -trap_reboot: - jmp trap_monitor +platform_monitor: +platform_reboot: + jmp platform_monitor /* * Interrupt and trap handlers. The 8086 doesn't have real protection diff --git a/Kernel/platform-ibmpc/tricks.S b/Kernel/platform-ibmpc/tricks.S index a0e4897f..a4f63e28 100644 --- a/Kernel/platform-ibmpc/tricks.S +++ b/Kernel/platform-ibmpc/tricks.S @@ -82,7 +82,7 @@ platform_switchout: call getproc push %ax call switchin - jmp trap_monitor + jmp platform_monitor switchin: /* We can trash registers here because we'll restore them @@ -118,7 +118,7 @@ switchfail: call outaxhex mov $badswitchmsg,ax calloutstring - jmp _trap_monitor + jmp _platform_monitor dofork: pushw %bp movw %sp,%bp diff --git a/Kernel/platform-micropack/tricks.s b/Kernel/platform-micropack/tricks.s index 5cd15b09..a3cfa36c 100644 --- a/Kernel/platform-micropack/tricks.s +++ b/Kernel/platform-micropack/tricks.s @@ -6,7 +6,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _platform_switchout .globl _switchin @@ -53,7 +53,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -153,7 +153,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-micropack/z80pack.s b/Kernel/platform-micropack/z80pack.s index 42bbadda..6ce4599a 100644 --- a/Kernel/platform-micropack/z80pack.s +++ b/Kernel/platform-micropack/z80pack.s @@ -28,8 +28,8 @@ .globl _curbank ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -59,13 +59,13 @@ ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: ld a, #128 out (29), a platform_interrupt_all: ret -_trap_reboot: +_platform_reboot: ld a, #1 out (29), a diff --git a/Kernel/platform-msp430fr5969/crt0.S b/Kernel/platform-msp430fr5969/crt0.S index 9fde13d3..f3f53660 100644 --- a/Kernel/platform-msp430fr5969/crt0.S +++ b/Kernel/platform-msp430fr5969/crt0.S @@ -8,13 +8,13 @@ .globl init_early .globl init_hardware -.globl trap_reboot -.globl trap_monitor +.globl platform_reboot +.globl platform_monitor proc poweron mov.w #(WDTPW | WDTHOLD), &WDTCTL ; Disable watchdog -trap_reboot: -trap_monitor: +platform_reboot: +platform_monitor: dint ; Copy the startup code out of high rom and into its execution address. @@ -26,9 +26,9 @@ trap_monitor: jnz 1b ; Go to the real startup code. - br #trap_reboot_high + br #platform_reboot_high -proc trap_reboot_high +proc platform_reboot_high mov.b #CSKEY>>8, &CSCTL0_H ; Unlock clock registers mov.w #DCOFSEL_3 | DCORSEL, &CSCTL1 ; DCO to 8MHz ; ACLK = VLO; SMCLK = MCLK = DCO diff --git a/Kernel/platform-msx1/msx1.s b/Kernel/platform-msx1/msx1.s index 5fc2d914..7c4f7d77 100644 --- a/Kernel/platform-msx1/msx1.s +++ b/Kernel/platform-msx1/msx1.s @@ -21,7 +21,7 @@ .globl _vtinit ; exported debugging tools - .globl _trap_monitor + .globl _platform_monitor .globl outchar ; imported symbols @@ -30,7 +30,7 @@ .globl _tty_inproc .globl unix_syscall_entry - .globl _trap_reboot + .globl _platform_reboot .globl nmi_handler .globl null_handler @@ -69,12 +69,12 @@ tm_stack: tm_stack_top: ; Ideally return to any debugger/monitor -_trap_monitor: +_platform_monitor: di halt -_trap_reboot: +_platform_reboot: ;FIXME: TODO di halt diff --git a/Kernel/platform-msx1/tricks.s b/Kernel/platform-msx1/tricks.s index f3b0d73c..52a33670 100644 --- a/Kernel/platform-msx1/tricks.s +++ b/Kernel/platform-msx1/tricks.s @@ -6,7 +6,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _platform_switchout .globl _switchin @@ -67,7 +67,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -142,7 +142,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-msx2/msx2.s b/Kernel/platform-msx2/msx2.s index 6a3c0193..c8280266 100644 --- a/Kernel/platform-msx2/msx2.s +++ b/Kernel/platform-msx2/msx2.s @@ -26,12 +26,12 @@ .globl _vtinit ; exported debugging tools - .globl _trap_monitor + .globl _platform_monitor .globl outchar .globl _tty_inproc .globl unix_syscall_entry - .globl _trap_reboot + .globl _platform_reboot .globl nmi_handler .globl null_handler @@ -67,12 +67,12 @@ _bufpool: .area _COMMONMEM ; Ideally return to any debugger/monitor -_trap_monitor: +_platform_monitor: di halt -_trap_reboot: +_platform_reboot: ;FIXME: TODO di halt diff --git a/Kernel/platform-msx2/tricks.s b/Kernel/platform-msx2/tricks.s index c8760376..c60fa07e 100644 --- a/Kernel/platform-msx2/tricks.s +++ b/Kernel/platform-msx2/tricks.s @@ -6,7 +6,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _platform_switchout .globl _switchin @@ -57,7 +57,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -120,7 +120,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-mtx/mtx.s b/Kernel/platform-mtx/mtx.s index 64a8bd09..0df83bca 100644 --- a/Kernel/platform-mtx/mtx.s +++ b/Kernel/platform-mtx/mtx.s @@ -23,8 +23,8 @@ .globl _irqvector ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -67,11 +67,11 @@ intvectors: .dw trace_int ; can be used for CPU tracing etc .dw serial_int ; we don't use the vector mod functions -_trap_monitor: +_platform_monitor: di halt -_trap_reboot: +_platform_reboot: di xor a out (0),a ; ROM mode, we are in common so survive diff --git a/Kernel/platform-multicomp09/multicomp09.s b/Kernel/platform-multicomp09/multicomp09.s index 6b5dc68b..3d7b1138 100644 --- a/Kernel/platform-multicomp09/multicomp09.s +++ b/Kernel/platform-multicomp09/multicomp09.s @@ -79,8 +79,8 @@ .globl curr_tr ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar .globl ___hard_di .globl ___hard_ei @@ -141,13 +141,13 @@ _usr_mmu_map .db 0,1,2,3,4,5,6,7 ; mmu registers 0-7 -_trap_monitor: +_platform_monitor: orcc #0x10 - bra _trap_monitor + bra _platform_monitor -_trap_reboot: +_platform_reboot: orcc #0x10 ; turn off interrupts - bra _trap_reboot ; [NAC HACK 2016May07] endless loop + bra _platform_reboot ; [NAC HACK 2016May07] endless loop lda #0x38 ; put RAM block in memory diff --git a/Kernel/platform-multicomp09/tricks.s b/Kernel/platform-multicomp09/tricks.s index dc719cb1..c9a8aa85 100644 --- a/Kernel/platform-multicomp09/tricks.s +++ b/Kernel/platform-multicomp09/tricks.s @@ -7,7 +7,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl _krn_mmu_map .globl _usr_mmu_map .globl curr_tr @@ -55,7 +55,7 @@ _platform_switchout: jsr _getproc ; X = next process ptr jsr _switchin ; and switch it in ; we should never get here - jsr _trap_monitor + jsr _platform_monitor badswitchmsg: @@ -124,7 +124,7 @@ switchinfail: ldx #badswitchmsg jsr outstring ;; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor ;;; diff --git a/Kernel/platform-n8vem-mark4/monitor.s b/Kernel/platform-n8vem-mark4/monitor.s index de04c78f..bf9bca71 100644 --- a/Kernel/platform-n8vem-mark4/monitor.s +++ b/Kernel/platform-n8vem-mark4/monitor.s @@ -2,8 +2,8 @@ .module monitor .include "kernel.def" - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl map_kernel ; ----------------------------------------------------------------------------- @@ -12,7 +12,7 @@ .include "../lib/monitor-z80.s" .area _COMMONMEM ; just a stub goes in common memory -_trap_monitor: +_platform_monitor: di call map_kernel jp monitor_entry @@ -25,7 +25,7 @@ _trap_monitor: .globl outhl .area _COMMONMEM -_trap_monitor: di +_platform_monitor: di call outnewline ; just dump a few words from the stack ld b, #50 @@ -37,5 +37,5 @@ stacknext: pop hl halt .endif -_trap_reboot: ; TODO - jr _trap_monitor +_platform_reboot: ; TODO + jr _platform_monitor diff --git a/Kernel/platform-nc100/bootblock.s b/Kernel/platform-nc100/bootblock.s index b4222b5e..b2b7aea9 100644 --- a/Kernel/platform-nc100/bootblock.s +++ b/Kernel/platform-nc100/bootblock.s @@ -1,5 +1,5 @@ ; -; Boot blocks for UZI+ on the NC100 +; Boot blocks for FUZIX on the NC100 ; ; ; FIXME: we need a valid NMI vector in the low 0x100 at all times diff --git a/Kernel/platform-nc100/nc100.s b/Kernel/platform-nc100/nc100.s index 98b4c1fd..7c29b45e 100644 --- a/Kernel/platform-nc100/nc100.s +++ b/Kernel/platform-nc100/nc100.s @@ -35,8 +35,8 @@ .globl _vtattr_notify ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -64,12 +64,12 @@ ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: di halt - jr _trap_monitor + jr _platform_monitor -_trap_reboot: +_platform_reboot: xor a out (0x70), a diff --git a/Kernel/platform-nc100/tricks.s b/Kernel/platform-nc100/tricks.s index 079eddb3..33591a9e 100644 --- a/Kernel/platform-nc100/tricks.s +++ b/Kernel/platform-nc100/tricks.s @@ -6,8 +6,8 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor - .globl trap_illegal + .globl _platform_monitor + .globl platform_illegal .globl _platform_switchout .globl _switchin .globl _doexec @@ -59,7 +59,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -117,7 +117,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-p112/monitor.s b/Kernel/platform-p112/monitor.s index 83af254b..5a18d1a8 100644 --- a/Kernel/platform-p112/monitor.s +++ b/Kernel/platform-p112/monitor.s @@ -2,7 +2,7 @@ .module monitor .include "kernel.def" - .globl _trap_monitor + .globl _platform_monitor .globl map_kernel ; ----------------------------------------------------------------------------- @@ -11,7 +11,7 @@ .include "../lib/monitor-z80.s" .area _COMMONMEM ; just a stub goes in common memory -_trap_monitor: +_platform_monitor: di call map_kernel jp monitor_entry @@ -24,7 +24,7 @@ _trap_monitor: .globl outhl .area _COMMONMEM -_trap_monitor: di +_platform_monitor: di call outnewline ; just dump a few words from the stack ld b, #50 diff --git a/Kernel/platform-p112/p112.s b/Kernel/platform-p112/p112.s index 53836140..d0240b5e 100644 --- a/Kernel/platform-p112/p112.s +++ b/Kernel/platform-p112/p112.s @@ -12,7 +12,7 @@ .globl outstring .globl outcharhex .globl platform_interrupt_all - .globl _trap_reboot + .globl _platform_reboot .globl _bufpool ; imported symbols @@ -111,7 +111,7 @@ inchar: in0 a, (ESCC_DATA_A) ret -_trap_reboot: +_platform_reboot: in0 a, (Z182_SYSCONFIG) res 3, a ; re-enable the ROM select line out0 (Z182_SYSCONFIG), a diff --git a/Kernel/platform-pcw8256/pcw8256.s b/Kernel/platform-pcw8256/pcw8256.s index 76532454..3e1807ed 100644 --- a/Kernel/platform-pcw8256/pcw8256.s +++ b/Kernel/platform-pcw8256/pcw8256.s @@ -17,8 +17,8 @@ .globl platform_interrupt_all ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar .globl _bugout @@ -67,14 +67,14 @@ font8x8 .equ 0x9C00 ; font loaded after framebuffer ; ; Ask the controller to reboot ; -_trap_reboot: +_platform_reboot: ld a, #0x01 out (0xF8), a ; should never get here -_trap_monitor: +_platform_monitor: di halt - jr _trap_monitor + jr _platform_monitor platform_interrupt_all: ret diff --git a/Kernel/platform-pcw8256/tricks.s b/Kernel/platform-pcw8256/tricks.s index cb61b91e..10b4579f 100644 --- a/Kernel/platform-pcw8256/tricks.s +++ b/Kernel/platform-pcw8256/tricks.s @@ -4,7 +4,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _inint .globl _platform_switchout @@ -57,7 +57,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -143,7 +143,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-pdp11/pdp11.S b/Kernel/platform-pdp11/pdp11.S index 5460c1e1..580bbc4a 100644 --- a/Kernel/platform-pdp11/pdp11.S +++ b/Kernel/platform-pdp11/pdp11.S @@ -1,7 +1,7 @@ .text .globl _program_vectors - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar .globl init_hardware .globl init_early @@ -10,9 +10,9 @@ init_early: _program_vectors: rts pc -_trap_monitor: -_trap_reboot: - jmp _trap_reboot +_platform_monitor: +_platform_reboot: + jmp _platform_reboot /* .data FOR now */ .even diff --git a/Kernel/platform-pdp11/tricks.S b/Kernel/platform-pdp11/tricks.S index 7f3cb365..68ee0433 100644 --- a/Kernel/platform-pdp11/tricks.S +++ b/Kernel/platform-pdp11/tricks.S @@ -21,7 +21,7 @@ _platform_switchout: jsr pc,_getproc mov r0,-(sp) jsr pc,_switchin - jmp _trap_monitor + jmp _platform_monitor /* Simple swap based to begin with */ _switchin: @@ -71,7 +71,7 @@ switchfail: jsr pc,outr0hex mov $badswitchmsg,r0 jsr pc,outstring - jmp _trap_monitor + jmp _platform_monitor _dofork: mov 2(sp),r0 diff --git a/Kernel/platform-plus3/plus3.s b/Kernel/platform-plus3/plus3.s index 088af138..f04dd125 100644 --- a/Kernel/platform-plus3/plus3.s +++ b/Kernel/platform-plus3/plus3.s @@ -34,8 +34,8 @@ .globl port_map ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -56,16 +56,16 @@ ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: ; ; Not so much a monitor as wait for space ; ld a, #0x7F in a, (0xFE) rra - jr c, _trap_monitor + jr c, _platform_monitor -_trap_reboot: +_platform_reboot: di im 1 ld bc, #0x7ffd diff --git a/Kernel/platform-plus3/tricks.s b/Kernel/platform-plus3/tricks.s index 9033c333..ca619e42 100644 --- a/Kernel/platform-plus3/tricks.s +++ b/Kernel/platform-plus3/tricks.s @@ -10,7 +10,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _inint .globl _platform_switchout @@ -58,7 +58,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -143,7 +143,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-px4plus/px4plus.s b/Kernel/platform-px4plus/px4plus.s index fa679ae4..cbf8c1d0 100644 --- a/Kernel/platform-px4plus/px4plus.s +++ b/Kernel/platform-px4plus/px4plus.s @@ -23,8 +23,8 @@ .globl platform_interrupt_all ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -67,8 +67,8 @@ .area _COMMONMEM ; FIXME: figure out how to reboot into CP/M -_trap_monitor: -_trap_reboot: +_platform_monitor: +_platform_reboot: di halt platform_interrupt_all: diff --git a/Kernel/platform-px4plus/tricks.s b/Kernel/platform-px4plus/tricks.s index 631dc117..30ce5a1f 100644 --- a/Kernel/platform-px4plus/tricks.s +++ b/Kernel/platform-px4plus/tricks.s @@ -6,7 +6,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _inint .globl _platform_switchout @@ -60,7 +60,7 @@ _platform_switchout: pop af ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -159,7 +159,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-socz80/crt0.s b/Kernel/platform-socz80/crt0.s index f675d344..66d1d4f0 100644 --- a/Kernel/platform-socz80/crt0.s +++ b/Kernel/platform-socz80/crt0.s @@ -35,7 +35,7 @@ .globl s__DATA .globl l__DATA .globl kstack_top - .globl _trap_monitor + .globl _platform_monitor ; startup code .area _CODE @@ -67,5 +67,5 @@ init: ; main shouldn't return, but if it does... di - jp _trap_monitor + jp _platform_monitor diff --git a/Kernel/platform-socz80/socz80.s b/Kernel/platform-socz80/socz80.s index a8551146..4dd4f019 100644 --- a/Kernel/platform-socz80/socz80.s +++ b/Kernel/platform-socz80/socz80.s @@ -23,8 +23,8 @@ .globl _irqwork ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -67,8 +67,8 @@ tm_stack: tm_stack_top: ; For now both hit monitor -_trap_reboot: -_trap_monitor: +_platform_reboot: +_platform_monitor: ; stash SP ld (tm_user_sp), sp ; switch to temporary stack @@ -203,7 +203,7 @@ _tty_writeready: jr z, uart0wr cp #2 jr z, uart1wr - call _trap_monitor + call _platform_monitor ret ; not a console we recognise uart1wr: in a, (UART1_STATUS) jr testready diff --git a/Kernel/platform-socz80/tricks.s b/Kernel/platform-socz80/tricks.s index 7156db4b..5292efed 100644 --- a/Kernel/platform-socz80/tricks.s +++ b/Kernel/platform-socz80/tricks.s @@ -7,7 +7,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _inint .globl _platform_switchout @@ -59,7 +59,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor _switchin: di @@ -133,7 +133,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor _dofork: diff --git a/Kernel/platform-tgl6502/tgl6502.s b/Kernel/platform-tgl6502/tgl6502.s index db1e4afa..4846a7c2 100644 --- a/Kernel/platform-tgl6502/tgl6502.s +++ b/Kernel/platform-tgl6502/tgl6502.s @@ -16,8 +16,8 @@ .export platform_doexec ; exported debugging tools - .export _trap_monitor - .export _trap_reboot + .export _platform_monitor + .export _platform_reboot .export outchar .export ___hard_di .export ___hard_ei @@ -55,7 +55,7 @@ syscall = $FE ; ----------------------------------------------------------------------------- .segment "COMMONMEM" -_trap_monitor: +_platform_monitor: ; ; Put the ROM back as it was at entry including the second 8K bank we ; only use for vectors, then jump to $E000 which should enter whatever @@ -68,8 +68,8 @@ _trap_monitor: stx $FF91 ; $E000 jmp $E000 -_trap_reboot: - jmp _trap_reboot ; FIXME: original ROM map and jmp +_platform_reboot: + jmp _platform_reboot ; FIXME: original ROM map and jmp ___hard_di: php diff --git a/Kernel/platform-tgl6502/tricks.s b/Kernel/platform-tgl6502/tricks.s index c196027c..1f910cf5 100644 --- a/Kernel/platform-tgl6502/tricks.s +++ b/Kernel/platform-tgl6502/tricks.s @@ -7,7 +7,7 @@ .export _ramtop .import _chksigs - .import _trap_monitor + .import _platform_monitor .import map_kernel @@ -65,7 +65,7 @@ _switchout: jsr _getproc jsr _switchin ; we should never get here - jsr _trap_monitor + jsr _platform_monitor badswitchmsg: .byte "_switchin: FAIL" .byte 13, 10, 0 @@ -139,7 +139,7 @@ switchinfail: ldx #>badswitchmsg jsr outstring ; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor ; Must not put this in ZP ? ; diff --git a/Kernel/platform-trs80/trs80.s b/Kernel/platform-trs80/trs80.s index 40f71788..703ab71b 100644 --- a/Kernel/platform-trs80/trs80.s +++ b/Kernel/platform-trs80/trs80.s @@ -24,8 +24,8 @@ .globl _video_exg ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -34,7 +34,7 @@ .globl istack_top .globl istack_switched_sp .globl unix_syscall_entry - .globl trap_illegal + .globl platform_illegal .globl outcharhex .globl fd_nmi_handler .globl null_handler @@ -64,7 +64,7 @@ _bufpool: ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: di halt @@ -72,7 +72,7 @@ platform_interrupt_all: in a,(0xef) ret -_trap_reboot: +_platform_reboot: di halt diff --git a/Kernel/platform-ubee/ubee.s b/Kernel/platform-ubee/ubee.s index b02deafe..ef0230d4 100644 --- a/Kernel/platform-ubee/ubee.s +++ b/Kernel/platform-ubee/ubee.s @@ -25,8 +25,8 @@ .globl _hd_page ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -53,7 +53,7 @@ ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: di call map_kernel jp to_monitor @@ -62,7 +62,7 @@ platform_interrupt_all: in a,(0xef) ret -_trap_reboot: +_platform_reboot: di call map_kernel jp to_reboot diff --git a/Kernel/platform-v65/tricks.s b/Kernel/platform-v65/tricks.s index 32e809c9..4819355f 100644 --- a/Kernel/platform-v65/tricks.s +++ b/Kernel/platform-v65/tricks.s @@ -8,7 +8,7 @@ .export _create_init_common .import _chksigs - .import _trap_monitor + .import _platform_monitor .import map_kernel @@ -61,7 +61,7 @@ _platform_switchout: jsr _getproc jsr _switchin ; we should never get here - jsr _trap_monitor + jsr _platform_monitor badswitchmsg: .byte "_switchin: FAIL" .byte 13, 10, 0 @@ -139,7 +139,7 @@ switchinfail: ldx #>badswitchmsg jsr outstring ; something went wrong and we didn't switch in what we asked for - jmp _trap_monitor + jmp _platform_monitor ; Must not put this in ZP ? ; diff --git a/Kernel/platform-v65/v65.s b/Kernel/platform-v65/v65.s index d4a3b31b..ba5e0a9d 100644 --- a/Kernel/platform-v65/v65.s +++ b/Kernel/platform-v65/v65.s @@ -16,8 +16,8 @@ .export platform_doexec ; exported debugging tools - .export _trap_monitor - .export _trap_reboot + .export _platform_monitor + .export _platform_reboot .export outchar .export ___hard_di .export ___hard_ei @@ -57,13 +57,13 @@ syscall = $FE ; ----------------------------------------------------------------------------- .segment "COMMONMEM" -_trap_monitor: - jmp _trap_monitor +_platform_monitor: + jmp _platform_monitor -_trap_reboot: +_platform_reboot: lda #$A5 sta $FE40 ; Off - jmp _trap_reboot ; FIXME: original ROM map and jmp + jmp _platform_reboot ; FIXME: original ROM map and jmp ___hard_di: php diff --git a/Kernel/platform-v65c816-big/v65.s b/Kernel/platform-v65c816-big/v65.s index a45416d0..02ce4a3f 100644 --- a/Kernel/platform-v65c816-big/v65.s +++ b/Kernel/platform-v65c816-big/v65.s @@ -7,8 +7,8 @@ .export _program_vectors ; exported debugging tools - .export _trap_monitor - .export _trap_reboot + .export _platform_monitor + .export _platform_reboot .export outchar .export ___hard_di .export ___hard_ei @@ -41,16 +41,16 @@ syscall = $FE .code -_trap_monitor: - jmp _trap_monitor +_platform_monitor: + jmp _platform_monitor -_trap_reboot: +_platform_reboot: sep #$30 .a8 .i8 lda #$A5 sta $FE40 ; Off - jmp _trap_reboot ; FIXME: original ROM map and jmp + jmp _platform_reboot ; FIXME: original ROM map and jmp ___hard_di: php diff --git a/Kernel/platform-v65c816/v65.s b/Kernel/platform-v65c816/v65.s index f0418bfc..5fc23c17 100644 --- a/Kernel/platform-v65c816/v65.s +++ b/Kernel/platform-v65c816/v65.s @@ -7,8 +7,8 @@ .export _program_vectors ; exported debugging tools - .export _trap_monitor - .export _trap_reboot + .export _platform_monitor + .export _platform_reboot .export outchar .export ___hard_di .export ___hard_ei @@ -43,16 +43,16 @@ syscall = $FE .code -_trap_monitor: - jmp _trap_monitor +_platform_monitor: + jmp _platform_monitor -_trap_reboot: +_platform_reboot: sep #$30 .a8 .i8 lda #$A5 sta $FE40 ; Off - jmp _trap_reboot ; FIXME: original ROM map and jmp + jmp _platform_reboot ; FIXME: original ROM map and jmp ___hard_di: php diff --git a/Kernel/platform-v68-banked/p68000.S b/Kernel/platform-v68-banked/p68000.S index 22021f19..900bd2f1 100644 --- a/Kernel/platform-v68-banked/p68000.S +++ b/Kernel/platform-v68-banked/p68000.S @@ -4,21 +4,21 @@ * Lots left to fill in */ - .globl trap_reboot + .globl platform_reboot .globl init_early .globl init_hardware .globl program_vectors .globl outchar - .globl trap_monitor + .globl platform_monitor .globl udata_block .globl devide_read_data .globl devide_write_data .globl vdso .mri 1 -trap_reboot: -trap_monitor: +platform_reboot: +platform_monitor: or #0700,sr - bra trap_monitor + bra platform_monitor init_early: lea.l udata_block,a5 ; udata ptr diff --git a/Kernel/platform-v68-banked/tricks.S b/Kernel/platform-v68-banked/tricks.S index 09dd4138..159d98a2 100644 --- a/Kernel/platform-v68-banked/tricks.S +++ b/Kernel/platform-v68-banked/tricks.S @@ -82,7 +82,7 @@ copyi: move.l (a1)+,(a0)+ bsr switchin ; we should never get here - bra trap_monitor + bra platform_monitor switchin: or #$0700,sr @@ -161,7 +161,7 @@ switchinfail: lea badswitchmsg,a0 bsr outstring ; something went wrong and we didn't switch in what we asked for - bra trap_monitor + bra platform_monitor ; ; this gets exciting on the 68000 because our udata is not always in diff --git a/Kernel/platform-v68-softmmu/p68000.S b/Kernel/platform-v68-softmmu/p68000.S index 5e80a8d1..cc62c692 100644 --- a/Kernel/platform-v68-softmmu/p68000.S +++ b/Kernel/platform-v68-softmmu/p68000.S @@ -4,21 +4,21 @@ * Lots left to fill in */ - .globl trap_reboot + .globl platform_reboot .globl init_early .globl init_hardware .globl program_vectors .globl outchar - .globl trap_monitor + .globl platform_monitor .globl udata_block .globl devide_read_data .globl devide_write_data .globl vdso .mri 1 -trap_reboot: -trap_monitor: +platform_reboot: +platform_monitor: or #0700,sr - bra trap_monitor + bra platform_monitor init_early: lea.l udata_block,a5 ; udata ptr diff --git a/Kernel/platform-v68-softmmu/tricks.S b/Kernel/platform-v68-softmmu/tricks.S index 1790138e..bd1a4737 100644 --- a/Kernel/platform-v68-softmmu/tricks.S +++ b/Kernel/platform-v68-softmmu/tricks.S @@ -28,7 +28,7 @@ platform_switchout: bsr switchin ; we should never get here - bra trap_monitor + bra platform_monitor switchin: or #$0700,sr @@ -78,7 +78,7 @@ switchinfail: lea badswitchmsg,a0 bsr outstring ; something went wrong and we didn't switch in what we asked for - bra trap_monitor + bra platform_monitor ; ; this gets exciting on the 68000 because our udata is not in a diff --git a/Kernel/platform-v68/p68000.S b/Kernel/platform-v68/p68000.S index de691f90..df93e9c4 100644 --- a/Kernel/platform-v68/p68000.S +++ b/Kernel/platform-v68/p68000.S @@ -4,21 +4,21 @@ * Lots left to fill in */ - .globl trap_reboot + .globl platform_reboot .globl init_early .globl init_hardware .globl program_vectors .globl outchar - .globl trap_monitor + .globl platform_monitor .globl udata_block .globl devide_read_data .globl devide_write_data .globl vdso .mri 1 -trap_reboot: -trap_monitor: +platform_reboot: +platform_monitor: or #0700,sr - bra trap_monitor + bra platform_monitor init_early: lea.l udata_block,a5 ; udata ptr diff --git a/Kernel/platform-v68/tricks.S b/Kernel/platform-v68/tricks.S index bbe20407..a73d3032 100644 --- a/Kernel/platform-v68/tricks.S +++ b/Kernel/platform-v68/tricks.S @@ -27,7 +27,7 @@ platform_switchout: bsr switchin ; we should never get here - bra trap_monitor + bra platform_monitor switchin: or #$0700,sr @@ -102,7 +102,7 @@ switchinfail: lea badswitchmsg,a0 bsr outstring ; something went wrong and we didn't switch in what we asked for - bra trap_monitor + bra platform_monitor ; ; this gets exciting on the 68000 because our udata is not in a diff --git a/Kernel/platform-z80pack-lite/tricks.s b/Kernel/platform-z80pack-lite/tricks.s index 703fa476..72d86baf 100644 --- a/Kernel/platform-z80pack-lite/tricks.s +++ b/Kernel/platform-z80pack-lite/tricks.s @@ -6,7 +6,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _platform_switchout .globl _switchin @@ -59,7 +59,7 @@ _platform__switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -148,7 +148,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-z80pack-lite/z80pack.s b/Kernel/platform-z80pack-lite/z80pack.s index ecda1999..fcf1f3b9 100644 --- a/Kernel/platform-z80pack-lite/z80pack.s +++ b/Kernel/platform-z80pack-lite/z80pack.s @@ -28,8 +28,8 @@ .globl _need_resched ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -58,13 +58,13 @@ ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: ld a, #128 out (29), a platform_interrupt_all: ret -_trap_reboot: +_platform_reboot: ld a, #1 out (29), a diff --git a/Kernel/platform-z80pack/z80pack.s b/Kernel/platform-z80pack/z80pack.s index b8557733..6346ced6 100644 --- a/Kernel/platform-z80pack/z80pack.s +++ b/Kernel/platform-z80pack/z80pack.s @@ -27,10 +27,10 @@ .globl _fd_bankcmd - .globl _trap_reboot + .globl _platform_reboot ; exported debugging tools - .globl _trap_monitor + .globl _platform_monitor .globl outchar ; imported symbols @@ -63,13 +63,13 @@ ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: ld a, #128 out (29), a platform_interrupt_all: ret -_trap_reboot: +_platform_reboot: ld a, #1 out (29), a diff --git a/Kernel/platform-z80pack32/tricks.s b/Kernel/platform-z80pack32/tricks.s index 3e30fe44..4621b92b 100644 --- a/Kernel/platform-z80pack32/tricks.s +++ b/Kernel/platform-z80pack32/tricks.s @@ -6,7 +6,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _inint .globl _platform_switchout @@ -72,7 +72,7 @@ switchoutlow: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -187,7 +187,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor ; (hl) points to cached page ptr, a is desired page update_cache: diff --git a/Kernel/platform-z80pack32/z80pack.s b/Kernel/platform-z80pack32/z80pack.s index 17b6ed58..edc31790 100644 --- a/Kernel/platform-z80pack32/z80pack.s +++ b/Kernel/platform-z80pack32/z80pack.s @@ -29,7 +29,7 @@ .globl _kernel_flag ; exported debugging tools - .globl _trap_monitor + .globl _platform_monitor .globl outchar ; imported symbols @@ -55,13 +55,13 @@ ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: ld a, #128 out (29), a platform_interrupt_all: ret -_trap_reboot: +_platform_reboot: ld a, #1 out (29), a diff --git a/Kernel/platform-zeta-v2/monitor.s b/Kernel/platform-zeta-v2/monitor.s index 83af254b..5a18d1a8 100644 --- a/Kernel/platform-zeta-v2/monitor.s +++ b/Kernel/platform-zeta-v2/monitor.s @@ -2,7 +2,7 @@ .module monitor .include "kernel.def" - .globl _trap_monitor + .globl _platform_monitor .globl map_kernel ; ----------------------------------------------------------------------------- @@ -11,7 +11,7 @@ .include "../lib/monitor-z80.s" .area _COMMONMEM ; just a stub goes in common memory -_trap_monitor: +_platform_monitor: di call map_kernel jp monitor_entry @@ -24,7 +24,7 @@ _trap_monitor: .globl outhl .area _COMMONMEM -_trap_monitor: di +_platform_monitor: di call outnewline ; just dump a few words from the stack ld b, #50 diff --git a/Kernel/platform-zeta-v2/tricks.s b/Kernel/platform-zeta-v2/tricks.s index 8939fdf9..93bc9d90 100644 --- a/Kernel/platform-zeta-v2/tricks.s +++ b/Kernel/platform-zeta-v2/tricks.s @@ -6,7 +6,7 @@ .globl _newproc .globl _chksigs .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _platform_switchout .globl _switchin @@ -59,7 +59,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -117,7 +117,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor fork_proc_ptr: .dw 0 ; (C type is struct p_tab *) -- address of child process p_tab entry diff --git a/Kernel/platform-zeta-v2/zeta-v2.s b/Kernel/platform-zeta-v2/zeta-v2.s index 18bf3d13..5eccc77a 100644 --- a/Kernel/platform-zeta-v2/zeta-v2.s +++ b/Kernel/platform-zeta-v2/zeta-v2.s @@ -15,7 +15,7 @@ .globl platform_interrupt_all .globl mpgsel_cache .globl _kernel_pages - .globl _trap_reboot + .globl _platform_reboot .globl _bufpool ; imported symbols @@ -118,7 +118,7 @@ init_partial_uart: ;========================================================================= .area _CODE -_trap_reboot: +_platform_reboot: ; We need to map the ROM back in -- ideally into every page. ; This little trick based on a clever suggestion from John Coffman. di diff --git a/Kernel/platform-zx128/tricks.s b/Kernel/platform-zx128/tricks.s index defe921f..612e7845 100644 --- a/Kernel/platform-zx128/tricks.s +++ b/Kernel/platform-zx128/tricks.s @@ -8,7 +8,7 @@ .globl _ptab_alloc .globl _newproc .globl _getproc - .globl _trap_monitor + .globl _platform_monitor .globl trap_illegal .globl _platform_switchout .globl _switchin @@ -80,7 +80,7 @@ _platform_switchout: call _switchin ; we should never get here - call _trap_monitor + call _platform_monitor badswitchmsg: .ascii "_switchin: FAIL" .db 13, 10, 0 @@ -247,7 +247,7 @@ switchinfail: ld hl, #badswitchmsg call outstring ; something went wrong and we didn't switch in what we asked for - jp _trap_monitor + jp _platform_monitor ; Interrupts should be off when this is called _dup_low_page: diff --git a/Kernel/platform-zx128/zx128.s b/Kernel/platform-zx128/zx128.s index 1e4a51e5..f56d5b29 100644 --- a/Kernel/platform-zx128/zx128.s +++ b/Kernel/platform-zx128/zx128.s @@ -26,8 +26,8 @@ .globl _need_resched ; exported debugging tools - .globl _trap_monitor - .globl _trap_reboot + .globl _platform_monitor + .globl _platform_reboot .globl outchar ; imported symbols @@ -71,16 +71,16 @@ ; ----------------------------------------------------------------------------- .area _COMMONMEM -_trap_monitor: +_platform_monitor: ; ; Not so much a monitor as wait for space ; ld a, #0x7F in a, (0xFE) rra - jr c, _trap_monitor + jr c, _platform_monitor -_trap_reboot: +_platform_reboot: di im 1 ld bc, #0x7ffd diff --git a/Kernel/process.c b/Kernel/process.c index 7c9e6a4a..82fc2bab 100644 --- a/Kernel/process.c +++ b/Kernel/process.c @@ -852,7 +852,7 @@ void panic(char *deathcry) { kputs("\r\npanic: "); kputs(deathcry); - trap_monitor(); + platform_monitor(); } /* We put this here so that we can blow the start.c code away on exec diff --git a/Kernel/syscall_other.c b/Kernel/syscall_other.c index 95410ad9..3e9efbca 100644 --- a/Kernel/syscall_other.c +++ b/Kernel/syscall_other.c @@ -536,9 +536,9 @@ arg_t _uadmin(void) sync(); /* Wants moving into machine specific files */ if (cmd == A_SHUTDOWN || cmd == A_DUMP) - trap_monitor(); + platform_monitor(); if (cmd == A_REBOOT) - trap_reboot(); + platform_reboot(); /* We don't do SWAPCTL yet */ udata.u_error = EINVAL; diff --git a/Kernel/tty.c b/Kernel/tty.c index 9afb868f..5c4b9ca0 100644 --- a/Kernel/tty.c +++ b/Kernel/tty.c @@ -374,7 +374,7 @@ uint8_t tty_inproc(uint8_t minor, unsigned char c) #endif #ifdef CONFIG_MONITOR if (c == 0x01) /* ^A */ - trap_monitor(); + platform_monitor(); #endif if (c == '\r' ){