From a8f71fd71f60d7dfcfa5b1a871ff51bbb57b0c8f Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 8 Jun 2015 00:35:24 +0100 Subject: [PATCH] trap_reboot: fix the first batch of platforms to export it --- Kernel/Makefile | 4 ++-- Kernel/platform-micropack/z80pack.s | 1 + Kernel/platform-msx1/msx1.s | 2 +- Kernel/platform-msx2/msx2.s | 2 +- Kernel/platform-mtx/mtx.s | 1 + Kernel/platform-nc100/nc100.s | 1 + Kernel/platform-px4plus/px4plus.s | 1 + Kernel/platform-socz80/socz80.s | 3 +++ Kernel/platform-trs80/trs80.s | 1 + 9 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Kernel/Makefile b/Kernel/Makefile index 68b1c782..97c4b6a6 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -5,7 +5,7 @@ TARGET_LIST = platform-nc100 platform-micropack platform-pcw8256 platform-socz80 #export TARGET = atarist #export TARGET = bbcmicro #export TARGET = dragon -export TARGET = dragon-nx32 +#export TARGET = dragon-nx32 #export TARGET = micropack #export TARGET = msx1 #export TARGET = msx2 @@ -18,7 +18,7 @@ export TARGET = dragon-nx32 #export TARGET = px4plus #export TARGET = socz80 #export TARGET = tgl6502 -#export TARGET = trs80 +export TARGET = trs80 #export TARGET = ubee #export TARGET = z80pack #export TARGET = z80pack-lite diff --git a/Kernel/platform-micropack/z80pack.s b/Kernel/platform-micropack/z80pack.s index e4a01691..f5a096b3 100644 --- a/Kernel/platform-micropack/z80pack.s +++ b/Kernel/platform-micropack/z80pack.s @@ -27,6 +27,7 @@ ; exported debugging tools .globl _trap_monitor + .globl _trap_reboot .globl outchar ; imported symbols diff --git a/Kernel/platform-msx1/msx1.s b/Kernel/platform-msx1/msx1.s index ae18ae7d..5fc2d914 100644 --- a/Kernel/platform-msx1/msx1.s +++ b/Kernel/platform-msx1/msx1.s @@ -30,7 +30,7 @@ .globl _tty_inproc .globl unix_syscall_entry - .globl trap_illegal + .globl _trap_reboot .globl nmi_handler .globl null_handler diff --git a/Kernel/platform-msx2/msx2.s b/Kernel/platform-msx2/msx2.s index a0446ddb..c360e0ae 100644 --- a/Kernel/platform-msx2/msx2.s +++ b/Kernel/platform-msx2/msx2.s @@ -30,7 +30,7 @@ .globl _tty_inproc .globl unix_syscall_entry - .globl trap_illegal + .globl _trap_reboot .globl nmi_handler .globl null_handler diff --git a/Kernel/platform-mtx/mtx.s b/Kernel/platform-mtx/mtx.s index 50927000..64a8bd09 100644 --- a/Kernel/platform-mtx/mtx.s +++ b/Kernel/platform-mtx/mtx.s @@ -24,6 +24,7 @@ ; exported debugging tools .globl _trap_monitor + .globl _trap_reboot .globl outchar ; imported symbols diff --git a/Kernel/platform-nc100/nc100.s b/Kernel/platform-nc100/nc100.s index 876b3738..0c59b8f4 100644 --- a/Kernel/platform-nc100/nc100.s +++ b/Kernel/platform-nc100/nc100.s @@ -38,6 +38,7 @@ ; exported debugging tools .globl _trap_monitor + .globl _trap_reboot .globl outchar ; imported symbols diff --git a/Kernel/platform-px4plus/px4plus.s b/Kernel/platform-px4plus/px4plus.s index 9cea76a1..d2030a3c 100644 --- a/Kernel/platform-px4plus/px4plus.s +++ b/Kernel/platform-px4plus/px4plus.s @@ -24,6 +24,7 @@ ; exported debugging tools .globl _trap_monitor + .globl _trap_reboot .globl outchar ; imported symbols diff --git a/Kernel/platform-socz80/socz80.s b/Kernel/platform-socz80/socz80.s index 62dc65eb..a8551146 100644 --- a/Kernel/platform-socz80/socz80.s +++ b/Kernel/platform-socz80/socz80.s @@ -24,6 +24,7 @@ ; exported debugging tools .globl _trap_monitor + .globl _trap_reboot .globl outchar ; imported symbols @@ -65,6 +66,8 @@ tm_stack: .db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 tm_stack_top: +; For now both hit monitor +_trap_reboot: _trap_monitor: ; stash SP ld (tm_user_sp), sp diff --git a/Kernel/platform-trs80/trs80.s b/Kernel/platform-trs80/trs80.s index ae5ca7af..2a93ec94 100644 --- a/Kernel/platform-trs80/trs80.s +++ b/Kernel/platform-trs80/trs80.s @@ -31,6 +31,7 @@ ; exported debugging tools .globl _trap_monitor + .globl _trap_reboot .globl outchar ; imported symbols -- 2.34.1