correct symbol locations

This commit is contained in:
Elliot Nunn 2018-07-06 21:56:33 +08:00
parent 6cd7d2f29e
commit be94869b92
4 changed files with 105 additions and 64 deletions

View File

@ -30,7 +30,7 @@ MaxVMCallCount equ 26
; Accessed ONLY via Sup table
kcVMDispatch ; OUTSIDE REFERER
KCallVMDispatch ; OUTSIDE REFERER
stw r7, KDP.Flags(r1)
lwz r7, KDP.PA_NanoKernelCode(r1)

View File

@ -1,6 +1,6 @@
; AUTO-GENERATED SYMBOL LIST
########################################################################
; These registers will be used throughout
@ -16,7 +16,7 @@ rPgMap set r18
rXER set r17
mfxer rXER
########################################################################
InitVectorTables
@ -110,7 +110,7 @@ rAlt set r8
_kaddr r23, rNK, MemRetryDSI
stw r23, VecTable.DSIVector(r8)
########################################################################
; Fill the NanoKernelCallTable, the IntProgram interface to the NanoKernel
@ -147,16 +147,16 @@ InitKCalls
_kaddr r23, rNK, KCallPrioritizeInterrupts
stw r23, NanoKernelCallTable.PrioritizeInterrupts(r8)
_kaddr r23, rNK, KCallThud
_kaddr r23, rNK, KCallSystemCrash
stw r23, NanoKernelCallTable.Thud(r8)
########################################################################
; Init the NCB Pointer Cache
_InvalNCBPointerCache scratch=r23
########################################################################
; Put HTABORG and PTEGMask in KDP, and zero out the last PTEG
@ -189,7 +189,7 @@ InitHTAB
; Flush the TLB after touching the HTAB
bl PagingFlushTLB
########################################################################
; Get a copy of the PageMap (and the SegMaps required to interpret it)
@ -266,7 +266,7 @@ CopyPageMap
bgt @segmap_copynext_segment
########################################################################
; Copy "BATRangeInit" array
@ -291,7 +291,7 @@ CopyBATRangeInit
stwu r21, 4(r8) ; store LBAT
bgt @bat_copynext_segment
########################################################################
; Save some ptrs that allow us to enable Overlay mode, etc
@ -315,7 +315,7 @@ CopyBATRangeInit
lwz r23, NKConfigurationInfo.BatMap32OvlInit(rCI)
stw r23, KDP.OverlayBatMap(r1)
########################################################################
; Create a PageList for the Primary Address Range
@ -378,7 +378,7 @@ CreatePageList
b @nextpage
@done
########################################################################
; In the PageMap, create a Primary Address Range matching the size of PageList
@ -428,14 +428,14 @@ CreatePARInPageMap
; Reduce the number of pages in the last segment
sth r22, PageMapEntry.PageCount(r8)
########################################################################
; Enable the ROM Overlay
addi r29, r1, KDP.OverlaySegMapPtr
bl PagingFunc2
########################################################################
; Make sure some important areas of RAM are in the HTAB
@ -451,8 +451,8 @@ CreatePARInPageMap
lwz r27, NKConfigurationInfo.LA_EmulatorData(r27)
bl PagingFunc1
########################################################################
; Restore the fixedpt exception register (not sure where we clobbered it?)
; Restore the fixedpt exception register (clobbered by addic)
mtxer rXER

View File

@ -204,13 +204,13 @@ KCallPrioritizeInterrupts
lwz r8, ContextBlock.r8(r6)
lwz r9, ContextBlock.r9(r6)
lwz r6, EWA.r6(r1)
blrl ; (could this ever fall though to KCallallSystemCrash?)
blrl ; (could this ever fall though to KCallSystemCrash?)
########################################################################
; Move registers from CB to EWA, and Thud.
KCallallSystemCrash
KCallSystemCrash
stw r0, EWA.r0(r1)
stw r2, EWA.r2(r1)

View File

@ -13,54 +13,95 @@ NKTop
b VMPanic
printw
Exception
IntReturnToOtherBlueContext
LookupID
ResetBuiltinKernel
LoadInterruptRegisters
MaskedInterruptTaken
save_all_registers
kcMPDispatch
PagingL2PWithBATs
Restore_v0_v31
SchExitInterrupt
SchRestoreStartingAtR14
SchSaveStartingAtR14
SchSwitchSpace
CauseNotification
FDPEmulateInstruction
ReturnFromExceptionFastPath
IntAlignment
IntDecrementerAlternate
IntDecrementerSystem
IntDSI
IntForEmulator_1
IntForEmulator_2
IntForEmulator_3
IntFPUnavail
IntISI
IntMachineCheck
IntPerfMonitor
KCallReturnFromException
KCallSystemCrash
KCallThud
KCallVMDispatch
MemRetryDSI
MemRetryMachineCheck
PagingFlushTLB
PagingFunc2
org 0x23AC
IntReturn
org 0x18F8
PagingFunc1
org 0x468
VMPanic
IntPanicIsland
org 0x0
Entry
org 0xA4
bankLoop
org 0xC8
FloatTables
org 0x308
ProcessorInfoTbl
org 0x374
FiguredOutProcessor
org 0x468
Thud
Panic
VMPanic
org 0x680
IntForEmulator_1
org 0x740
PDM68kInterruptTable
org 0x780
IntForEmulator_2
org 0x840
IntForEmulator_3
org 0x940
IntDecrementerSystem
org 0x9C8
IntDecrementerAlternate
org 0xA00
IntDSI
org 0xB00
IntAlignment
org 0xC00
FDP
org 0x13F4
MemRetryDSI
org 0x1498
MemRetryMachineCheck
org 0x1874
IntISI
org 0x18C4
major_0x039dc
org 0x18D8
major_0x039dc_0x14
org 0x18EC
IntMachineCheck
org 0x18F8
PagingFunc1
org 0x1C74
PagingFunc2
org 0x1E70
PagingL2PWithBATs
org 0x1EDC
PagingL2PWithoutBATs
org 0x1F98
PagingFlushTLB
org 0x1FB8
ExceptionMemRetried
org 0x2034
LetBlueHandleOwnException
org 0x20C0
ReturnFromExceptionFastPath
org 0x20D8
KCallReturnFromException
org 0x2194
LoadInterruptRegisters
org 0x21DC
Exception
org 0x2204
IntReturnToSystemContext
org 0x2214
IntReturnToOtherBlueContext
org 0x23AC
IntReturn
org 0x23F0
major_0x02ccc
org 0x2500
IntFPUnavail
org 0x2550
major_0x03e18
org 0x2558
IntHandleSpecialFPException
org 0x2574
LoadFloatsFromContextBlock
org 0x2600
bugger_around_with_floats
org 0x269C
FloatTables_0
org 0x289C