From 0550413e409ca494cc55cb4a39fe7081ee853a8c Mon Sep 17 00:00:00 2001 From: Elliot Nunn Date: Sat, 7 Oct 2017 13:28:42 +0800 Subject: [PATCH] Isolate freezing Expansion Bus Mgr func --- CoolStuff.a | 48 +++++++++++++++++++++++++++++++++++++++++ Make/MainCode.Make | 6 +++++- OS/StartMgr/StartInit.a | 4 ++-- 3 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 CoolStuff.a diff --git a/CoolStuff.a b/CoolStuff.a new file mode 100644 index 0000000..5600777 --- /dev/null +++ b/CoolStuff.a @@ -0,0 +1,48 @@ +EBM_FAKE_FIRSTFUNC PROC EXPORT + + + IMPORT BaseOfROM + MACHINE MC68030 + + + pea @str1 + move #-3,-(sp) + dc.w $aa7f + + bsr.l (BaseOfROM + $49590) + + pea @str2 + move #-3,-(sp) + dc.w $aa7f + + bsr.l (BaseOfROM + $471DE) + + pea @str3 + move #-3,-(sp) + dc.w $aa7f + + bsr.l (BaseOfROM + $44FF0) + + pea @str4 + move #-3,-(sp) + dc.w $aa7f + + rts + + + STRING C +@str1 + dc.b '*68k: Entered fake FirstFunc^n' + ALIGN 2 +@str2 + dc.b '*68k: returned from 49590^n' + ALIGN 2 +@str3 + dc.b '*68k: returned from 471DE^n' + ALIGN 2 +@str4 + dc.b '*68k: returned from 44FF0 ... returning^n' + ALIGN 2 + + + END diff --git a/Make/MainCode.Make b/Make/MainCode.Make index c69bca3..f81bb87 100644 --- a/Make/MainCode.Make +++ b/Make/MainCode.Make @@ -87,12 +87,16 @@ MainCodeLibs = # ¶ # Keep DispTable at end ¶ # ¶ - "{ObjDir}DispTable.a.o" + "{ObjDir}DispTable.a.o" "{ObjDir}CoolStuff.a.o" # # end of ROM # +"{ObjDir}CoolStuff.a.o" Ä "{Sources}CoolStuff.a" + Asm {StdAOpts} -o "{Targ}" "{Sources}CoolStuff.a" + + # # Main Code Image Resource # diff --git a/OS/StartMgr/StartInit.a b/OS/StartMgr/StartInit.a index f26ef8e..5244067 100644 --- a/OS/StartMgr/StartInit.a +++ b/OS/StartMgr/StartInit.a @@ -1545,8 +1545,8 @@ BootRetry MOVE #$2700,SR ; disable interrupts IMPORT InterC_15c0_CodePrepare2 BSR.L InterC_15c0_CodePrepare2 - IMPORT EXPANSIONBUSMGRFIRSTFUNC - BSR.L EXPANSIONBUSMGRFIRSTFUNC + IMPORT EBM_FAKE_FIRSTFUNC + BSR.L EBM_FAKE_FIRSTFUNC BSR.L CompBootStackOld ; lifted from SetUpSysAppZone MOVE.L A0,SP