From d42472fb9e3f76f357c6034ea4c8b2929bcf4ae3 Mon Sep 17 00:00:00 2001 From: Elliot Nunn Date: Wed, 4 Oct 2017 17:51:30 +0800 Subject: [PATCH] Identify trap AA7F as _MPDispatch --- OS/DispTable.a | 2 +- OS/{NKLogShim.a => MPDispatchStub.a} | 5 ++++- OS/OS.make | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) rename OS/{NKLogShim.a => MPDispatchStub.a} (85%) diff --git a/OS/DispTable.a b/OS/DispTable.a index 18e7fc6..46ad766 100644 --- a/OS/DispTable.a +++ b/OS/DispTable.a @@ -963,7 +963,7 @@ FirstTool ToolBox $26E ; toolbox trap $26E (unknown) ToolBox $26F ; toolbox trap $26F (unknown) DCB.L 15,0 ; toolbox trap $270-$27E (unknown) - ToolBox $27F,NKLog + ToolBox $27F,MPDispatchStubTrap DCB.L 16,0 ; toolbox trap $280-$28F (unknown) ToolBox $290,InitPalettes ; toolbox trap $290 <02Jun87 DAF> ToolBox $291,NewPalette ; toolbox trap $291 <02Jun87 DAF> diff --git a/OS/NKLogShim.a b/OS/MPDispatchStub.a similarity index 85% rename from OS/NKLogShim.a rename to OS/MPDispatchStub.a index 8f8cccd..3436725 100644 --- a/OS/NKLogShim.a +++ b/OS/MPDispatchStub.a @@ -1,3 +1,6 @@ +; This ROM implementation of the MPDispatch trap (AA7F) only implements two +; selectors, both for writing to the NanoKernel framebuffer/serial log. + ; To print a C string: ; PEA @cstring ; MOVE #-3, -(SP) @@ -10,7 +13,7 @@ ; DC.W $AA7F -NKLog PROC EXPORT +MPDispatchStubTrap PROC EXPORT CmpI #-3, $4(SP) BEQ.S NKxprintf diff --git a/OS/OS.make b/OS/OS.make index 80426c1..dffa09f 100644 --- a/OS/OS.make +++ b/OS/OS.make @@ -93,7 +93,7 @@ OSObjs = "{ObjDir}BCScreenRelated.o" "{ObjDir}MiscPatches.a.o" ¶ "{ObjDir}PowerMgr.o" ¶ "{ObjDir}VMPatches.a.o" ¶ - "{ObjDir}NKLogShim.a.o" ¶ + "{ObjDir}MPDispatchStub.a.o" ¶ "{ObjDir}Dispatch.a.o" ¶ "{ObjDir}UniversalTables.a.o" ¶ "{ObjDir}NKEventGroupRelated.a.o" ¶ @@ -283,8 +283,8 @@ OSObjs = "{ObjDir}BCScreenRelated.o" Asm {StdAOpts} -o "{Targ}" "{OSDir}VMPatches.a" -"{ObjDir}NKLogShim.a.o" Ä "{OSDir}NKLogShim.a" - Asm {StdAOpts} -o "{Targ}" "{OSDir}NKLogShim.a" +"{ObjDir}MPDispatchStub.a.o" Ä "{OSDir}MPDispatchStub.a" + Asm {StdAOpts} -o "{Targ}" "{OSDir}MPDispatchStub.a" "{ObjDir}NKEventGroupWrapper.a.o" Ä "{OSDir}NKEventGroupWrapper.a"