From 4c0e5221f18c94657597a5ab978a330553b2a135 Mon Sep 17 00:00:00 2001 From: Elliot Nunn Date: Sun, 15 Apr 2018 15:05:02 +0800 Subject: [PATCH] Remove unnecessary static branch hints These + and - characters in a branch mnemonic can cause the assembler to produce conditional branch instructions with that hint the branch predictor. The default for forward branches is -, and for backward branches is +. If a mnemonic is issued with the opposite sign, then bit 10 of the instruction (the LSB of the BO field) is set. My long-retired "ppcdisasm" script inserted these hints unconditionally, despite 98% of them not being required. The code is much cleaner now. I read in some old MPW release notes that PPCAsm and PPCLink together exhibit a quirk when linking conditional branches to imported symbols. PPCAsm always assembles these conditional branches as if they were forward branches (that is, a + hint will always set the hint bit, and a - hint will never). I hoped to use this property to divine whether the NanoKernel was linked from one or many assembly files, but I was frustrated by the lack of conditional branches between files. --- NanoKernel/NKAdditions.s | 4 +- NanoKernel/NKAddressSpaceMPCalls.s | 886 ++++++++++++++--------------- NanoKernel/NKBuiltinInit.s | 138 ++--- NanoKernel/NKCache.s | 66 +-- NanoKernel/NKConsoleLog.s | 88 +-- NanoKernel/NKIndex.s | 50 +- NanoKernel/NKInit.s | 90 +-- NanoKernel/NKInterrupts.s | 258 ++++----- NanoKernel/NKMPCalls.s | 312 +++++----- NanoKernel/NKPaging.s | 128 ++--- NanoKernel/NKPoolAllocator.s | 46 +- NanoKernel/NKPowerCalls.s | 42 +- NanoKernel/NKPrimaryIntHandlers.s | 112 ++-- NanoKernel/NKProcInfoTbl.s | 2 +- NanoKernel/NKRTASCalls.s | 18 +- NanoKernel/NKReplacementInit.s | 26 +- NanoKernel/NKScheduler.s | 328 +++++------ NanoKernel/NKScreenConsole.s | 86 +-- NanoKernel/NKSleep.s | 74 +-- NanoKernel/NKSync.s | 380 ++++++------- NanoKernel/NKTasks.s | 252 ++++---- NanoKernel/NKThud.s | 148 ++--- NanoKernel/NKTimers.s | 92 +-- NanoKernel/NKTranslation.s | 74 +-- NanoKernel/NKVMCalls.s | 426 +++++++------- 25 files changed, 2063 insertions(+), 2063 deletions(-) diff --git a/NanoKernel/NKAdditions.s b/NanoKernel/NKAdditions.s index 371be32..6575048 100644 --- a/NanoKernel/NKAdditions.s +++ b/NanoKernel/NKAdditions.s @@ -14,10 +14,10 @@ NKDebug rlwinm. r9, r11, 0, MSR_DRbit, MSR_DRbit ; IntSyscall sets this mr r8, r3 - beq- @already_physical + beq @already_physical li r9, 0 bl V2P ; takes page EA in r8, r9=0, returns page PA in r17 - beq- @fail + beq @fail rlwimi r8, r17, 0, 0, 19 @already_physical diff --git a/NanoKernel/NKAddressSpaceMPCalls.s b/NanoKernel/NKAddressSpaceMPCalls.s index e94368c..af750e8 100644 --- a/NanoKernel/NKAddressSpaceMPCalls.s +++ b/NanoKernel/NKAddressSpaceMPCalls.s @@ -86,19 +86,19 @@ convert_pmdts_to_areas ; OUTSIDE REFERER ; Based on those flags, do one of two things cmplwi r8, 0 cmplwi cr1, r8, $800 | $400 - beq- @pmdt_flags_are_zero - beq- cr1, @pmdt_flags_are_c00 + beq @pmdt_flags_are_zero + beq cr1, @pmdt_flags_are_c00 ; Else if not a full-segment PMDT, next PMDT cmplwi cr2, r15, 0x0000 cmplwi cr3, r16, 0xffff - bne+ cr2, @next_pmdt - bne+ cr3, @next_pmdt + bne cr2, @next_pmdt + bne cr3, @next_pmdt ; Else if there are segments remaining (16 total), next segment. addis r26, r26, 0x1000 cmplwi r26, 0 ; once it wraps to zero, we're done - bne+ @next_segment_entry + bne @next_segment_entry ; Else create special one-page Areas to catch naughty pointer derefs, ; then return. @@ -108,7 +108,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER li r8, Area.Size bl PoolAllocClear mr. r31, r8 - beq+ Local_Panic + beq Local_Panic lwz r8, EWA.PA_CurAddressSpace(r1) stw r8, Area.AddressSpacePtr(r31) @@ -132,7 +132,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER bl createarea cmpwi r9, noErr - beq- @success_68f168f1 + beq @success_68f168f1 mr r8, r31 bl PoolFree @success_68f168f1 @@ -143,7 +143,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER li r8, Area.Size bl PoolAllocClear mr. r31, r8 - beq+ Local_Panic + beq Local_Panic lwz r8, EWA.PA_CurAddressSpace(r1) stw r8, Area.AddressSpacePtr(r31) @@ -167,7 +167,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER bl createarea cmpwi r9, noErr - beq- @success_deadbeef + beq @success_deadbeef mr r8, r31 bl PoolFree @success_deadbeef @@ -189,11 +189,11 @@ convert_pmdts_to_areas ; OUTSIDE REFERER ; Apparently other iterations leave this to find? lwz r8, EWA.SpacesDeferredAreaPtr(r1) cmpwi r8, 0 - beq- @thing_is_zero + beq @thing_is_zero bl createarea cmpwi r9, noErr - bne+ Local_Panic + bne Local_Panic li r8, 0 stw r8, EWA.SpacesDeferredAreaPtr(r1) @@ -204,7 +204,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER li r8, Area.Size bl PoolAllocClear mr. r31, r8 - beq+ Local_Panic + beq Local_Panic ; Reload PMDT details lwz r17, PMDT.PBaseAndFlags(r25) @@ -239,7 +239,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER rlwinm r9, r17, 0, 0, 19 stw r9, 0x0070(r31) andi. r16, r17, 0x03 - bne- @_20c + bne @_20c ori r17, r17, 0x02 @_20c @@ -260,7 +260,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER bl createarea cmpwi r9, noErr mr r31, r8 - beq+ @next_pmdt + beq @next_pmdt ; If CreateArea failed, assume that it was due to overlap with another Area. @@ -278,10 +278,10 @@ convert_pmdts_to_areas ; OUTSIDE REFERER stw r17, EWA.SpacesSavedAreaBase(r1) ; ??? stw r16, Area.Length(r31) ; we will try again, with no overlap - beq- @found_area_has_same_base + beq @found_area_has_same_base ; If FoundArea < FailedArea, panic (impossible for FindAreaAbove to return this) - bltl+ Local_Panic ; below would be impossible + bltl Local_Panic ; below would be impossible ; If AboveArea > FailedArea, create NewArea (=> r30) mr r8, r31 @@ -289,19 +289,19 @@ convert_pmdts_to_areas ; OUTSIDE REFERER cmpwi r9, noErr ; strike three mr r30, r8 - bnel+ Local_Panic + bnel Local_Panic ; If AboveArea.LogicalEnd >= FailedArea.LogicalEnd then continue to next PMDT. lwz r15, Area.LogicalEnd(r24) lwz r16, EWA.SpacesSavedAreaBase(r1) subf. r16, r15, r16 - ble+ @next_pmdt + ble @next_pmdt ; Else replace FailedArea with an Area copied from NewArea li r8, Area.Size bl PoolAllocClear mr. r31, r8 - beq+ Local_Panic + beq Local_Panic li r8, Area.Size - 4 @area_copy_loop @@ -309,7 +309,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER stwx r9, r8, r31 cmpwi r8, 0 subi r8, r8, 4 - bgt+ @area_copy_loop + bgt @area_copy_loop @found_area_has_same_base ; Else (AboveArea == ThisArea), do nothing special (endif) @@ -321,7 +321,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER lwz r16, EWA.SpacesSavedAreaBase(r1) ; this is FailedArea.LogicalEnd subf. r16, r15, r16 addi r15, r15, 1 - blel+ Local_Panic + blel Local_Panic stw r16, Area.Length(r31) stw r15, Area.LogicalBase(r31) @@ -339,7 +339,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER li r8, Area.Size bl PoolAllocClear mr. r31, r8 - beq+ Local_Panic + beq Local_Panic lwz r17, 0x0004(r25) lhz r15, 0x0000(r25) @@ -372,26 +372,26 @@ convert_pmdts_to_areas ; OUTSIDE REFERER lwz r9, -0x0430(r1) cmpwi r9, noErr - bgt- @_374 + bgt @_374 ori r8, r8, 0x80 @_374 stw r8, Area.Flags(r31) cmpwi r15, 0x00 - bne- @_388 + bne @_388 stw r31, EWA.SpacesDeferredAreaPtr(r1) b @next_pmdt @_388 lwz r18, EWA.SpacesDeferredAreaPtr(r1) cmpwi r18, 0x00 - beq- @_3c8 + beq @_3c8 lwz r8, 0x0024(r18) lwz r9, 0x002c(r18) add r19, r8, r9 cmplw r19, r15 - bne- @_3c8 + bne @_3c8 add r9, r9, r16 addi r19, r9, -0x01 stw r9, 0x002c(r18) @@ -408,7 +408,7 @@ convert_pmdts_to_areas ; OUTSIDE REFERER mr r8, r31 bl createarea cmpwi r9, noErr - bne+ Local_Panic + bne Local_Panic b @next_pmdt @@ -442,7 +442,7 @@ KCGetPageSizeClasses ; OUTSIDE REFERER KCGetPageSize ; OUTSIDE REFERER cmpwi r3, 0x01 - bne+ ReturnParamErrFromMPCall + bne ReturnParamErrFromMPCall lwz r3, 0x0f30(r1) b CommonMPCallReturnPath @@ -460,12 +460,12 @@ MPCall_70 ; OUTSIDE REFERER lwz r9, Area.AddressSpacePtr(r17) lwz r16, 0x0008(r9) rlwinm. r16, r16, 0, 30, 30 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM bl NKCreateAddressSpaceSub _AssertAndRelease PSA.SchLock, scratch=r16 mr. r3, r8 li r4, 0x00 - bne+ CommonMPCallReturnPath + bne CommonMPCallReturnPath lwz r4, 0x0000(r9) b CommonMPCallReturnPath @@ -483,7 +483,7 @@ NKCreateAddressSpaceSub mflr r30 ; Use the motherboard coherence group if none is provided in r8 - bne- @cgrp_provided + bne @cgrp_provided mfsprg r15, 0 lwz r28, EWA.CPUBase + CPU.LLL + LLL.Freeform(r15) @@ -494,7 +494,7 @@ NKCreateAddressSpaceSub cmpwi r9, CoherenceGroup.kIDClass mr r28, r8 - bne- @fail_notcgrp + bne @fail_notcgrp lwz r28, CoherenceGroup.LLL + LLL.Next(r28) @got_cgrp @@ -521,7 +521,7 @@ NKCreateAddressSpaceSub li r8, AddressSpace.Size bl PoolAllocClear mr. r31, r8 - beq- @fail_OOM + beq @fail_OOM ; Give the addr spc a copy of the SpecialPtr of its parent cgrp @@ -533,7 +533,7 @@ NKCreateAddressSpaceSub bl MakeID cmpwi r8, 0x00 - beq- @fail_MakeID + beq @fail_MakeID stw r8, AddressSpace.ID(r31) @@ -542,7 +542,7 @@ NKCreateAddressSpaceSub lwz r16, CoherenceGroup.Incrementer(r28) addi r16, r16, 1 clrlwi. r16, r16, 12 - beq- @fail_toomanycalls + beq @fail_toomanycalls stw r16, CoherenceGroup.Incrementer(r28) @@ -559,7 +559,7 @@ NKCreateAddressSpaceSub rlwimi r16, r17, 18, 8, 11 ; = index (15, 14, 13...) << 20 stwx r16, r17, r18 addi r17, r17, -4 - bne+ @fill_loop + bne @fill_loop ; Sign the addr spc struct @@ -580,7 +580,7 @@ NKCreateAddressSpaceSub li r8, Area.Size bl PoolAllocClear mr. r29, r8 - beq- @fail_OOM_again + beq @fail_OOM_again ; Sign the Area lisori r8, Area.kSignature @@ -658,19 +658,19 @@ MPCall_71 ; OUTSIDE REFERER bl LookupID cmpwi r9, AddressSpace.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Area.ProcessID(r31) cmpwi r16, 0x00 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM addi r16, r31, 0x10 lwz r17, 0x0018(r31) cmpw r16, r17 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM addi r16, r31, 0x20 lwz r17, Area.LogicalEnd(r31) cmpw r16, r17 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r8, 0x0074(r31) ; r8 = id @@ -732,17 +732,17 @@ KCSetTaskAddressSpace ; OUTSIDE REFERER bl LookupID mr r31, r8 cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, Task.Flags(r31) mtcr r16 li r3, kMPTaskAbortedErr - beq+ cr7, ReleaseAndReturnMPCall - bne+ cr5, ReleaseAndReturnMPCallOOM + beq cr7, ReleaseAndReturnMPCall + bne cr5, ReleaseAndReturnMPCallOOM lbz r16, 0x0018(r31) cmpwi r16, 0x00 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM mr r8, r4 ; r8 = id @@ -754,9 +754,9 @@ KCSetTaskAddressSpace ; OUTSIDE REFERER lwz r16, 0x0060(r31) cmpwi r9, 0x08 lwz r17, 0x0074(r30) - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr cmpw r16, r17 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r17, 0x0070(r31) lwz r16, 0x000c(r17) addi r16, r16, -0x01 @@ -798,20 +798,20 @@ MPCreateArea mr. r8, r3 mfsprg r28, 0 lwz r30, EWA.PA_CurAddressSpace(r28) - beq- @use_current_space + beq @use_current_space ; ... else use the one specified. bl LookupID cmpwi r9, AddressSpace.kIDClass mr r30, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr @use_current_space ; Allocate the new Area li r8, Area.Size bl PoolAllocClear mr. r31, r8 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall ; Populate stw r30, Area.AddressSpacePtr(r31) @@ -836,7 +836,7 @@ MPCreateArea _AssertAndRelease PSA.SchLock, scratch=r16 mr. r3, r9 - bne- @error + bne @error ; CreateArea returned successfully lwz r8, Area.LogicalBase(r31) @@ -882,20 +882,20 @@ createarea ; OUTSIDE REFERER rlwinm. r16, r16, 0, 28, 28 lisori r16, 0xfffc13e0 ; if bit 28 = 0 - beq- @use_other + beq @use_other lisori r16, 0xfff99be0 ; if bit 28 = 1 @use_other and. r16, r16, r17 - bne- ReturnFromCreateArea + bne ReturnFromCreateArea andi. r16, r17, 0x1f cmpwi cr1, r16, 0x0c - beq- createarea_0x50 - blt- cr1, ReturnFromCreateArea + beq createarea_0x50 + blt cr1, ReturnFromCreateArea createarea_0x50 - bne- createarea_0x5c + bne createarea_0x5c ori r17, r17, 0x0c stw r17, 0x0020(r31) @@ -905,7 +905,7 @@ createarea_0x5c slw r18, r18, r16 stw r18, 0x0078(r31) rlwinm. r16, r17, 27, 27, 31 - bne- ReturnFromCreateArea + bne ReturnFromCreateArea addi r16, r16, 0x0c li r18, -0x01 slw r18, r18, r16 @@ -917,12 +917,12 @@ createarea_0x5c add r16, r16, r19 and. r16, r16, r18 stw r16, Area.Length(r31) - beq- ReturnFromCreateArea + beq ReturnFromCreateArea lwz r18, 0x001c(r31) lis r16, -0x01 ori r16, r16, 0xff10 and. r16, r16, r18 - bne- ReturnFromCreateArea + bne ReturnFromCreateArea lwz r16, 0x0070(r31) li r17, 0x200 rlwimi r17, r16, 0, 0, 19 @@ -934,7 +934,7 @@ createarea_0x5c li r9, Area.kIDClass bl MakeID cmpwi r8, 0 - beq- major_0x10320 + beq major_0x10320 stw r8, Area.ID(r31) mfsprg r16, 0 @@ -947,7 +947,7 @@ createarea_0x5c stw r17, Area.AddressSpaceID(r31) lwz r16, 0x0008(r30) rlwinm. r16, r16, 0, 30, 30 - bne- major_0x10320_0x64 + bne major_0x10320_0x64 lis r16, 0x4152 ori r16, r16, 0x4541 stw r16, Area.Signature(r31) @@ -959,8 +959,8 @@ createarea_0x5c rlwinm r16, r17, 0, 17, 18 cmplwi cr7, r16, 0x6000 rlwinm. r16, r17, 0, 17, 17 - beq- cr7, createarea_0x150 - bne- createarea_0x150 + beq cr7, createarea_0x150 + bne createarea_0x150 crset cr7_gt crclr cr7_lt @@ -968,8 +968,8 @@ createarea_0x150 rlwinm. r16, r17, 0, 17, 18 lwz r18, Area.LogicalBase(r31) lwz r19, Area.Length(r31) - blt- cr7, createarea_0x16c - bne- createarea_0x170 + blt cr7, createarea_0x16c + bne createarea_0x170 li r18, 0x00 b createarea_0x170 @@ -1000,8 +1000,8 @@ createarea_0x170 bl Printw - bgt- cr7, createarea_0x1f4 - blt- cr7, createarea_0x218 + bgt cr7, createarea_0x1f4 + blt cr7, createarea_0x218 _log 'placed' b createarea_0x234 @@ -1017,7 +1017,7 @@ createarea_0x234 lwz r16, Area.LogicalEnd(r31) lwz r9, Area.LogicalBase(r31) cmplw r9, r16 - bge- major_0x10320_0x64 + bge major_0x10320_0x64 bl FindAreaAbove mr r30, r8 lwz r14, Area.LogicalBase(r31) @@ -1030,23 +1030,23 @@ createarea_0x234 cmpwi r17, -0x01 add r8, r15, r16 add r9, r15, r19 - beq- createarea_0x2b8 + beq createarea_0x2b8 cmplw r8, r17 cmplw cr1, r9, r17 - bge- createarea_0x28c - blt- cr1, createarea_0x2b8 + bge createarea_0x28c + blt cr1, createarea_0x2b8 createarea_0x28c - beq- cr7, major_0x10320_0x64 + beq cr7, major_0x10320_0x64 _log ' ... bc search^n' - bgt- cr7, createarea_0x34c + bgt cr7, createarea_0x34c b createarea_0x31c createarea_0x2b8 addi r21, r21, 0x20 lwz r20, 0x0060(r30) cmpw r20, r21 - beq- createarea_0x39c + beq createarea_0x39c addi r20, r20, -0x54 lwz r17, 0x0024(r20) lwz r18, 0x0028(r20) @@ -1055,13 +1055,13 @@ createarea_0x2b8 add r9, r18, r19 cmplw r8, r14 cmplw cr1, r9, r14 - bge- createarea_0x2f0 - blt- cr1, createarea_0x374 + bge createarea_0x2f0 + blt cr1, createarea_0x374 createarea_0x2f0 - beq- cr7, major_0x10320_0x64 + beq cr7, major_0x10320_0x64 _log ' ... ab search^n' - bgt- cr7, createarea_0x34c + bgt cr7, createarea_0x34c b createarea_0x31c createarea_0x31c @@ -1069,7 +1069,7 @@ createarea_0x31c subf r9, r16, r17 cmplw r8, r9 lwz r21, Area.Length(r31) - ble- createarea_0x334 + ble createarea_0x334 mr r8, r9 createarea_0x334 @@ -1077,7 +1077,7 @@ createarea_0x334 cmplw r8, r14 addi r18, r8, 0x01 lwz r19, Area.Length(r31) - bge- major_0x10320_0x64 + bge major_0x10320_0x64 b createarea_0x170 createarea_0x34c @@ -1086,7 +1086,7 @@ createarea_0x34c lwz r20, 0x0078(r31) cmplw r8, r9 neg r21, r20 - bge- createarea_0x368 + bge createarea_0x368 mr r8, r9 createarea_0x368 @@ -1117,9 +1117,9 @@ createarea_0x3b8 lwz r16, 0x0020(r31) lwz r17, Area.Flags(r31) rlwinm. r8, r16, 0, 16, 16 - bne- createarea_0x64c + bne createarea_0x64c rlwinm. r8, r17, 0, 25, 25 - bne- createarea_0x41c + bne createarea_0x41c lwz r8, Area.Length(r31) rlwinm r8, r8, 22, 10, 29 mr r29, r8 @@ -1131,7 +1131,7 @@ createarea_0x3b8 cmpwi r8, 0x00 stw r8, 0x0040(r31) - beq- createarea_0x460 + beq createarea_0x460 lwz r9, Area.Length(r31) srwi r9, r9, 12 bl major_0x10284 @@ -1143,7 +1143,7 @@ createarea_0x41c lwz r17, Area.Flags(r31) andi. r8, r17, 0x88 lwz r8, Area.Length(r31) - bne- createarea_0x45c + bne createarea_0x45c rlwinm r8, r8, 21, 11, 30 mr r29, r8 @@ -1154,7 +1154,7 @@ createarea_0x41c cmpwi r8, 0x00 stw r8, 0x003c(r31) - beq- createarea_0x460 + beq createarea_0x460 lwz r9, Area.Length(r31) srwi r9, r9, 12 bl major_0x102a8 @@ -1167,18 +1167,18 @@ createarea_0x45c createarea_0x460 cmpwi r29, 0xfd8 - ble- major_0x10320_0x20 + ble major_0x10320_0x20 _Lock PSA.PoolLock, scratch1=r16, scratch2=r17 lwz r17, Area.Flags(r31) li r27, 0x00 rlwinm. r8, r17, 0, 25, 25 - bne- createarea_0x4b4 + bne createarea_0x4b4 lwz r27, Area.Length(r31) srwi r27, r27, 12 cmpwi r27, 0x400 - ble- createarea_0x4ac + ble createarea_0x4ac ori r17, r17, 0x20 stw r17, Area.Flags(r31) addi r27, r27, 0x400 @@ -1191,11 +1191,11 @@ createarea_0x4b4 lwz r8, Area.Flags(r31) li r29, 0x00 rlwinm. r9, r8, 0, 28, 28 - bne- createarea_0x4e8 + bne createarea_0x4e8 lwz r29, Area.Length(r31) srwi r29, r29, 12 cmpwi r29, 0x800 - ble- createarea_0x4e0 + ble createarea_0x4e0 ori r8, r8, 0x02 stw r8, Area.Flags(r31) addi r29, r29, 0x800 @@ -1207,9 +1207,9 @@ createarea_0x4e0 createarea_0x4e8 lwz r18, -0x0430(r1) add. r8, r27, r29 - ble- major_0x102c8 + ble major_0x102c8 cmpw r8, r18 - bgt- major_0x102c8 + bgt major_0x102c8 lwz r16, -0x0430(r1) lwz r17, PSA.UnheldFreePageCount(r1) subf r16, r8, r16 @@ -1217,7 +1217,7 @@ createarea_0x4e8 stw r16, -0x0430(r1) stw r17, PSA.UnheldFreePageCount(r1) mr. r18, r27 - beq- createarea_0x5a0 + beq createarea_0x5a0 lwz r16, -0x0448(r1) RemoveFromList r16, scratch1=r17, scratch2=r19 addi r18, r18, -0x01 @@ -1226,7 +1226,7 @@ createarea_0x4e8 lwz r17, -0x0448(r1) mr r8, r16 subi r16, r16, 4 - bgt- createarea_0x564 + bgt createarea_0x564 li r9, 0x400 bl major_0x10284 b createarea_0x5a0 @@ -1240,11 +1240,11 @@ createarea_0x564 bl major_0x10284 lwz r17, -0x0448(r1) cmpwi r18, 0x00 - bgt+ createarea_0x564 + bgt createarea_0x564 createarea_0x5a0 mr. r18, r29 - beq- createarea_0x62c + beq createarea_0x62c lwz r16, -0x0448(r1) RemoveFromList r16, scratch1=r17, scratch2=r19 addi r18, r18, -0x01 @@ -1253,7 +1253,7 @@ createarea_0x5a0 lwz r17, -0x0448(r1) mr r8, r16 subi r16, r16, 4 - bgt- createarea_0x5f0 + bgt createarea_0x5f0 li r9, 0x800 bl major_0x102a8 b createarea_0x62c @@ -1267,7 +1267,7 @@ createarea_0x5f0 bl major_0x102a8 lwz r17, -0x0448(r1) cmpwi r18, 0x00 - bgt+ createarea_0x5f0 + bgt createarea_0x5f0 createarea_0x62c _AssertAndRelease PSA.PoolLock, scratch=r16 @@ -1275,7 +1275,7 @@ createarea_0x62c createarea_0x64c lwz r16, Area.Flags(r31) rlwinm. r8, r16, 0, 28, 28 - beq- createarea_0x67c + beq createarea_0x67c lwz r16, 0x0044(r31) addi r17, r31, 0x44 stw r16, 0x0000(r17) @@ -1299,7 +1299,7 @@ major_0x10284_0x10 cmpwi r9, noErr stwu r20, 0x0004(r8) addi r9, r9, -0x01 - bgt+ major_0x10284_0x10 + bgt major_0x10284_0x10 blr @@ -1313,7 +1313,7 @@ major_0x102a8_0xc cmpwi r9, noErr sthu r20, 0x0002(r8) addi r9, r9, -0x01 - bgt+ major_0x102a8_0xc + bgt major_0x102a8_0xc blr @@ -1328,7 +1328,7 @@ major_0x102c8 ; OUTSIDE REFERER cmpwi r9, Notification.kIDClass mr r26, r8 - bne- major_0x10320_0x20 + bne major_0x10320_0x20 li r8, 0x02 stw r8, 0x0010(r26) stw r30, 0x0014(r26) @@ -1356,14 +1356,14 @@ major_0x10320_0x20 ; OUTSIDE REFERER lwz r16, Area.Flags(r31) lwz r8, 0x0040(r31) rlwinm. r16, r16, 0, 25, 25 - bne- major_0x10320_0x58 + bne major_0x10320_0x58 cmpwi r8, 0x00 - bnel- PoolFree + bnel PoolFree major_0x10320_0x58 lwz r8, 0x003c(r31) cmpwi r8, 0x00 - bnel- PoolFree + bnel PoolFree major_0x10320_0x64 ; OUTSIDE REFERER _log ' ... skipped^n' @@ -1404,8 +1404,8 @@ FindAreaAbove ; OUTSIDE REFERER lwz r17, Area.LogicalEnd(r8) cmplw r16, r9 cmplw cr1, r17, r9 - bgelr- - bgelr- cr1 + bgelr + bgelr cr1 ; Iterate over linked list lwz r8, Area.LLL + LLL.Next(r8) @@ -1441,19 +1441,19 @@ MPCreateAliasArea mr r8, r3 bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr ; Confirm that the template Area is not itself an alias mr r30, r8 lwz r16, Area.Flags(r30) rlwinm. r8, r16, 0, Area.kAliasFlag, Area.kAliasFlag - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall ; Allocate the new Area li r8, Area.Size bl PoolAllocClear mr. r31, r8 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall ; Populate mfsprg r28, 0 @@ -1490,7 +1490,7 @@ MPCreateAliasArea _AssertAndRelease PSA.SchLock, scratch=r16 mr. r3, r9 - bne- @error + bne @error ; CreateArea returned successfully lwz r8, Area.LogicalBase(r31) @@ -1530,7 +1530,7 @@ MPDeleteArea mr r8, r3 bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 ; If pages are still mapped in, fail with OOM @@ -1539,16 +1539,16 @@ MPDeleteArea lwz r29, Area.Flags(r31) cmpwi cr1, r17, 0 rlwinm. r8, r29, 0, Area.kPrivilegedFlag, Area.kPrivilegedFlag - bne+ cr1, ReleaseAndReturnMPCallOOM - bne+ ReleaseAndReturnMPCallPrivilegedErr + bne cr1, ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallPrivilegedErr ; If is alias area and is not at back of queue (???), fail with OOM rlwinm. r8, r29, 0, Area.kAliasFlag, Area.kAliasFlag lwz r16, Area.AliasLLL + LLL.Next(r31) - bne- @dont_check_for_nonempty_alias + bne @dont_check_for_nonempty_alias addi r17, r31, Area.AliasLLL cmpw r16, r17 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM @dont_check_for_nonempty_alias ; HTAB lock wraps around all Address Space structures? @@ -1562,7 +1562,7 @@ MPDeleteArea ; Remove from template area's list of aliases, if necessary rlwinm. r8, r29, 0, Area.kAliasFlag, Area.kAliasFlag addi r16, r31, Area.AliasLLL - beq- @not_alias_so_dont_remove_from_alias_list + beq @not_alias_so_dont_remove_from_alias_list RemoveFromList r16, scratch1=r17, scratch2=r18 @not_alias_so_dont_remove_from_alias_list @@ -1575,10 +1575,10 @@ MPDeleteArea lwz r8, Area.PageMapArrayPtr(r31) rlwinm. r16, r29, 0, Area.kDontOwnPageMapArray, Area.kDontOwnPageMapArray cmpwi cr1, r8, 0 - bne- @no_pagemap + bne @no_pagemap rlwinm. r16, r29, 0, Area.kPageMapArrayInPool, Area.kPageMapArrayInPool - beq- cr1, @no_pagemap - bne- @pagemap_in_pool + beq cr1, @no_pagemap + bne @pagemap_in_pool ; If PageMap occupies whole pages then return those pages @@ -1588,7 +1588,7 @@ MPDeleteArea _Lock PSA.PoolLock, scratch1=r18, scratch2=r9 rlwinm. r16, r29, 0, Area.kPageMapArrayIs2D, Area.kPageMapArrayIs2D - beq- @pagemap_is_1d + beq @pagemap_is_1d ; CASE: 2D array, all in whole pages @@ -1608,7 +1608,7 @@ MPDeleteArea bl free_list_add_page cmpwi r19, 0 subi r19, r19, 4 - bgt+ @2d_pagemap_delete_loop + bgt @2d_pagemap_delete_loop mr r8, r20 @@ -1639,15 +1639,15 @@ MPDeleteArea lwz r8, Area.FaultCtrArrayPtr(r31) rlwinm. r16, r29, 0, Area.kFaultCtrArrayInPool, Area.kFaultCtrArrayInPool cmpwi cr1, r8, 0 - beq- cr1, @no_faultctr - bne- @faultctr_in_pool + beq cr1, @no_faultctr + bne @faultctr_in_pool ; Whole-page cases require us to get the Pool lock manually (for free list) _Lock PSA.PoolLock, scratch1=r18, scratch2=r9 rlwinm. r16, r29, 0, Area.kFaultCtrArrayIs2D, Area.kFaultCtrArrayIs2D - beq- @faultctr_is_1d + beq @faultctr_is_1d ; CASE: 2D array, all in whole pages @@ -1667,7 +1667,7 @@ MPDeleteArea bl free_list_add_page cmpwi r19, 0 subi r19, r19, 4 - bgt+ @2d_faultctr_delete_loop + bgt @2d_faultctr_delete_loop mr r8, r20 @@ -1717,24 +1717,24 @@ MPCall_75 ; OUTSIDE REFERER cmpwi r9, Area.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, 0x0020(r31) rlwinm. r8, r16, 0, 16, 16 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r18, 0x007c(r31) lwz r17, Area.Length(r31) and. r5, r5, r18 and r17, r17, r18 - ble+ ReleaseAndReturnParamErrFromMPCall + ble ReleaseAndReturnParamErrFromMPCall subf. r27, r17, r5 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall - bgt- MPCall_75_0x1c8 + beq ReleaseAndReturnZeroFromMPCall + bgt MPCall_75_0x1c8 rlwinm. r8, r4, 0, 24, 24 lwz r28, Area.LogicalBase(r31) lwz r29, Area.LogicalEnd(r31) - bne- MPCall_75_0x74 + bne MPCall_75_0x74 add r28, r27, r29 addi r28, r28, 0x01 b MPCall_75_0x7c @@ -1755,11 +1755,11 @@ MPCall_75_0x7c MPCall_75_0xb0 mr r8, r28 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 - bns- cr7, MPCall_75_0xe0 - bltl- cr5, MPCall_95_0x2e0 - bltl- cr5, MPCall_95_0x348 + bns cr7, MPCall_75_0xe0 + bltl cr5, MPCall_95_0x2e0 + bltl cr5, MPCall_95_0x348 lwz r17, 0x0000(r30) rlwinm r17, r17, 0, 0, 30 rlwinm r8, r17, 0, 0, 19 @@ -1772,36 +1772,36 @@ MPCall_75_0xb0 MPCall_75_0xe0 add r28, r28, r27 cmplw r28, r29 - ble+ MPCall_75_0xb0 + ble MPCall_75_0xb0 rlwinm. r8, r4, 0, 24, 24 lwz r28, Area.LogicalBase(r31) - beq- MPCall_75_0x138 + beq MPCall_75_0x138 lwz r27, 0x0068(r31) add r29, r29, r27 MPCall_75_0x100 mr r8, r28 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic mr r26, r30 mr r8, r29 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic lwz r17, 0x0000(r30) stw r17, 0x0000(r26) lwz r16, Area.LogicalEnd(r31) add r28, r28, r27 add r29, r29, r27 cmplw r29, r16 - ble+ MPCall_75_0x100 + ble MPCall_75_0x100 MPCall_75_0x138 _AssertAndRelease PSA.HTABLock, scratch=r8 lwz r16, Area.Flags(r31) rlwinm. r8, r16, 0, 25, 25 - bne- MPCall_75_0x16c + bne MPCall_75_0x16c rlwinm. r8, r16, 0, 27, 27 - bne- MPCall_75_0x16c + bne MPCall_75_0x16c MPCall_75_0x16c _AssertAndRelease PSA.PoolLock, scratch=r8 @@ -1810,7 +1810,7 @@ MPCall_75_0x16c MPCall_75_0x190 rlwinm. r8, r4, 0, 24, 24 lwz r16, Area.LogicalBase(r31) - bne- MPCall_75_0x1b0 + bne MPCall_75_0x1b0 add r17, r16, r5 addi r17, r17, -0x01 stw r5, Area.Length(r31) @@ -1833,7 +1833,7 @@ MPCall_75_0x1c8 rlwinm. r8, r4, 0, 24, 24 lwz r28, Area.LogicalBase(r31) lwz r29, Area.LogicalEnd(r31) - bne+ ReleaseAndMPCallWasBad + bne ReleaseAndMPCallWasBad add r28, r27, r29 addi r28, r28, 0x01 b MPCall_75_0x1ec @@ -1857,55 +1857,55 @@ MPCall_130 ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lis r16, -0x01 ori r16, r16, 0xfff8 lwz r17, 0x0020(r31) and. r16, r16, r4 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall rlwinm. r8, r17, 0, 16, 16 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall mr r29, r5 lwz r18, 0x0134(r6) lwz r19, 0x0068(r31) lwz r16, Area.LogicalBase(r31) cmplw r18, r19 add r28, r18, r29 - bge+ ReleaseAndReturnParamErrFromMPCall + bge ReleaseAndReturnParamErrFromMPCall lwz r17, 0x007c(r31) addi r28, r28, -0x01 lwz r18, 0x0020(r31) lwz r19, Area.LogicalEnd(r31) cmplw cr1, r29, r16 cmplw cr2, r28, r19 - blt+ cr1, ReleaseAndReturnParamErrFromMPCall - bgt+ cr2, ReleaseAndReturnParamErrFromMPCall + blt cr1, ReleaseAndReturnParamErrFromMPCall + bgt cr2, ReleaseAndReturnParamErrFromMPCall xor r8, r28, r29 rlwinm. r8, r8, 0, 0, 19 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall _Lock PSA.HTABLock, scratch1=r14, scratch2=r15 mr r8, r29 bl MPCall_95_0x1e4 _AssertAndRelease PSA.HTABLock, scratch=r14 - beq+ Local_Panic + beq Local_Panic rlwinm r8, r16, 0, 29, 30 lwz r16, 0x0000(r30) cmpwi cr7, r8, 0x04 - beq+ cr7, ReleaseAndReturnParamErrFromMPCall + beq cr7, ReleaseAndReturnParamErrFromMPCall lwz r16, 0x0098(r31) MPCall_130_0xe8 addi r17, r31, 0x90 cmpw r16, r17 addi r17, r16, 0x14 - beq- MPCall_130_0x11c + beq MPCall_130_0x11c lwz r8, 0x0010(r16) cmplwi r8, 0x1f8 add r9, r8, r17 - blt- MPCall_130_0x110 + blt MPCall_130_0x110 lwz r16, 0x0008(r16) b MPCall_130_0xe8 @@ -1923,7 +1923,7 @@ MPCall_130_0x11c ; r8 = ptr mr. r16, r8 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall addi r18, r31, 0x90 lis r17, 0x4645 ori r17, r17, 0x4e43 @@ -1942,11 +1942,11 @@ MPCall_130_0x15c mr r8, r29 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 - bns- cr7, MPCall_130_0x19c - bltl- cr5, MPCall_95_0x2e0 - bltl- cr5, MPCall_95_0x348 + bns cr7, MPCall_130_0x19c + bltl cr5, MPCall_95_0x2e0 + bltl cr5, MPCall_95_0x348 MPCall_130_0x19c lwz r17, 0x0000(r30) @@ -1975,16 +1975,16 @@ MPSetAreaAccess ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lis r16, -0x01 ori r16, r16, 0xff10 and. r16, r16, r4 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall lis r16, -0x01 ori r16, r16, 0xff10 and. r16, r16, r5 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall lwz r29, 0x0134(r6) lwz r18, 0x013c(r6) lwz r16, Area.LogicalBase(r31) @@ -1996,9 +1996,9 @@ MPSetAreaAccess ; OUTSIDE REFERER rlwinm. r8, r18, 0, 16, 16 cmplw cr1, r29, r16 cmplw cr2, r28, r19 - blt+ cr1, ReleaseAndReturnParamErrFromMPCall - bgt+ cr2, ReleaseAndReturnParamErrFromMPCall - bne- MPSetAreaAccess_0x154 + blt cr1, ReleaseAndReturnParamErrFromMPCall + bgt cr2, ReleaseAndReturnParamErrFromMPCall + bne MPSetAreaAccess_0x154 _Lock PSA.HTABLock, scratch1=r14, scratch2=r15 @@ -2006,11 +2006,11 @@ MPSetAreaAccess ; OUTSIDE REFERER MPSetAreaAccess_0x9c mr r8, r29 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 - bns- cr7, MPSetAreaAccess_0xb8 - bltl- cr5, MPCall_95_0x2e0 - bltl- cr5, MPCall_95_0x348 + bns cr7, MPSetAreaAccess_0xb8 + bltl cr5, MPCall_95_0x2e0 + bltl cr5, MPCall_95_0x348 MPSetAreaAccess_0xb8 lwz r17, 0x0000(r30) @@ -2021,9 +2021,9 @@ MPSetAreaAccess_0xb8 and r18, r18, r9 lwz r17, 0x0000(r30) rlwinm. r8, r18, 0, 26, 26 - bns- cr7, MPSetAreaAccess_0x118 - bgt- cr6, MPSetAreaAccess_0x118 - beq- MPSetAreaAccess_0x118 + bns cr7, MPSetAreaAccess_0x118 + bgt cr6, MPSetAreaAccess_0x118 + beq MPSetAreaAccess_0x118 rlwinm r9, r17, 0, 0, 19 lwz r8, 0x0068(r31) @@ -2031,7 +2031,7 @@ MPSetAreaAccess_0xec addi r8, r8, -0x20 dcbf r8, r9 cmpwi r8, 0x00 - bgt+ MPSetAreaAccess_0xec + bgt MPSetAreaAccess_0xec sync lwz r8, 0x0068(r31) @@ -2039,7 +2039,7 @@ MPSetAreaAccess_0x104 addi r8, r8, -0x20 icbi r8, r9 cmpwi r8, 0x00 - bgt+ MPSetAreaAccess_0x104 + bgt MPSetAreaAccess_0x104 isync MPSetAreaAccess_0x118 @@ -2048,14 +2048,14 @@ MPSetAreaAccess_0x118 stw r17, 0x0000(r30) add r29, r29, r19 subf. r8, r29, r28 - bge+ MPSetAreaAccess_0x9c + bge MPSetAreaAccess_0x9c _AssertAndRelease PSA.HTABLock, scratch=r14 ; r1 = kdp b ReleaseAndReturnZeroFromMPCall MPSetAreaAccess_0x154 - bne+ cr1, ReleaseAndReturnParamErrFromMPCall + bne cr1, ReleaseAndReturnParamErrFromMPCall lwz r18, 0x001c(r31) and r8, r4, r5 orc r9, r4, r5 @@ -2077,14 +2077,14 @@ MPSetAreaAccess_0x1a4 mr r8, r29 lwz r9, Area.AddressSpacePtr(r31) bl MPCall_95_0x45c - beq- MPSetAreaAccess_0x1bc + beq MPSetAreaAccess_0x1bc bl MPCall_95_0x2e0 bl MPCall_95_0x348 MPSetAreaAccess_0x1bc add r29, r29, r27 subf. r8, r29, r28 - bge+ MPSetAreaAccess_0x1a4 + bge MPSetAreaAccess_0x1a4 _AssertAndRelease PSA.HTABLock, scratch=r14 ; r1 = kdp @@ -2111,13 +2111,13 @@ major_0x10cb8 mtcr r18 - bge- cr6, @80_not_set ; if(control & 0x80) { + bge cr6, @80_not_set ; if(control & 0x80) { ori r17, r17, 0x80 ; PTE2 |= 0x80; //set referenced bit ori r16, r16, 0x08 ; PTE1 |= 0x08; //set guard bit @80_not_set ; } - ble- cr6, @40_not_set ; if(control & 0x40) { + ble cr6, @40_not_set ; if(control & 0x40) { ori r16, r16, 0x40 ; PTE1 |= 0x40; //set change bit b @40_endif ; } else { @40_not_set @@ -2125,27 +2125,27 @@ major_0x10cb8 @40_endif ; } - bne- cr6, @20_not_set ; if(control & 0x20) { + bne cr6, @20_not_set ; if(control & 0x20) { ori r17, r17, 0x40 ; PTE2 |= 0x40; //set change bit ori r16, r16, 0x20 ; PTE1 |= 0x20; //set W bit @20_not_set ; } - ble- cr7, @04_not_set ; if(control & 0x04) { + ble cr7, @04_not_set ; if(control & 0x04) { @04_not_set ; } - bge- cr7, @08_not_set ; if(control & 0x08) { + bge cr7, @08_not_set ; if(control & 0x08) { ori r17, r17, 0x06 ; PTE2 |= 0x06; //set leftmost protection bit and reserved bit ori r16, r16, 0x01 ; PTE1 |= 0x01; //set rightmost protection bit b @block_endif ; } @08_not_set - bne- cr7, @02_not_set ; else if(control & 0x02) { + bne cr7, @02_not_set ; else if(control & 0x02) { ori r17, r17, 0x00 ; PTE2 |= 0x00; //useless instruction? ori r16, r16, 0x02 ; PTE1 |= 0x02; //set second protection bit b @block_endif ; } @02_not_set - bns- cr7, @01_not_set ; else if(control & 0x01) { + bns cr7, @01_not_set ; else if(control & 0x01) { ori r17, r17, 0x04 ; PTE2 |= 0x04; //set reserved bit. ori r16, r16, 0x03 ; PTE1 |= 0x03: //set both protection bits b @block_endif ; } @@ -2167,30 +2167,30 @@ major_0x10d38 ; OUTSIDE REFERER li r18, 0x00 cmpwi r16, 0x02 cmpwi cr1, r16, 0x06 - beq- major_0x10d38_0x28 + beq major_0x10d38_0x28 li r18, 0x04 andi. r16, r17, 0x04 ori r18, r18, 0x01 - bne- major_0x10d38_0x28 + bne major_0x10d38_0x28 ori r18, r18, 0x02 major_0x10d38_0x28 - bne- cr1, major_0x10d38_0x30 + bne cr1, major_0x10d38_0x30 ori r18, r18, 0x08 major_0x10d38_0x30 andi. r16, r17, 0x20 - bne- major_0x10d38_0x3c + bne major_0x10d38_0x3c ori r18, r18, 0x40 major_0x10d38_0x3c andi. r16, r17, 0x40 - beq- major_0x10d38_0x48 + beq major_0x10d38_0x48 ori r18, r18, 0x20 major_0x10d38_0x48 andi. r16, r17, 0x80 - beq- major_0x10d38_0x54 + beq major_0x10d38_0x54 ori r18, r18, 0x80 major_0x10d38_0x54 @@ -2200,29 +2200,29 @@ major_0x10d38_0x58 ; OUTSIDE REFERER andi. r16, r17, 0x03 li r18, 0x04 cmpwi cr1, r16, 0x01 - beq- major_0x10d38_0x78 + beq major_0x10d38_0x78 andi. r16, r17, 0x01 ori r18, r18, 0x01 - bne- major_0x10d38_0x78 + bne major_0x10d38_0x78 ori r18, r18, 0x02 major_0x10d38_0x78 - bne- cr1, major_0x10d38_0x80 + bne cr1, major_0x10d38_0x80 ori r18, r18, 0x08 major_0x10d38_0x80 andi. r16, r17, 0x40 - beq- major_0x10d38_0x8c + beq major_0x10d38_0x8c ori r18, r18, 0x40 major_0x10d38_0x8c andi. r16, r17, 0x20 - beq- major_0x10d38_0x98 + beq major_0x10d38_0x98 ori r18, r18, 0x20 major_0x10d38_0x98 andi. r16, r17, 0x08 - beq- major_0x10d38_0xa4 + beq major_0x10d38_0xa4 ori r18, r18, 0x80 major_0x10d38_0xa4 @@ -2242,29 +2242,29 @@ MPCall_123 ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) lwz r18, 0x0020(r31) cmplw r4, r16 cmplw cr1, r4, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall rlwinm. r8, r18, 0, 16, 16 lwz r5, 0x001c(r31) ; r1 = kdp - bne+ ReleaseAndReturnZeroFromMPCall + bne ReleaseAndReturnZeroFromMPCall _Lock PSA.HTABLock, scratch1=r14, scratch2=r15 mr r8, r4 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 - bltl- cr5, MPCall_95_0x2e0 - bltl- cr5, MPCall_95_0x348 + bltl cr5, MPCall_95_0x2e0 + bltl cr5, MPCall_95_0x348 lwz r17, 0x0000(r30) _AssertAndRelease PSA.HTABLock, scratch=r14 bl major_0x10d38 @@ -2292,17 +2292,17 @@ MPSetAreaBackingProvider mr r8, r3 bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 ; r4 optionally contains... mr. r8, r4 - beq- @no_notification + beq @no_notification ; a Notification ID bl LookupID cmpwi r9, Notification.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr @no_notification stw r4, Area.BackingProviderID(r31) @@ -2324,12 +2324,12 @@ MPCall_78 ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 cmpwi r4, 0x01 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall cmplwi r5, 0x00 - bne- MPCall_78_0x68 + bne MPCall_78_0x68 li r16, 0x01 stw r16, 0x0134(r6) lwz r16, Area.ProcessID(r31) @@ -2346,7 +2346,7 @@ MPCall_78 ; OUTSIDE REFERER MPCall_78_0x68 cmplwi r5, 0x10 - bne- MPCall_78_0x9c + bne MPCall_78_0x9c lwz r16, 0x0018(r31) stw r16, 0x0134(r6) lwz r16, 0x001c(r31) @@ -2363,7 +2363,7 @@ MPCall_78_0x68 MPCall_78_0x9c cmplwi r5, 0x20 - bne- MPCall_78_0xd0 + bne MPCall_78_0xd0 lwz r16, Area.Length(r31) stw r16, 0x0134(r6) lwz r16, Area.LogicalSeparation(r31) @@ -2380,7 +2380,7 @@ MPCall_78_0x9c MPCall_78_0xd0 cmplwi r5, 0x30 - bne- MPCall_78_0xfc + bne MPCall_78_0xfc lwz r16, 0x0068(r31) stw r16, 0x0134(r6) lwz r16, 0x0080(r31) @@ -2395,7 +2395,7 @@ MPCall_78_0xd0 MPCall_78_0xfc cmpwi r5, 0x3c - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall li r16, 0x00 stw r16, 0x0154(r6) @@ -2410,13 +2410,13 @@ MPCall_79 ; OUTSIDE REFERER mr. r8, r3 mfsprg r28, 0 lwz r31, EWA.PA_CurAddressSpace(r28) - beq- MPCall_79_0x20 + beq MPCall_79_0x20 ; r8 = id bl LookupID cmpwi r9, AddressSpace.kIDClass - bne+ ReturnMPCallInvalidIDErr + bne ReturnMPCallInvalidIDErr mr r31, r8 MPCall_79_0x20 @@ -2427,7 +2427,7 @@ MPCall_79_0x24 li r9, 0x0b bl GetNextIDOfClass cmpwi r8, 0x00 - beq+ ReturnMPCallInvalidIDErr + beq ReturnMPCallInvalidIDErr mr r4, r8 ; r8 = id @@ -2437,7 +2437,7 @@ MPCall_79_0x24 lwz r16, 0x0010(r8) cmpw r16, r3 - bne+ MPCall_79_0x24 + bne MPCall_79_0x24 b ReturnZeroFromMPCall @@ -2450,7 +2450,7 @@ MPCall_80 ; OUTSIDE REFERER mr. r8, r3 mfsprg r9, 0 - bne- MPCall_80_0x2c + bne MPCall_80_0x2c lwz r8, EWA.PA_CurAddressSpace(r9) b MPCall_80_0x38 @@ -2459,7 +2459,7 @@ MPCall_80_0x2c bl LookupID cmpwi r9, AddressSpace.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr MPCall_80_0x38 mr r9, r4 @@ -2467,7 +2467,7 @@ MPCall_80_0x38 lwz r16, 0x0024(r8) li r5, 0x00 cmplw r16, r4 - bgt+ ReleaseAndReturnParamErrFromMPCall + bgt ReleaseAndReturnParamErrFromMPCall lwz r5, 0x0000(r8) ; r1 = kdp @@ -2483,7 +2483,7 @@ MPCall_125 ; OUTSIDE REFERER mr. r8, r3 mfsprg r9, 0 - bne- MPCall_125_0x2c + bne MPCall_125_0x2c lwz r8, EWA.PA_CurAddressSpace(r9) b MPCall_125_0x38 @@ -2492,7 +2492,7 @@ MPCall_125_0x2c bl LookupID cmpwi r9, AddressSpace.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr MPCall_125_0x38 mr r9, r4 @@ -2500,14 +2500,14 @@ MPCall_125_0x38 lwz r16, 0x0024(r8) li r5, 0x00 cmplw r16, r4 - bgt- MPCall_125_0x58 + bgt MPCall_125_0x58 lwz r8, 0x005c(r8) addi r8, r8, -0x54 MPCall_125_0x58 lwz r9, 0x002c(r8) cmpwi r9, noErr - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lwz r5, 0x0000(r8) ; r1 = kdp @@ -2528,22 +2528,22 @@ MPCall_81 ; OUTSIDE REFERER cmpwi r9, Area.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) lwz r18, 0x0020(r31) cmplw r4, r16 cmplw cr1, r4, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall rlwinm. r8, r18, 0, 16, 16 lwz r19, 0x0070(r31) - beq- MPCall_81_0x70 + beq MPCall_81_0x70 lwz r17, Area.BytesMapped(r31) rlwinm r19, r19, 0, 0, 19 cmpwi r17, 0x00 subf r18, r16, r4 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall add r5, r18, r19 ; r1 = kdp @@ -2557,7 +2557,7 @@ MPCall_81_0x70 mr r8, r4 bl MPCall_95_0x1e4 bl MPCall_95_0x2b0 - bns- cr7, MPCall_81_0xc8 + bns cr7, MPCall_81_0xc8 mr r5, r17 rlwimi r5, r4, 0, 20, 31 @@ -2584,7 +2584,7 @@ MPCall_98 ; OUTSIDE REFERER cmpwi r9, Area.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) mr r29, r5 @@ -2593,13 +2593,13 @@ MPCall_98 ; OUTSIDE REFERER addi r5, r5, -0x01 cmplw r4, r16 cmplw cr1, r5, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall lwz r20, Area.BytesMapped(r31) rlwinm. r8, r18, 0, 16, 16 cmpwi cr1, r20, 0x00 - beq- MPCall_98_0x84 - beq+ cr1, ReleaseAndReturnParamErrFromMPCall + beq MPCall_98_0x84 + beq cr1, ReleaseAndReturnParamErrFromMPCall lwz r19, 0x0070(r31) subf r18, r16, r4 rlwinm r19, r19, 0, 0, 19 @@ -2617,11 +2617,11 @@ MPCall_98_0x84 mr r8, r4 mr r28, r4 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 crclr cr3_eq li r3, 0x00 - bso- cr7, MPCall_98_0xc4 + bso cr7, MPCall_98_0xc4 crset cr3_eq li r3, kMPInsufficientResourcesErr @@ -2635,17 +2635,17 @@ MPCall_98_0xd0 add r28, r28, r16 add r29, r29, r16 cmplw cr2, r28, r5 - bgt- cr2, MPCall_98_0x140 + bgt cr2, MPCall_98_0x140 mr r8, r28 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 rlwinm r17, r17, 0, 0, 19 crxor 31, 31, 14 - bns- cr7, MPCall_98_0x10c - beq+ cr3, MPCall_98_0xd0 + bns cr7, MPCall_98_0x10c + beq cr3, MPCall_98_0xd0 cmplw r29, r17 - beq+ MPCall_98_0xd0 + beq MPCall_98_0xd0 MPCall_98_0x10c lwz r16, 0x007c(r31) @@ -2659,15 +2659,15 @@ MPCall_98_0x118 MPCall_98_0x140 addi r5, r5, 0x01 - beq- cr3, MPCall_98_0x170 + beq cr3, MPCall_98_0x170 mr r8, r28 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 rlwinm r17, r17, 0, 0, 19 - bns- cr7, MPCall_98_0x170 + bns cr7, MPCall_98_0x170 cmplw r29, r17 - bne- MPCall_98_0x170 + bne MPCall_98_0x170 subf r16, r4, r5 b MPCall_98_0x118 @@ -2675,7 +2675,7 @@ MPCall_98_0x170 lwz r16, 0x007c(r31) and r28, r28, r16 cmplw r5, r28 - bge- MPCall_98_0x184 + bge MPCall_98_0x184 mr r28, r5 MPCall_98_0x184 @@ -2689,7 +2689,7 @@ MPCall_98_0x184 MPCall_82 ; OUTSIDE REFERER lwz r8, -0x0420(r1) cmpwi r8, 0x00 - bne+ ReturnMPCallOOM + bne ReturnMPCallOOM _Lock PSA.SchLock, scratch1=r16, scratch2=r17 @@ -2699,7 +2699,7 @@ MPCall_82 ; OUTSIDE REFERER bl LookupID cmpwi r9, Notification.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr stw r3, -0x0420(r1) ; r1 = kdp @@ -2716,7 +2716,7 @@ MPCall_83 ; OUTSIDE REFERER bl MPCall_83_0x90 _AssertAndRelease PSA.PoolLock, scratch=r16 mr. r4, r8 - bne+ ReturnZeroFromMPCall + bne ReturnZeroFromMPCall _Lock PSA.SchLock, scratch1=r16, scratch2=r17 @@ -2729,7 +2729,7 @@ MPCall_83_0x5c ; OUTSIDE REFERER cmpwi r9, Notification.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r8, 0x001c(r31) ; r8 = id @@ -2737,7 +2737,7 @@ MPCall_83_0x5c ; OUTSIDE REFERER cmpwi r9, EventGroup.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r8, 0x0020(r31) bl SetEvent b ReleaseAndReturnMPCallOOM @@ -2746,7 +2746,7 @@ MPCall_83_0x90 ; OUTSIDE REFERER addi r18, r1, -0x450 lwz r8, -0x0448(r1) cmpw r8, r18 - beq- MPCall_83_0xec + beq MPCall_83_0xec RemoveFromList r8, scratch1=r16, scratch2=r17 lwz r16, -0x0430(r1) addi r16, r16, -0x01 @@ -2755,7 +2755,7 @@ MPCall_83_0x90 ; OUTSIDE REFERER mfspr r16, dec eqv. r17, r18, r17 stw r16, 0x0000(r8) - bne+ Local_Panic + bne Local_Panic stw r16, 0x0004(r8) stw r16, 0x0008(r8) stw r16, 0x000c(r8) @@ -2778,8 +2778,8 @@ MPCall_84 ; OUTSIDE REFERER addi r18, r1, -0x450 eqv. r16, r16, r17 cmpw cr1, r17, r18 - bne- MPCall_84_0x3c - bne- cr1, MPCall_84_0x3c + bne MPCall_84_0x3c + bne cr1, MPCall_84_0x3c li r3, -0x32 b MPCall_84_0x48 @@ -2805,7 +2805,7 @@ free_list_add_page ; OUTSIDE REFERER ; Must be an actual page-aligned address clrlwi. r9, r8, 20 addi r9, r1, PSA.FreeList - bne+ Local_Panic + bne Local_Panic ; This is probably an alternative to heavyweight locks around the free list @@ -2863,26 +2863,26 @@ KCMapPage ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Area.Flags(r31) rlwinm. r8, r16, 0, 28, 28 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) lwz r19, 0x0020(r31) cmplw r4, r16 cmplw cr1, r4, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall rlwinm. r8, r19, 0, 16, 16 cmplw cr1, r4, r16 lwz r20, Area.BytesMapped(r31) - beq- KCMapPage_0x8c - bne+ cr1, ReleaseAndReturnParamErrFromMPCall + beq KCMapPage_0x8c + bne cr1, ReleaseAndReturnParamErrFromMPCall cmpwi r20, 0x00 lwz r8, 0x0070(r31) - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM rlwimi r8, r5, 0, 0, 19 lwz r18, 0x007c(r31) lwz r20, Area.Length(r31) @@ -2898,37 +2898,37 @@ KCMapPage_0x8c mr r8, r4 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic lwz r29, 0x0000(r30) _AssertAndRelease PSA.HTABLock, scratch=r14 clrlwi. r8, r29, 0x1f - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r17, 0x0134(r6) rlwinm. r8, r17, 0, 30, 30 - bne- KCMapPage_0x12c + bne KCMapPage_0x12c _Lock PSA.PoolLock, scratch1=r16, scratch2=r17 bl MPCall_83_0x90 _AssertAndRelease PSA.PoolLock, scratch=r16 mr. r5, r8 - beq+ MPCall_83_0x5c + beq MPCall_83_0x5c KCMapPage_0x12c lwz r17, 0x0134(r6) rlwinm. r8, r17, 0, 29, 29 - beq- KCMapPage_0x17c + beq KCMapPage_0x17c rlwinm. r8, r29, 0, 25, 25 lwz r18, 0x0068(r31) KCMapPage_0x140 addi r18, r18, -0x20 - bne- KCMapPage_0x174 + bne KCMapPage_0x174 dcbst r18, r5 KCMapPage_0x14c cmpwi cr1, r18, 0x00 - bgt+ cr1, KCMapPage_0x140 + bgt cr1, KCMapPage_0x140 sync lwz r18, 0x0068(r31) @@ -2936,7 +2936,7 @@ KCMapPage_0x15c addi r18, r18, -0x20 icbi r18, r5 cmpwi cr1, r18, 0x00 - bgt+ cr1, KCMapPage_0x15c + bgt cr1, KCMapPage_0x15c isync b KCMapPage_0x17c @@ -2957,7 +2957,7 @@ KCMapPage_0x17c clrlwi. r8, r17, 0x1f ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall lwz r5, 0x0068(r31) b KCHoldPages_0x2c @@ -2978,12 +2978,12 @@ KCUnmapPages ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r8, 0x0134(r6) lwz r16, Area.Flags(r31) rlwinm. r16, r16, 0, 28, 28 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall clrlwi. r8, r8, 0x1f add r5, r5, r4 lwz r16, Area.LogicalBase(r31) @@ -2993,17 +2993,17 @@ KCUnmapPages ; OUTSIDE REFERER addi r5, r5, -0x01 cmplw r4, r16 cmplw cr1, r5, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall lwz r29, 0x0068(r31) lwz r20, Area.BytesMapped(r31) rlwinm. r8, r19, 0, 16, 16 cmplw cr1, r4, r16 - beq- KCUnmapPages_0xd8 - bne+ cr1, ReleaseAndReturnParamErrFromMPCall + beq KCUnmapPages_0xd8 + bne cr1, ReleaseAndReturnParamErrFromMPCall cmpwi r20, 0x00 li r20, 0x00 - ble+ ReleaseAndReturnMPCallOOM + ble ReleaseAndReturnMPCallOOM stw r20, Area.BytesMapped(r31) _Lock PSA.HTABLock, scratch1=r14, scratch2=r15 @@ -3014,19 +3014,19 @@ KCUnmapPages_0xac mr r8, r4 lwz r9, Area.AddressSpacePtr(r31) bl MPCall_95_0x45c - beq- KCUnmapPages_0xc4 + beq KCUnmapPages_0xc4 bl MPCall_95_0x2e0 bl MPCall_95_0x348 KCUnmapPages_0xc4 add r4, r4, r29 subf. r8, r4, r5 - bge+ KCUnmapPages_0xac + bge KCUnmapPages_0xac crclr cr3_eq b KCUnmapPages_0x158 KCUnmapPages_0xd8 - bne- cr3, KCUnmapPages_0xf4 + bne cr3, KCUnmapPages_0xf4 _Lock PSA.PoolLock, scratch1=r14, scratch2=r15 @@ -3040,16 +3040,16 @@ KCUnmapPages_0xf4 KCUnmapPages_0x110 mr r8, r4 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 - bns- cr7, KCUnmapPages_0x148 - bltl- cr5, MPCall_95_0x2e0 - bltl- cr5, MPCall_95_0x348 + bns cr7, KCUnmapPages_0x148 + bltl cr5, MPCall_95_0x2e0 + bltl cr5, MPCall_95_0x348 lwz r18, 0x0000(r30) subf r28, r29, r28 rlwinm r18, r18, 0, 0, 30 stw r18, 0x0000(r30) - bne- cr3, KCUnmapPages_0x148 + bne cr3, KCUnmapPages_0x148 rlwinm r8, r18, 0, 0, 19 ; r1 = kdp @@ -3059,14 +3059,14 @@ KCUnmapPages_0x110 KCUnmapPages_0x148 add r4, r4, r29 subf. r8, r4, r5 - bge+ KCUnmapPages_0x110 + bge KCUnmapPages_0x110 stw r28, Area.BytesMapped(r31) KCUnmapPages_0x158 _AssertAndRelease PSA.HTABLock, scratch=r14 ; r1 = kdp - bne+ cr3, ReleaseAndReturnZeroFromMPCall + bne cr3, ReleaseAndReturnZeroFromMPCall _AssertAndRelease PSA.PoolLock, scratch=r14 ; r1 = kdp @@ -3089,7 +3089,7 @@ KCMakePhysicallyContiguous ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 mr r27, r5 add r5, r5, r4 @@ -3098,12 +3098,12 @@ KCMakePhysicallyContiguous ; OUTSIDE REFERER addi r5, r5, -0x01 cmplw r4, r16 cmplw cr1, r5, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall lwz r19, 0x0020(r31) lwz r29, 0x0068(r31) rlwinm. r8, r19, 0, 16, 16 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall _Lock PSA.HTABLock, scratch1=r14, scratch2=r15 @@ -3113,21 +3113,21 @@ KCMakePhysicallyContiguous ; OUTSIDE REFERER NKMakePhysicallyContiguous_0x80 mr r8, r27 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 - bns- cr7, NKMakePhysicallyContiguous_0x150 + bns cr7, NKMakePhysicallyContiguous_0x150 rlwinm r8, r17, 0, 0, 19 cmpwi r28, -0x01 cmpw cr1, r28, r8 mr r28, r8 - beq- NKMakePhysicallyContiguous_0xac - bne- cr1, NKMakePhysicallyContiguous_0xe0 + beq NKMakePhysicallyContiguous_0xac + bne cr1, NKMakePhysicallyContiguous_0xe0 NKMakePhysicallyContiguous_0xac add r27, r27, r29 add r28, r28, r29 subf. r8, r27, r5 - bge+ NKMakePhysicallyContiguous_0x80 + bge NKMakePhysicallyContiguous_0x80 _AssertAndRelease PSA.HTABLock, scratch=r14 ; r1 = kdp @@ -3141,7 +3141,7 @@ NKMakePhysicallyContiguous_0xe0 addi r18, r1, -0x450 lwz r8, -0x0448(r1) cmpw r8, r18 - beq- NKMakePhysicallyContiguous_0x174 + beq NKMakePhysicallyContiguous_0x174 b NKMakePhysicallyContiguous_0x174 dc.l 0x7c0004ac ; probably dead code, not a jump table dc.l 0x8201f530 @@ -3178,7 +3178,7 @@ KCLockPages ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 mr r27, r5 add r5, r5, r4 @@ -3187,52 +3187,52 @@ KCLockPages ; OUTSIDE REFERER addi r5, r5, -0x01 cmplw r4, r16 cmplw cr1, r5, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall lwz r19, 0x0020(r31) lwz r29, 0x0068(r31) rlwinm. r8, r19, 0, 16, 16 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall mr r27, r4 li r28, 0x00 KCLockPages_0x68 mr r8, r27 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) rlwinm r17, r18, 24, 25, 31 rlwinm. r8, r18, 0, 16, 16 cmpwi cr1, r17, 0x7f addi r28, r28, 0x01 - beq- KCLockPages_0x94 + beq KCLockPages_0x94 addi r28, r28, -0x01 - bge+ cr1, major_0x0b0cc + bge cr1, major_0x0b0cc KCLockPages_0x94 add r27, r27, r29 subf. r8, r27, r5 - bge+ KCLockPages_0x68 + bge KCLockPages_0x68 _Lock PSA.PoolLock, scratch1=r16, scratch2=r17 lwz r16, PSA.UnheldFreePageCount(r1) subf. r16, r28, r16 - ble- KCLockPages_0xc8 + ble KCLockPages_0xc8 stw r16, PSA.UnheldFreePageCount(r1) KCLockPages_0xc8 _AssertAndRelease PSA.PoolLock, scratch=r16 - ble+ ReleaseAndReturnMPCallOOM + ble ReleaseAndReturnMPCallOOM mr r27, r4 KCLockPages_0xf0 mr r8, r27 bl MPCall_95_0x254 - beq+ Local_Panic + beq Local_Panic lhz r18, 0x0000(r30) rlwinm. r17, r18, 0, 16, 16 - bne- KCLockPages_0x10c + bne KCLockPages_0x10c li r18, -0x8000 KCLockPages_0x10c @@ -3242,7 +3242,7 @@ KCLockPages_0x10c sth r18, 0x0000(r30) add r27, r27, r29 subf. r8, r27, r5 - bge+ KCLockPages_0xf0 + bge KCLockPages_0xf0 ; r1 = kdp b ReleaseAndReturnZeroFromMPCall @@ -3264,7 +3264,7 @@ KCUnlockPages ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 add r5, r5, r4 lwz r16, Area.LogicalBase(r31) @@ -3272,40 +3272,40 @@ KCUnlockPages ; OUTSIDE REFERER addi r5, r5, -0x01 cmplw r4, r16 cmplw cr1, r5, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall lwz r19, 0x0020(r31) lwz r29, 0x0068(r31) rlwinm. r8, r19, 0, 16, 16 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall mr r27, r4 KCUnlockPages_0x60 mr r8, r27 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) rlwinm r17, r18, 24, 25, 31 rlwinm. r8, r18, 0, 16, 16 cmpwi cr1, r17, 0x00 - beq+ major_0x0b0cc + beq major_0x0b0cc addi r28, r28, 0x01 - beq+ cr1, major_0x0b0cc + beq cr1, major_0x0b0cc add r27, r27, r29 subf. r8, r27, r5 - bge+ KCUnlockPages_0x60 + bge KCUnlockPages_0x60 li r28, 0x00 KCUnlockPages_0x98 mr r8, r4 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) rlwinm r17, r18, 24, 25, 31 addi r17, r17, -0x01 rlwimi r18, r17, 8, 17, 23 clrlwi. r8, r18, 0x11 - bne- KCUnlockPages_0xc4 + bne KCUnlockPages_0xc4 rlwinm r18, r18, 0, 17, 15 addi r28, r28, 0x01 @@ -3313,7 +3313,7 @@ KCUnlockPages_0xc4 sth r18, 0x0000(r30) add r4, r4, r29 subf. r8, r4, r5 - bge+ KCUnlockPages_0x98 + bge KCUnlockPages_0x98 _Lock PSA.PoolLock, scratch1=r16, scratch2=r17 @@ -3342,7 +3342,7 @@ KCHoldPages ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 KCHoldPages_0x2c ; OUTSIDE REFERER @@ -3352,52 +3352,52 @@ KCHoldPages_0x2c ; OUTSIDE REFERER addi r5, r5, -0x01 cmplw r4, r16 cmplw cr1, r5, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall lwz r19, 0x0020(r31) lwz r29, 0x0068(r31) rlwinm. r8, r19, 0, 16, 16 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall mr r27, r4 li r28, 0x00 KCHoldPages_0x64 mr r8, r27 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) clrlwi r17, r18, 0x18 rlwinm. r8, r18, 0, 16, 16 cmpwi cr1, r17, 0xff addi r28, r28, 0x01 - beq- KCHoldPages_0x90 + beq KCHoldPages_0x90 addi r28, r28, -0x01 - bge+ cr1, major_0x0b0cc + bge cr1, major_0x0b0cc KCHoldPages_0x90 add r27, r27, r29 subf. r8, r27, r5 - bge+ KCHoldPages_0x64 + bge KCHoldPages_0x64 _Lock PSA.PoolLock, scratch1=r16, scratch2=r17 lwz r16, PSA.UnheldFreePageCount(r1) subf. r16, r28, r16 - ble- KCHoldPages_0xc4 + ble KCHoldPages_0xc4 stw r16, PSA.UnheldFreePageCount(r1) KCHoldPages_0xc4 _AssertAndRelease PSA.PoolLock, scratch=r16 - ble+ ReleaseAndReturnMPCallOOM + ble ReleaseAndReturnMPCallOOM mr r27, r4 KCHoldPages_0xec mr r8, r27 bl MPCall_95_0x254 - beq+ Local_Panic + beq Local_Panic lhz r18, 0x0000(r30) rlwinm. r17, r18, 0, 16, 16 - bne- KCHoldPages_0x108 + bne KCHoldPages_0x108 li r18, -0x8000 KCHoldPages_0x108 @@ -3407,7 +3407,7 @@ KCHoldPages_0x108 sth r18, 0x0000(r30) add r27, r27, r29 subf. r8, r27, r5 - bge+ KCHoldPages_0xec + bge KCHoldPages_0xec ; r1 = kdp b ReleaseAndReturnZeroFromMPCall @@ -3429,7 +3429,7 @@ KCUnholdPages ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 add r5, r5, r4 lwz r16, Area.LogicalBase(r31) @@ -3437,40 +3437,40 @@ KCUnholdPages ; OUTSIDE REFERER addi r5, r5, -0x01 cmplw r4, r16 cmplw cr1, r5, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall lwz r19, 0x0020(r31) lwz r29, 0x0068(r31) rlwinm. r8, r19, 0, 16, 16 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall mr r27, r4 KCUnholdPages_0x60 mr r8, r27 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) clrlwi r17, r18, 0x18 rlwinm. r8, r18, 0, 16, 16 cmpwi cr1, r17, 0x00 - beq+ major_0x0b0cc + beq major_0x0b0cc addi r28, r28, 0x01 - beq+ cr1, major_0x0b0cc + beq cr1, major_0x0b0cc add r27, r27, r29 subf. r8, r27, r5 - bge+ KCUnholdPages_0x60 + bge KCUnholdPages_0x60 li r28, 0x00 KCUnholdPages_0x98 mr r8, r4 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) clrlwi r17, r18, 0x18 addi r17, r17, -0x01 rlwimi r18, r17, 0, 24, 31 clrlwi. r8, r18, 0x11 - bne- KCUnholdPages_0xc4 + bne KCUnholdPages_0xc4 rlwinm r18, r18, 0, 17, 15 addi r28, r28, 0x01 @@ -3478,7 +3478,7 @@ KCUnholdPages_0xc4 sth r18, 0x0000(r30) add r4, r4, r29 subf. r8, r4, r5 - bge+ KCUnholdPages_0x98 + bge KCUnholdPages_0x98 _Lock PSA.PoolLock, scratch1=r16, scratch2=r17 @@ -3504,29 +3504,29 @@ MPCall_91 ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) cmplw r4, r16 cmplw cr1, r4, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall _Lock PSA.HTABLock, scratch1=r14, scratch2=r15 mr r8, r4 bl MPCall_95_0x1e4 - beq- MPCall_91_0xcc + beq MPCall_91_0xcc bl MPCall_95_0x2b0 - bltl- cr5, MPCall_95_0x2e0 - bltl- cr5, MPCall_95_0x348 + bltl cr5, MPCall_95_0x2e0 + bltl cr5, MPCall_95_0x348 lwz r29, 0x0000(r30) _AssertAndRelease PSA.HTABLock, scratch=r14 mr r8, r4 bl MPCall_95_0x254 li r19, 0x00 - beq- MPCall_91_0xac + beq MPCall_91_0xac lhz r19, 0x0000(r30) MPCall_91_0xac @@ -3535,11 +3535,11 @@ MPCall_91_0xac rlwimi r5, r19, 0, 16, 16 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall rlwinm. r8, r19, 0, 17, 23 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall ori r5, r5, 0x4000 ; r1 = kdp @@ -3563,33 +3563,33 @@ MPCall_92 ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Area.Flags(r31) rlwinm. r8, r16, 0, 28, 28 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall lwz r29, 0x0134(r6) li r8, 0x318 andc. r9, r5, r8 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall andc. r9, r29, r8 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) cmplw r4, r16 cmplw cr1, r4, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall _Lock PSA.HTABLock, scratch1=r14, scratch2=r15 mr r8, r4 bl MPCall_95_0x1e4 - beq- MPCall_92_0xd8 + beq MPCall_92_0xd8 bl MPCall_95_0x2b0 - bns- cr7, MPCall_92_0x9c - bltl- cr5, MPCall_95_0x2e0 - bltl- cr5, MPCall_95_0x348 + bns cr7, MPCall_92_0x9c + bltl cr5, MPCall_95_0x2e0 + bltl cr5, MPCall_95_0x348 MPCall_92_0x9c lwz r16, 0x0000(r30) @@ -3621,23 +3621,23 @@ MPCall_93 ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) cmplw r4, r16 cmplw cr1, r4, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall mr r8, r4 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) rlwinm. r8, r18, 0, 16, 16 li r5, 0x00 ; r1 = kdp - bne+ ReleaseAndReturnZeroFromMPCall + bne ReleaseAndReturnZeroFromMPCall clrlwi r5, r18, 0x11 ; r1 = kdp @@ -3657,22 +3657,22 @@ MPCall_94 ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) cmplw r4, r16 cmplw cr1, r4, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall mr r8, r4 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall cmplwi r5, 0x7fff - bgt+ ReleaseAndReturnParamErrFromMPCall + bgt ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) rlwinm. r8, r18, 0, 16, 16 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM rlwimi r18, r5, 0, 17, 31 sth r18, 0x0000(r30) @@ -3680,11 +3680,11 @@ MPCall_94 ; OUTSIDE REFERER mr r8, r4 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic bl MPCall_95_0x2b0 - bns- cr7, MPCall_94_0xa0 - bltl- cr5, MPCall_95_0x2e0 - bltl- cr5, MPCall_95_0x348 + bns cr7, MPCall_94_0xa0 + bltl cr5, MPCall_95_0x2e0 + bltl cr5, MPCall_95_0x348 MPCall_94_0xa0 _AssertAndRelease PSA.HTABLock, scratch=r16 @@ -3706,22 +3706,22 @@ MPCall_129 ; OUTSIDE REFERER bl LookupID cmpwi r9, Area.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Area.LogicalBase(r31) lwz r17, Area.LogicalEnd(r31) cmplw r4, r16 cmplw cr1, r4, r17 - blt+ ReleaseAndReturnParamErrFromMPCall - bgt+ cr1, ReleaseAndReturnParamErrFromMPCall + blt ReleaseAndReturnParamErrFromMPCall + bgt cr1, ReleaseAndReturnParamErrFromMPCall mr r8, r4 bl MPCall_95_0x254 - beq+ ReleaseAndReturnParamErrFromMPCall + beq ReleaseAndReturnParamErrFromMPCall lhz r18, 0x0000(r30) li r5, 0x00 rlwinm. r8, r18, 0, 16, 16 li r16, 0x00 - beq- MPCall_129_0x6c + beq MPCall_129_0x6c rlwinm r16, r18, 24, 25, 31 clrlwi r5, r18, 0x18 @@ -3737,7 +3737,7 @@ MPCall_129_0x6c MPCall_95 ; OUTSIDE REFERER or. r8, r3, r4 - bne- MPCall_95_0x44 + bne MPCall_95_0x44 li r16, 0x00 stw r16, 0x06b4(r1) _log 'Areas capability probe detected^n' @@ -3752,7 +3752,7 @@ MPCall_95_0x44 li r5, 0x00 lwz r8, PSA.UnheldFreePageCount(r1) cmpwi r8, 0x00 - ble+ ReleaseAndReturnMPCallOOM + ble ReleaseAndReturnMPCallOOM lwz r27, -0x0438(r1) srwi r27, r27, 15 mfspr r8, dec @@ -3764,7 +3764,7 @@ MPCall_95_0x44 mr r31, r8 lwz r29, Area.LogicalBase(r31) cmplw r29, r30 - bgt- MPCall_95_0xa8 + bgt MPCall_95_0xa8 mr r29, r30 MPCall_95_0xa8 @@ -3773,59 +3773,59 @@ MPCall_95_0xa8 MPCall_95_0xac mfspr r9, dec subf. r9, r27, r9 - blt- MPCall_95_0x1c8 + blt MPCall_95_0x1c8 MPCall_95_0xb8 lwz r8, 0x0020(r31) lwz r9, 0x0018(r31) rlwinm. r8, r8, 0, 16, 16 cmpwi cr1, r3, 0x00 - bne- MPCall_95_0x19c - beq- cr1, MPCall_95_0xe0 + bne MPCall_95_0x19c + beq cr1, MPCall_95_0xe0 cmpwi cr3, r9, 0x00 - beq- cr3, MPCall_95_0xe0 + beq cr3, MPCall_95_0xe0 cmpw cr1, r9, r3 - bne- cr1, MPCall_95_0x19c + bne cr1, MPCall_95_0x19c MPCall_95_0xe0 lwz r9, Area.Flags(r31) rlwinm. r8, r9, 0, 28, 28 - bne- MPCall_95_0x19c + bne MPCall_95_0x19c rlwinm. r8, r9, 0, 23, 23 - bne- MPCall_95_0x19c + bne MPCall_95_0x19c _Lock PSA.HTABLock, scratch1=r16, scratch2=r17 mr r8, r29 bl MPCall_95_0x1e4 - beq+ Local_Panic + beq Local_Panic _AssertAndRelease PSA.HTABLock, scratch=r16 lwz r16, 0x0000(r30) clrlwi. r8, r16, 0x1f - beq- MPCall_95_0x180 + beq MPCall_95_0x180 mr r8, r29 bl MPCall_95_0x254 - beq- MPCall_95_0x1c8 + beq MPCall_95_0x1c8 lhz r17, 0x0000(r30) rlwinm. r8, r17, 0, 16, 16 clrlwi r17, r17, 0x11 - bne- MPCall_95_0x180 + bne MPCall_95_0x180 cmpw r17, r28 crclr cr2_eq - ble- MPCall_95_0x180 + ble MPCall_95_0x180 mr r28, r17 lwz r4, Area.ID(r31) cmplwi r17, 0x7fff mr r5, r29 - bge- MPCall_95_0x1c8 + bge MPCall_95_0x1c8 MPCall_95_0x180 lwz r8, 0x0068(r31) lwz r9, Area.LogicalEnd(r31) add r29, r29, r8 subf. r9, r9, r29 - bge- MPCall_95_0x19c - bne+ cr2, MPCall_95_0xac + bge MPCall_95_0x19c + bne cr2, MPCall_95_0xac b MPCall_95_0xb8 MPCall_95_0x19c @@ -3834,19 +3834,19 @@ MPCall_95_0x19c cmpw r8, r9 addi r31, r9, -0x54 lwz r29, Area.LogicalBase(r31) - bne- MPCall_95_0x1c0 + bne MPCall_95_0x1c0 lwz r9, 0x0008(r8) addi r31, r9, -0x54 lwz r29, Area.LogicalBase(r31) MPCall_95_0x1c0 - bne+ cr2, MPCall_95_0xac + bne cr2, MPCall_95_0xac b MPCall_95_0xb8 MPCall_95_0x1c8 cmpwi r4, 0x00 stw r29, -0x03f4(r1) - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM lwz r8, 0x0068(r31) add r8, r8, r5 stw r8, -0x03f4(r1) @@ -3861,10 +3861,10 @@ MPCall_95_0x1e4 ; OUTSIDE REFERER subf r17, r16, r8 cmpwi r30, 0x00 rlwinm r17, r17, 22, 10, 29 - beqlr- + beqlr rlwinm. r16, r18, 0, 26, 26 rlwinm r16, r17, 22, 20, 29 - beq- MPCall_95_0x214 + beq MPCall_95_0x214 rlwinm r17, r17, 0, 20, 29 lwzx r30, r30, r16 @@ -3893,7 +3893,7 @@ MPCall_95_0x254 ; OUTSIDE REFERER lwz r30, 0x003c(r31) rlwinm. r17, r18, 0, 28, 28 subf r17, r16, r8 - beq- MPCall_95_0x288 + beq MPCall_95_0x288 lwz r30, 0x0044(r31) lwz r18, 0x0080(r31) addi r30, r30, -0x44 @@ -3905,10 +3905,10 @@ MPCall_95_0x254 ; OUTSIDE REFERER MPCall_95_0x288 cmpwi r30, 0x00 rlwinm r17, r17, 21, 11, 30 - beqlr- + beqlr rlwinm. r16, r18, 0, 30, 30 rlwinm r16, r17, 22, 20, 29 - beq- MPCall_95_0x2a8 + beq MPCall_95_0x2a8 rlwinm r17, r17, 0, 20, 30 lwzx r30, r30, r16 @@ -3922,12 +3922,12 @@ MPCall_95_0x2b0 ; OUTSIDE REFERER mtcrf 0x07, r19 rlwinm r17, r19, 0, 0, 19 rlwinm r16, r19, 23, 9, 28 - bnslr- cr7 - bgelr- cr5 + bnslr cr7 + bgelr cr5 lwzux r16, r18, r16 lwz r17, 0x0004(r18) mtcrf 0x80, r16 - bge+ Local_Panic + bge Local_Panic blr MPCall_95_0x2e0 ; OUTSIDE REFERER @@ -3937,7 +3937,7 @@ MPCall_95_0x2e0 ; OUTSIDE REFERER stw r16, 0x0000(r18) sync tlbie r8 - beq- MPCall_95_0x304 + beq MPCall_95_0x304 sync tlbsync @@ -3948,7 +3948,7 @@ MPCall_95_0x304 lwz r14, 0x0000(r30) lwz r17, 0x0004(r18) oris r16, r16, 0x8000 - beqlr- + beqlr rlwimi r14, r17, 29, 27, 27 rlwimi r14, r17, 27, 28, 28 mtcrf 0x07, r14 @@ -3977,14 +3977,14 @@ MPCall_95_0x348 ; OUTSIDE REFERER cmpwi r30, 0x00 li r16, 0x00 li r17, 0x00 - beq+ MPCall_95_0x334 + beq MPCall_95_0x334 stw r14, 0x0000(r30) b MPCall_95_0x334 V2P ; OUTSIDE REFERER mr. r19, r9 mfsprg r17, 0 - bne- MPCall_95_0x39c + bne MPCall_95_0x39c lwz r19, EWA.PA_CurAddressSpace(r17) MPCall_95_0x39c @@ -3994,42 +3994,42 @@ MPCall_95_0x39c rlwimi r19, r16, 15, 0, 14 xor r17, r8, r16 andc. r17, r17, r19 - beq- MPCall_95_0x444 + beq MPCall_95_0x444 lwzu r16, 0x0008(r18) rlwimi r19, r16, 15, 0, 14 xor r17, r8, r16 andc. r17, r17, r19 - beq- MPCall_95_0x444 + beq MPCall_95_0x444 lwzu r16, 0x0008(r18) rlwimi r19, r16, 15, 0, 14 xor r17, r8, r16 andc. r17, r17, r19 - beq- MPCall_95_0x444 + beq MPCall_95_0x444 lwzu r16, 0x0008(r18) rlwimi r19, r16, 15, 0, 14 xor r17, r8, r16 andc. r17, r17, r19 - beq- MPCall_95_0x444 + beq MPCall_95_0x444 lwzu r16, 0x0008(r18) rlwimi r19, r16, 15, 0, 14 xor r17, r8, r16 andc. r17, r17, r19 - beq- MPCall_95_0x444 + beq MPCall_95_0x444 lwzu r16, 0x0008(r18) rlwimi r19, r16, 15, 0, 14 xor r17, r8, r16 andc. r17, r17, r19 - beq- MPCall_95_0x444 + beq MPCall_95_0x444 lwzu r16, 0x0008(r18) rlwimi r19, r16, 15, 0, 14 xor r17, r8, r16 andc. r17, r17, r19 - beq- MPCall_95_0x444 + beq MPCall_95_0x444 lwzu r16, 0x0008(r18) rlwimi r19, r16, 15, 0, 14 xor r17, r8, r16 andc. r17, r17, r19 - bne- MPCall_95_0x45c + bne MPCall_95_0x45c MPCall_95_0x444 andi. r17, r16, 0x01 @@ -4037,12 +4037,12 @@ MPCall_95_0x444 lwzu r17, 0x0004(r18) and r19, r8, r19 or r17, r17, r19 - bnelr- + bnelr MPCall_95_0x45c ; OUTSIDE REFERER cmpwi r9, noErr addi r16, r9, 0x30 - beq- MPCall_95_0x474 + beq MPCall_95_0x474 rlwinm r17, r8, 6, 26, 29 lwzx r17, r16, r17 b MPCall_95_0x478 @@ -4069,7 +4069,7 @@ MPCall_95_0x4a0 lwz r17, 0x0010(r18) cmpw cr7, r16, r9 lwzu r9, 0x0018(r18) - bne- cr6, MPCall_95_0x4c4 + bne cr6, MPCall_95_0x4c4 MPCall_95_0x4bc lwzu r17, -0x0014(r18) @@ -4078,28 +4078,28 @@ MPCall_95_0x4bc MPCall_95_0x4c4 cmpw cr6, r16, r17 lwzu r17, 0x0008(r18) - beq+ cr7, MPCall_95_0x4bc + beq cr7, MPCall_95_0x4bc cmpw cr7, r16, r9 lwzu r9, 0x0008(r18) - beq+ cr6, MPCall_95_0x4bc + beq cr6, MPCall_95_0x4bc cmpw cr6, r16, r17 lwzu r17, 0x0008(r18) - beq+ cr7, MPCall_95_0x4bc + beq cr7, MPCall_95_0x4bc cmpw cr7, r16, r9 lwzu r9, 0x0008(r18) - beq+ cr6, MPCall_95_0x4bc + beq cr6, MPCall_95_0x4bc cmpw cr6, r16, r17 lwzu r17, -0x000c(r18) - beqlr- cr7 + beqlr cr7 cmpw cr7, r16, r9 lwzu r17, 0x0008(r18) - beqlr- cr6 + beqlr cr6 lwzu r17, 0x0008(r18) - beqlr- cr7 + beqlr cr7 lwz r17, 0x06a0(r1) xori r16, r16, 0x40 andi. r9, r16, 0x40 addi r18, r18, -0x3c xor r18, r18, r17 - bne+ MPCall_95_0x4a0 + bne MPCall_95_0x4a0 blr diff --git a/NanoKernel/NKBuiltinInit.s b/NanoKernel/NKBuiltinInit.s index ad6ce55..fc55035 100644 --- a/NanoKernel/NKBuiltinInit.s +++ b/NanoKernel/NKBuiltinInit.s @@ -49,7 +49,7 @@ InitBuiltin mfspr r12, pvr rlwinm. r12, r12, 0, 0, 14 - bne- @not601 + bne @not601 mtspr rtcl, r0 mtspr rtcu, r0 @@ -92,7 +92,7 @@ InitBuiltin @rambank_loop lwzu r11, 8(r10) ; Bank0Size, Bank1Size... cmpwi r11, 0 - beq+ @rambank_loop + beq @rambank_loop ; r10 points to BankXSize, r11 contains BankXSize @@ -127,7 +127,7 @@ InitBuiltin lwz r11, NKSystemInfo.PhysicalMemorySize(r5) addis r15, r11, 1 cmpwi r15, 0 - bgt- @skip_reducing_ram + bgt @skip_reducing_ram addi r11, r11, -4096 @skip_reducing_ram subf r11, r12, r11 @@ -212,9 +212,9 @@ InitBuiltin andc r13, r11, r14 ; end % HTABSIZE subf r13, r15, r13 ; end % HTABSIZE - r15 cmplw r13, r12 - blt+ @try_another_bank + blt @try_another_bank cmplw r13, r11 - bgt+ @try_another_bank + bgt @try_another_bank add r12, r13, r15 @@ -265,7 +265,7 @@ InitBuiltin cmpw r12, r11 lis r11, 0x7fff - bne- @did_not_panic + bne @did_not_panic subf r11, r13, r1 addi r11, r11, KDP.StartOfPanicArea @did_not_panic @@ -279,11 +279,11 @@ InitBuiltin subf r10, r11, r12 cmplwi cr7, r10, KDP.EndOfPanicArea - KDP.StartOfPanicArea - 4 - ble- cr7, @skipwrite + ble cr7, @skipwrite stwx r0, r13, r12 @skipwrite - bne+ @eraseloop + bne @eraseloop @@ -317,7 +317,7 @@ InitBuiltin lisori r12, 'RTAS' cmpw r7, r12 - bne- @RTAS_absent + bne @RTAS_absent stw r8, KDP.RTAS_Proc(r1) @@ -332,7 +332,7 @@ InitBuiltin addic. r10, r10, -4 lwzx r12, r9, r10 stwx r12, r11, r10 - bgt+ @RTAS_copyloop + bgt @RTAS_copyloop stw r23, PSA.NoIdeaR23(r1) b @RTAS_done @@ -354,7 +354,7 @@ InitBuiltin addic. r10, r10, -4 lwzx r12, r4, r10 stwx r12, r11, r10 - bgt+ @ProcessorInfo_copyloop + bgt @ProcessorInfo_copyloop @@ -367,14 +367,14 @@ InitBuiltin addic. r10, r10, -4 lwzx r12, r5, r10 stwx r12, r11, r10 - bgt+ @SystemInfo_copyloop + bgt @SystemInfo_copyloop ; If DiagnosticInfo != 0, copy it to PSA cmpwi r6, 0 - beq- @DiagInfo_skipcopy + beq @DiagInfo_skipcopy addi r11, r1, PSA.DiagInfo li r10, 256; NKDiagInfo.Size @@ -383,7 +383,7 @@ InitBuiltin addic. r10, r10, -4 lwzx r12, r6, r10 stwx r12, r11, r10 - bgt+ @DiagInfo_copyloop + bgt @DiagInfo_copyloop @DiagInfo_skipcopy @@ -405,11 +405,11 @@ InitBuiltin lwz r8, KDP.NanoKernelInfo + NKNanoKernelInfo.ConfigFlags(r1) if &TYPE('NKShowLog') = 'UNDEFINED' - blt- @no_screen_log + blt @no_screen_log lwz r8, NKConfigurationInfo.DebugFlags(r9) rlwinm. r8, r8, 0, NKConfigurationInfo.LogFlagBit, NKConfigurationInfo.LogFlagBit lwz r8, KDP.NanoKernelInfo + NKNanoKernelInfo.ConfigFlags(r1) - beq- @no_screen_log + beq @no_screen_log endif ; Enable the screen log @@ -741,7 +741,7 @@ InitBuiltin @LowMem_zeroloop addic. r9, r9, -4 stwx r0, r10, r9 - bne+ @LowMem_zeroloop + bne @LowMem_zeroloop ; Populate from LowMemInit "key-value" table. @@ -751,7 +751,7 @@ InitBuiltin lwzux r9, r11, r3 ; get first word and point r11 at it @LowMem_setloop mr. r9, r9 - beq- @LowMem_done + beq @LowMem_done lwzu r12, 4(r11) stwx r12, r10, r9 lwzu r9, 4(r11) @@ -772,7 +772,7 @@ InitBuiltin lwz r11, IRP.HWInfo + NKHWInfo.Signature(r11) lisori r12, 'Hnfo' cmplw r12, r11 - beq- FinishInitBuiltin + beq FinishInitBuiltin @@ -789,41 +789,41 @@ InitBuiltin ; check for several (some unknown) pre-7410 CPUs, and load their info cmpwi r12, 0x0001 ; 601 addi r11, r11, ProcessorInfoTable - NKTop - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x0003 ; 603 addi r11, r11, NKProcessorInfo.OvrEnd - NKProcessorInfo.Ovr - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x0004 ; 604 addi r11, r11, NKProcessorInfo.OvrEnd - NKProcessorInfo.Ovr - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x0006 ; 603e addi r11, r11, NKProcessorInfo.OvrEnd - NKProcessorInfo.Ovr - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x0007 ; 750FX addi r11, r11, NKProcessorInfo.OvrEnd - NKProcessorInfo.Ovr - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x0008 ; 750 addi r11, r11, NKProcessorInfo.OvrEnd - NKProcessorInfo.Ovr - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x0009 ; ??? addi r11, r11, NKProcessorInfo.OvrEnd - NKProcessorInfo.Ovr - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x000a ; ??? - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x000c ; 7400 addi r11, r11, NKProcessorInfo.OvrEnd - NKProcessorInfo.Ovr - beq- OverrideProcessorInfo + beq OverrideProcessorInfo cmpwi r12, 0x000d ; ??? addi r11, r11, NKProcessorInfo.OvrEnd - NKProcessorInfo.Ovr - beq- OverrideProcessorInfo + beq OverrideProcessorInfo @@ -849,17 +849,17 @@ new_world_0x60c lwzu r12, -0x0008(r10) subf r9, r12, r21 cmplw r9, r11 - bge- new_world_0x624 + bge new_world_0x624 mr r11, r9 new_world_0x624 cmplw r11, r15 - ble- new_world_0x634 + ble new_world_0x634 mr r13, r12 mr r15, r11 new_world_0x634 - bdnz+ new_world_0x60c + bdnz new_world_0x60c addi r12, r22, -0x01 neg r11, r13 and r12, r11, r12 @@ -874,14 +874,14 @@ new_world_0x634 new_world_0x660 subic. r10, r10, 4 stwx r11, r21, r10 - bne+ new_world_0x660 + bne new_world_0x660 dcbz 0, r21 new_world_0x670 addi r10, r10, 0x01 lbzx r11, r21, r10 cmpwi r11, 0x00 - beq+ new_world_0x670 + beq new_world_0x670 sth r10, 0x0f3c(r1) sth r10, 0x0f3e(r1) sth r10, 0x0f46(r1) @@ -899,7 +899,7 @@ new_world_0x6a4 cmpw r10, r21 rlwinm r9, r10, 9, 7, 19 tlbie r9 - bne+ new_world_0x6a4 + bne new_world_0x6a4 sync isync lwz r11, 0x064c(r1) @@ -914,7 +914,7 @@ new_world_0x6dc dcbst 0, r20 sync icbi 0, r20 - bdnz+ new_world_0x6dc + bdnz new_world_0x6dc sync isync stw r0, 0x0f34(r1) @@ -927,12 +927,12 @@ new_world_0x6dc new_world_0x714 addi r17, r17, 0x200 cmplw r17, r15 - bge- new_world_0x734 + bge new_world_0x734 new_world_0x720 mtlr r20 blrl - ble+ new_world_0x714 + ble new_world_0x714 addi r12, r17, -0x200 stw r12, 0x0f34(r1) @@ -948,12 +948,12 @@ new_world_0x734 new_world_0x750 add r17, r17, r18 cmplw r17, r15 - bge- new_world_0x774 + bge new_world_0x774 new_world_0x75c mtlr r20 blrl - ble+ new_world_0x750 + ble new_world_0x750 subf r17, r18, r17 divwu r12, r17, r18 sth r12, 0x0f4e(r1) @@ -972,14 +972,14 @@ new_world_0x774 new_world_0x798 lhz r12, 0x0f4a(r1) cmplw r14, r12 - ble- new_world_0x7bc + ble new_world_0x7bc srwi r14, r14, 1 subf r19, r14, r19 new_world_0x7ac mtlr r20 blrl - ble+ new_world_0x798 + ble new_world_0x798 slwi r12, r14, 1 new_world_0x7bc @@ -998,7 +998,7 @@ new_world_0x7e4 add r17, r17, r18 lis r12, 0x3f cmplw r17, r12 - bge- new_world_0x82c + bge new_world_0x82c new_world_0x7f4 mtlr r20 @@ -1011,7 +1011,7 @@ new_world_0x7f4 rlwinm r12, r12, 0, 28, 26 mtmsr r12 isync - ble+ new_world_0x7e4 + ble new_world_0x7e4 subf r17, r18, r17 divwu r12, r17, r18 sth r12, 0x0f50(r1) @@ -1029,7 +1029,7 @@ new_world_0x848 add r17, r17, r18 lis r12, 0x200 cmplw r17, r12 - bge- new_world_0x890 + bge new_world_0x890 new_world_0x858 mtlr r20 @@ -1042,7 +1042,7 @@ new_world_0x858 rlwinm r12, r12, 0, 28, 26 mtmsr r12 isync - ble+ new_world_0x848 + ble new_world_0x848 subf r17, r18, r17 divwu r12, r17, r18 sth r12, 0x0f52(r1) @@ -1079,7 +1079,7 @@ new_world_0x890 blrl sth r11, 0x0f40(r1) cmpwi r11, 0x01 - beq- skip_cache_hackery_never + beq skip_cache_hackery_never lwz r11, 0x064c(r1) li r12, (copied_code_2_end - copied_code_2) / 4 mtctr r12 @@ -1092,13 +1092,13 @@ new_world_0x924 dcbst 0, r20 sync icbi 0, r20 - bdnz+ new_world_0x924 + bdnz new_world_0x924 sync isync subf r12, r21, r20 mulli r12, r12, 0x80 cmplw r12, r15 - bge- new_world_0x958 + bge new_world_0x958 mr r15, r12 new_world_0x958 @@ -1115,7 +1115,7 @@ new_world_0x968 dcbst 0, r12 sync icbi 0, r12 - bne+ new_world_0x968 + bne new_world_0x968 sync isync stw r0, 0x0f38(r1) @@ -1128,12 +1128,12 @@ new_world_0x968 new_world_0x9a8 addi r17, r17, 0x200 cmplw r17, r15 - bge- new_world_0x9c8 + bge new_world_0x9c8 new_world_0x9b4 mtlr r20 blrl - ble+ new_world_0x9a8 + ble new_world_0x9a8 addi r12, r17, -0x200 stw r12, 0x0f38(r1) @@ -1149,12 +1149,12 @@ new_world_0x9c8 new_world_0x9e4 add r17, r17, r18 cmplw r17, r15 - bge- new_world_0xa08 + bge new_world_0xa08 new_world_0x9f0 mtlr r20 blrl - ble+ new_world_0x9e4 + ble new_world_0x9e4 subf r17, r18, r17 divwu r12, r17, r18 sth r12, 0x0f4c(r1) @@ -1170,7 +1170,7 @@ new_world_0xa10 dcbst 0, r12 sync icbi 0, r12 - bne+ new_world_0xa10 + bne new_world_0xa10 sync isync lwz r17, 0x0f38(r1) @@ -1203,9 +1203,9 @@ new_world_0xa54 dcbst r12, r14 sync icbi r12, r14 - bne+ new_world_0xa54 + bne new_world_0xa54 cmpw r12, r13 - bne+ new_world_0xa4c + bne new_world_0xa4c sync isync mr r19, r18 @@ -1218,14 +1218,14 @@ new_world_0xa54 new_world_0xac8 li r12, 0x08 cmplw r14, r12 - ble- new_world_0xaec + ble new_world_0xaec srwi r14, r14, 1 subf r19, r14, r19 new_world_0xadc mtlr r20 blrl - ble+ new_world_0xac8 + ble new_world_0xac8 slwi r12, r14, 1 new_world_0xaec @@ -1245,9 +1245,9 @@ new_world_0xb04 addi r14, r14, 0x04 lwzu r9, 0x0004(r11) stwx r9, r12, r14 - bne+ new_world_0xb04 + bne new_world_0xb04 cmpw r12, r13 - bne+ new_world_0xafc + bne new_world_0xafc skip_cache_hackery_never ; Clearly can't just fall through @@ -1275,21 +1275,21 @@ copied_code_1_0x18 lbzx r12, r19, r11 add r12, r12, r12 add r11, r11, r18 - bdnz+ copied_code_1_0x18 + bdnz copied_code_1_0x18 subf r19, r13, r19 mfdec r12 neg r12, r12 cmplw r12, r16 - bgt- copied_code_1_0x54 + bgt copied_code_1_0x54 mr r16, r12 copied_code_1_0x54 srwi r11, r12, 7 subf r12, r11, r12 cmpw r12, r16 - blelr- + blelr addic. r10, r10, -0x01 - bgt+ copied_code_1_0x4 + bgt copied_code_1_0x4 cmpw r12, r16 blr isync @@ -1336,12 +1336,12 @@ copied_code_2_0x1c mtlr r12 blrl add r11, r11, r18 - bdnz+ copied_code_2_0x1c + bdnz copied_code_2_0x1c subf r19, r13, r19 mfdec r12 neg r12, r12 cmplw r12, r16 - bgt- copied_code_2_0x60 + bgt copied_code_2_0x60 mr r16, r12 copied_code_2_0x60 @@ -1349,9 +1349,9 @@ copied_code_2_0x60 subf r12, r11, r12 cmpw r12, r16 mtlr r9 - blelr- + blelr addic. r10, r10, -0x01 - bgt+ copied_code_2_0x8 + bgt copied_code_2_0x8 cmpw r12, r16 blr isync diff --git a/NanoKernel/NKCache.s b/NanoKernel/NKCache.s index 26ccd39..d67d793 100644 --- a/NanoKernel/NKCache.s +++ b/NanoKernel/NKCache.s @@ -52,24 +52,24 @@ kcCacheDispatch clrlwi r8, r3, 16 ; bad selector cmplwi r8, 2 - bgt- @fail_bad_selector + bgt @fail_bad_selector lwz r8, KDP.ProcessorInfo + NKProcessorInfo.ProcessorFlags(r1) andi. r8, r8, 1 << NKProcessorInfo.hasL2CR - beq- CacheCallFailNoL2 ; no L2CR => fail (what about 601?) + beq CacheCallFailNoL2 ; no L2CR => fail (what about 601?) rlwinm. r9, r3, 0, 2, 2 ; if flagged, get cache state in r23 - bnel- CacheCallGetInfoForReturnValue ; (otherwise, r23 is undefined) + bnel CacheCallGetInfoForReturnValue ; (otherwise, r23 is undefined) srwi r8, r3, 30 ; cannot enable *and* disable cmpwi r8, 3 - beq- CacheCallFailBadFlags + beq CacheCallFailBadFlags clrlwi r8, r3, 16 ; go to main code for level 1/2 cache cmplwi r8, 1 - beq- CacheCallDispatchL1 + beq CacheCallDispatchL1 cmplwi r8, 2 - beq- CacheCallDispatchL2 + beq CacheCallDispatchL2 @fail_bad_selector ; fall through => bad selector lisori r3, -2 @@ -88,10 +88,10 @@ kcCacheDispatch CacheCallDispatchL1 rlwinm. r9, r3, 0, 1, 1 - bne- CacheCallL1DisableSelected + bne CacheCallL1DisableSelected rlwinm. r9, r3, 0, 0, 0 - bne- CacheCallL1EnableSelected + bne CacheCallL1EnableSelected rlwinm. r9, r3, 0, 3, 3 ; ??? @@ -142,18 +142,18 @@ CacheCallL1EnableSelected CacheCallDispatchL2 rlwinm. r9, r3, 0, 1, 1 - bne- CacheCallL2DisableSelected + bne CacheCallL2DisableSelected rlwinm. r9, r3, 0, 0, 0 - bne- CacheCallL2EnableSelected + bne CacheCallL2EnableSelected rlwinm. r9, r3, 0, 3, 3 - bne- CacheCallL2Flag3 ; goes to DisableSelected + bne CacheCallL2Flag3 ; goes to DisableSelected rlwinm. r9, r3, 0, 2, 2 ;bne removed? - bne- CacheCallReturn + bne CacheCallReturn @@ -175,11 +175,11 @@ CacheCallL2EnableSelected mfspr r21, l2cr ; fail if L2CR[L2E] already set sync andis. r21, r21, 0x8000 - bne- CacheCallReturn + bne CacheCallReturn lwz r8, KDP.ProcessorInfo + NKProcessorInfo.ProcessorL2DSize(r1) and. r8, r8, r8 - beq- CacheCallFailNoL2 ; fail if zero-sized cache reported + beq CacheCallFailNoL2 ; fail if zero-sized cache reported mfspr r21, hid0 ; save HID0 @@ -190,7 +190,7 @@ CacheCallL2EnableSelected addi r8, r1, PSA.ProcessorState lwz r8, NKProcessorState.saveL2CR(r8) and. r8, r8, r8 - beq- CacheCallReturn ; fail if zero L2CR was saved? + beq CacheCallReturn ; fail if zero L2CR was saved? sync lis r9, 0x0020 ; set L2CR[GI] (global invalidate) @@ -201,7 +201,7 @@ CacheCallL2EnableSelected mfspr r8, l2cr ; check L2CR[IP] (invalidate progress) sync andi. r9, r8, 1 - bne+ @inval_loop + bne @inval_loop lis r9, 0x0020 ; clear L2CR[GI] andc r8, r8, r9 @@ -233,7 +233,7 @@ CacheCallL2DisableSelected mfspr r22, l2cr ; return if already disabled per L2CR[L2E] sync andis. r22, r22, 0x8000 - beq- CacheCallReturn + beq CacheCallReturn bl FlushCaches @@ -298,9 +298,9 @@ CacheCallGetInfoForReturnValue clrlwi r8, r3, 16 cmplwi r8, 1 - beq- @level1 + beq @level1 cmplwi r8, 2 - beq- @level2 + beq @level2 lisori r3, -5 b CacheCallReturnWithoutFlags @@ -308,7 +308,7 @@ CacheCallGetInfoForReturnValue @level1 mfspr r21, hid0 rlwinm. r21, r21, 12, 4, 5 - beq- @all_off + beq @all_off oris r23, r21, 0x8000 blr @@ -316,7 +316,7 @@ CacheCallGetInfoForReturnValue @level2 lwz r8, KDP.ProcessorInfo + NKProcessorInfo.ProcessorL2DSize(r1) and. r8, r8, r8 - beq+ CacheCallFailNoL2 + beq CacheCallFailNoL2 mfspr r21, hid0 ; same bits as above rlwinm r21, r21, 12, 4, 5 @@ -327,7 +327,7 @@ CacheCallGetInfoForReturnValue mfspr r22, l2cr ; then again, both L2s are off if L2CR[L2E] is cleared andis. r22, r22, 0x8000 - beq- @all_off + beq @all_off or r23, r21, r22 blr @@ -369,12 +369,12 @@ FlushCaches lhz r25, KDP.ProcessorInfo + NKProcessorInfo.DataCacheLineSize(r1) and. r25, r25, r25 ; r25 = L1-D line size cntlzw r8, r25 - beq- @return + beq @return subfic r9, r8, 31 ; r9 = logb(L1-D line size) lwz r8, KDP.ProcessorInfo + NKProcessorInfo.DataCacheTotalSize(r1) and. r8, r8, r8 ; r8 = L1-D size - beq- @return + beq @return lwz r24, KDP.ProcessorInfo + NKProcessorInfo.ProcessorFlags(r1) mtcr r24 @@ -397,28 +397,28 @@ FlushCaches @loop_L1 lwzux r9, r8, r25 - bdnz+ @loop_L1 + bdnz @loop_L1 ; Flush level 2 (very similar to above) lwz r24, KDP.ProcessorInfo + NKProcessorInfo.ProcessorFlags(r1) andi. r24, r24, 1 << NKProcessorInfo.hasL2CR - beq- @return ; return if L2CR unavailable + beq @return ; return if L2CR unavailable mfspr r24, l2cr andis. r24, r24, 0x8000 - beq- @return ; return if L2 off (per L2CR[L2E]) + beq @return ; return if L2 off (per L2CR[L2E]) lhz r25, KDP.ProcessorInfo + NKProcessorInfo.ProcessorL2DBlockSize(r1) and. r25, r25, r25 ; r25 = L2-D line size cntlzw r8, r25 - beq- @return + beq @return subfic r9, r8, 31 ; r9 = logb(L2-D line size) lwz r8, KDP.ProcessorInfo + NKProcessorInfo.ProcessorL2DSize(r1) and. r8, r8, r8 ; r8 = L2-D size - beq- @return + beq @return srw r8, r8, r9 mtctr r8 ; loop counter = cache/line @@ -437,7 +437,7 @@ FlushCaches @loop_L2 lwzux r9, r8, r25 - bdnz+ @loop_L2 + bdnz @loop_L2 rlwinm r24, r24, 0, 10, 8 mtspr l2cr, r24 ; clear L2CR[DO] (reenables L2-I) @@ -474,7 +474,7 @@ FlushCaches mfspr r8, msscr0 sync andis. r8, r8, 0x0080 - bne+ @loop_msscr0 + bne @loop_msscr0 ; Flush level 2: set L2CR[4] and spin until it clears @@ -487,7 +487,7 @@ FlushCaches mfspr r8, l2cr sync andi. r8, r8, 0x0800 - bne+ @loop_l2cr + bne @loop_l2cr ; Jump back up to main code path to return @@ -524,6 +524,6 @@ FlushL1CacheUsingMSSCR0 mfspr r8, msscr0 sync andis. r8, r8, 0x0080 - bne+ @loop_msscr0 + bne @loop_msscr0 blr diff --git a/NanoKernel/NKConsoleLog.s b/NanoKernel/NKConsoleLog.s index eeb5b75..e0e298c 100644 --- a/NanoKernel/NKConsoleLog.s +++ b/NanoKernel/NKConsoleLog.s @@ -18,9 +18,9 @@ prints ; OUTSIDE REFERER cmpwi cr7, r28, 0x00 andi. r29, r29, 0x02 - beq- cr7, prints_skip_serial + beq cr7, prints_skip_serial crmove 30, 2 - beq- PrintS_skip_serial + beq PrintS_skip_serial mfmsr r31 bl serial_io bl serial_flush @@ -32,24 +32,24 @@ prints_next_char bl serial_busywait lbzu r29, 0x0001(r8) cmpwi r29, 0x00 - beq- print_common + beq print_common cmpwi r29, 10 - beq- PrintS_newline + beq PrintS_newline cmpwi r29, 13 - beq- PrintS_newline + beq PrintS_newline cmpwi r29, '\\' - beq- PrintS_escape_code + beq PrintS_escape_code cmpwi r29, '^' - bne- PrintS_normal_char + bne PrintS_normal_char prints_escape_code lbzu r29, 0x0001(r8) cmpwi r29, 'n' - beq- PrintS_newline + beq PrintS_newline cmpwi r29, 'r' - beq- PrintS_newline + beq PrintS_newline cmpwi r29, 'b' - bne- PrintS_literal_backslash_or_caret + bne PrintS_literal_backslash_or_caret li r29, 0x07 b PrintS_normal_char @@ -62,7 +62,7 @@ prints_normal_char ; r1 = kdp bl ScreenConsole_putchar - beq- cr7, prints_0xe4 + beq cr7, prints_0xe4 ori r30, r31, 0x10 mtmsr r30 isync @@ -86,7 +86,7 @@ prints_newline ; r1 = kdp bl ScreenConsole_redraw - beq- cr7, prints_0x13c + beq cr7, prints_0x13c ori r30, r31, 0x10 mtmsr r30 isync @@ -98,7 +98,7 @@ prints_0x118 lbz r29, 0x0002(r28) eieio andi. r29, r29, 0x04 - beq+ PrintS_0x118 + beq PrintS_0x118 li r29, 0x0a stb r29, 0x0006(r28) eieio @@ -111,7 +111,7 @@ prints_0x13c print_common ; OUTSIDE REFERER - beq- cr7, print_common_0x8c + beq cr7, print_common_0x8c mtmsr r31 isync lwz r29, -0x0438(r1) @@ -125,14 +125,14 @@ print_common ; OUTSIDE REFERER print_common_0x28 mfspr r30, dec subf. r30, r29, r30 - ble- print_common_0x50 + ble print_common_0x50 li r30, 0x01 stb r30, 0x0002(r28) eieio lbz r30, 0x0002(r28) eieio andi. r30, r30, 0x01 - beq+ print_common_0x28 + beq print_common_0x28 print_common_0x50 sync @@ -141,7 +141,7 @@ print_common_0x50 mfspr r30, pvr rlwinm. r30, r30, 0, 0, 14 li r31, 0x00 - beq- print_common_0x78 + beq print_common_0x78 mtspr dbat3u, r31 mtspr dbat3l, r31 b print_common_0x80 @@ -195,27 +195,27 @@ printd ; OUTSIDE REFERER cmpwi cr7, r28, 0x00 andi. r29, r29, 0x02 - beq- cr7, printd_0x58 + beq cr7, printd_0x58 crmove 30, 2 - beq- Printd_0x58 + beq Printd_0x58 bl serial_io bl serial_flush printd_0x58 cmpwi r8, 0x00 li r25, 0x2d - blt- Printd_0x9c + blt Printd_0x9c printd_0x64 mr. r24, r8 li r25, 0x30 - beq- Printd_0x9c + beq Printd_0x9c lis r24, 0x3b9a ori r24, r24, 0xca00 printd_0x78 divw. r25, r8, r24 - bne- Printd_0x8c + bne Printd_0x8c li r25, 0x0a divw r24, r24, r25 b Printd_0x78 @@ -232,7 +232,7 @@ printd_0x9c ; r1 = kdp bl ScreenConsole_putchar - beq- cr7, printd_0xc8 + beq cr7, printd_0xc8 ori r30, r31, 0x10 mtmsr r30 isync @@ -243,19 +243,19 @@ printd_0x9c printd_0xc8 cmpwi r8, 0x00 - bge- Printd_0xd8 + bge Printd_0xd8 neg r8, r8 b Printd_0x64 printd_0xd8 li r25, 0x0a divw. r24, r24, r25 - bne+ Printd_0x8c + bne Printd_0x8c li r29, 0x20 ; r1 = kdp bl ScreenConsole_putchar - beq- cr7, printd_0x120 + beq cr7, printd_0x120 ori r30, r31, 0x10 mtmsr r30 isync @@ -264,7 +264,7 @@ printd_0xfc lbz r30, 0x0002(r28) eieio andi. r30, r30, 0x04 - beq+ Printd_0xfc + beq Printd_0xfc li r29, 0x20 stb r29, 0x0006(r28) eieio @@ -352,9 +352,9 @@ print_digity_common ; OUTSIDE REFERER cmpwi cr7, r28, 0x00 andi. r29, r29, 0x02 - beq- cr7, print_digity_common_0x40 + beq cr7, print_digity_common_0x40 crmove 30, 2 - beq- print_digity_common_0x40 + beq print_digity_common_0x40 bl serial_io bl serial_flush @@ -364,7 +364,7 @@ print_digity_common_0x40 rlwimi r25, r8, 4, 28, 31 rotlwi r8, r8, 0x04 cmpwi r25, 0x39 - ble- print_digity_common_0x5c + ble print_digity_common_0x5c addi r25, r25, 0x27 print_digity_common_0x5c @@ -372,7 +372,7 @@ print_digity_common_0x5c ; r1 = kdp bl ScreenConsole_putchar - beq- cr7, print_digity_common_0x84 + beq cr7, print_digity_common_0x84 ori r30, r31, 0x10 mtmsr r30 isync @@ -384,13 +384,13 @@ print_digity_common_0x5c print_digity_common_0x84 addi r24, r24, -0x01 mr. r24, r24 - bne+ print_digity_common_0x40 - bne- cr6, print_digity_common_0xd0 + bne print_digity_common_0x40 + bne cr6, print_digity_common_0xd0 li r29, 0x20 ; r1 = kdp bl ScreenConsole_putchar - beq- cr7, print_digity_common_0xd0 + beq cr7, print_digity_common_0xd0 ori r30, r31, 0x10 mtmsr r30 isync @@ -399,7 +399,7 @@ print_digity_common_0xac lbz r30, 0x0002(r28) eieio andi. r30, r30, 0x04 - beq+ print_digity_common_0xac + beq print_digity_common_0xac li r29, 0x20 stb r29, 0x0006(r28) eieio @@ -423,7 +423,7 @@ getchar ; OUTSIDE REFERER lwz r28, -0x0900(r1) cmpwi cr7, r28, 0x00 li r8, -0x01 - beq+ cr7, print_return + beq cr7, print_return _Lock PSA.DbugLock, scratch1=r30, scratch2=r31 @@ -434,7 +434,7 @@ getchar ; OUTSIDE REFERER lbz r30, 0x0002(r28) eieio andi. r30, r30, 0x01 - beq+ print_common + beq print_common lbz r8, 0x0006(r28) b print_common @@ -459,9 +459,9 @@ printc ; OUTSIDE REFERER cmpwi cr7, r28, 0x00 andi. r29, r29, 0x02 - beq- cr7, printc_0x58 + beq cr7, printc_0x58 crmove 30, 2 - beq- Printc_0x58 + beq Printc_0x58 bl serial_io bl serial_flush @@ -470,7 +470,7 @@ printc_0x58 ; r1 = kdp bl ScreenConsole_putchar - beq- cr7, printc_0x90 + beq cr7, printc_0x90 ori r30, r31, 0x10 mtmsr r30 isync @@ -479,7 +479,7 @@ printc_0x70 lbz r30, 0x0002(r28) eieio andi. r30, r30, 0x04 - beq+ Printc_0x70 + beq Printc_0x70 stb r8, 0x0006(r28) eieio mtmsr r31 @@ -602,7 +602,7 @@ serial_io ; OUTSIDE REFERER mfspr r30, pvr rlwinm. r30, r30, 0, 0, 14 rlwinm r29, r28, 0, 0, 14 - beq- serial_io_0x38 + beq serial_io_0x38 li r30, 0x03 or r30, r30, r29 li r31, 0x3a @@ -631,7 +631,7 @@ serial_io_0x50 ; See disclaimer above. serial_busywait ; OUTSIDE - beqlr- cr7 + beqlr cr7 ori r30, r31, 0x10 mtmsr r30 isync @@ -640,7 +640,7 @@ serial_busywait_0x10 lbz r30, 0x0002(r28) eieio andi. r30, r30, 0x04 - beq+ serial_busywait_0x10 + beq serial_busywait_0x10 mtmsr r31 isync blr diff --git a/NanoKernel/NKIndex.s b/NanoKernel/NKIndex.s index 6adf7d3..69939f3 100644 --- a/NanoKernel/NKIndex.s +++ b/NanoKernel/NKIndex.s @@ -32,7 +32,7 @@ InitIDIndex mr. r22, r8 stw r8, PSA.IndexPtr(r1) - beq+ Local_Panic + beq Local_Panic li r9, 0 stw r9, KDP.NanoKernelInfo + NKNanoKernelInfo.IDCtr(r1) @@ -50,7 +50,7 @@ InitIDIndex cmpwi r8, 0 stw r8, Index.IDsPtr(r22) - beq+ Local_Panic + beq Local_Panic mtlr r23 @@ -82,24 +82,24 @@ MakeID addi r20, r18, 0x08 cmpwi r18, 0x00 add r22, r22, r20 - bne- @_48 + bne @_48 li r19, 0x00 b @_c @_3c add r20, r20, r19 cmpw r20, r21 - beq- @_70 + beq @_70 @_48 lbz r23, 0x0000(r22) cmpwi r23, 0x00 - beq- @_f0 + beq @_f0 addi r19, r19, 0x01 cmpwi cr1, r19, 0x1fa addi r22, r22, 0x08 lhz r20, 0x0000(r18) - blt+ cr1, @_3c + blt cr1, @_3c addi r19, r20, 0x200 b @_c @@ -111,7 +111,7 @@ MakeID addi r19, r19, 0x200 rlwinm. r20, r19, 25, 23, 29 li r8, 0x00 - beqlr- + beqlr mflr r23 li r8, 0xfd8 @@ -123,7 +123,7 @@ MakeID mr. r18, r8 mtlr r23 li r8, 0x00 - beqlr- + beqlr lwz r17, -0x0a98(r1) lhz r19, 0x0002(r17) addi r19, r19, 0x200 @@ -185,14 +185,14 @@ DeleteID add r22, r22, r20 clrlwi r20, r8, 0x10 li r8, 0x00 - bgelr- cr1 - beqlr- + bgelr cr1 + beqlr lbz r19, 0x0000(r22) lhz r23, 0x0002(r22) cmpwi r19, 0x00 cmpw cr1, r23, r20 - beqlr- - bnelr- cr1 + beqlr + bnelr cr1 lwz r9, KDP.NanoKernelInfo + NKNanoKernelInfo.IDCtr(r1) addi r9, r9, -0x01 stw r9, KDP.NanoKernelInfo + NKNanoKernelInfo.IDCtr(r1) @@ -224,14 +224,14 @@ LookupID clrlwi r20, r8, 0x10 li r8, 0x00 li r9, 0x00 - bgelr- cr1 - beqlr- + bgelr cr1 + beqlr lbz r19, 0x0000(r22) lhz r23, 0x0002(r22) cmpwi r19, 0x00 cmpw cr1, r23, r20 - beqlr- - bnelr- cr1 + beqlr + bnelr cr1 lwz r8, 0x0004(r22) mr r9, r19 blr @@ -255,40 +255,40 @@ GetNextIDOfClass addi r20, r18, 0x08 slwi r22, r19, 3 li r8, 0x00 - bgelr- cr1 - beqlr- + bgelr cr1 + beqlr add r22, r22, r20 - bne- cr2, @_48 + bne cr2, @_48 @_3c lbz r23, 0x0000(r22) cmpwi r23, 0x00 - bne- @_8c + bne @_8c @_48 addi r19, r19, 0x01 cmpwi r19, 0x1fa addi r22, r22, 0x08 - blt+ @_3c + blt @_3c lhz r20, 0x0000(r18) addi r20, r20, 0x200 rlwinm. r20, r20, 25, 23, 29 lwz r18, -0x0a98(r1) - beqlr- + beqlr addi r20, r20, 0x08 li r19, 0x00 lwzx r18, r18, r20 cmpwi r18, 0x00 addi r22, r18, 0x08 - bne+ @_3c + bne @_3c li r8, 0x00 blr @_8c cmpwi r9, 0x00 cmpw cr1, r9, r23 - beq- @_9c - bne+ cr1, @_48 + beq @_9c + bne cr1, @_48 @_9c lhz r20, 0x0000(r18) diff --git a/NanoKernel/NKInit.s b/NanoKernel/NKInit.s index a56ec65..0875eed 100644 --- a/NanoKernel/NKInit.s +++ b/NanoKernel/NKInit.s @@ -56,7 +56,7 @@ EndOfNanoKernelHeader mfmsr r0 rlwinm. r0, r0, 0, MSR_DRbit, MSR_DRbit - beql- InitBuiltin + beql InitBuiltin ; But if data paging is on, do some very strange things... @@ -118,7 +118,7 @@ InitIRP stw r10, 4(r12) addi r12, r12, 8 andi. r10, r12, 0xfff - bne+ @wipe_loop + bne @wipe_loop blr @@ -350,7 +350,7 @@ InitHighLevel subic. r22, r22, 4 lwzx r0, r22, r8 stwx r0, r22, r9 - bgt+ @loop + bgt @loop @@ -583,7 +583,7 @@ InitHighLevel @kctab_initloop subic. r22, r22, 4 stwx r23, r8, r22 - bne+ @kctab_initloop + bne @kctab_initloop ; Then some overrides (names still pretty poor) @@ -639,11 +639,11 @@ SetProcessorFlags mfpvr r23 srwi r23, r23, 16 andi. r8, r23, 0x8000 - bne- @pvr_has_high_bit_set + bne @pvr_has_high_bit_set ; PVR < 0x8000 (therefore probably equals 000*) cmplwi r23, 0x000f ; but if not, pretend it's zero - ble- @pvr_not_low + ble @pvr_not_low li r23, 0x0000 @pvr_not_low @@ -664,7 +664,7 @@ SetProcessorFlags andi. r23, r23, 0x7fff cmplwi r23, 0x000f - ble- @other_pvr_not_low + ble @other_pvr_not_low li r23, -0x10 @other_pvr_not_low @@ -763,7 +763,7 @@ SetProcessorFlags bl PoolAllocClear ; takes size and returns ptr, all in r8 mr. r31, r8 - beq- Init_Panic + beq Init_Panic ; Get opaque ID li r9, Process.kIDClass @@ -802,7 +802,7 @@ SetProcessorFlags li r8, 0x58 ;CoherenceGroup.Size bl PoolAllocClear mr. r31, r8 - beq- Init_Panic + beq Init_Panic ; Append to the global CGRP list @@ -926,13 +926,13 @@ SetProcessorFlags rlwinm r23, r21, 0, 23, 21 ; munge the second byte cmpw r21, r23 - beq- @bitnotset + beq @bitnotset add r21, r23, r26 @bitnotset addic. r22, r22, -8 stwu r21, 4(r8) ; but store it eventually - bgt+ @BAT_copyloop + bgt @BAT_copyloop @@ -953,7 +953,7 @@ SetProcessorFlags cmpwi r8, 0 mr r30, r9 - bne- Init_Panic + bne Init_Panic ; The relationship between SPACes and PROCs is still unclear... @@ -1116,7 +1116,7 @@ SetProcessorFlags ; Check mr. r31, r8 - beq- Init_Panic + beq Init_Panic lwz r8, Task.ID(r31) stw r8, KDP.NanoKernelInfo + NKNanoKernelInfo.blueTaskID(r1) @@ -1224,7 +1224,7 @@ av set PSA.AVFeatureBit ; Check mr. r31, r8 - beq- Init_Panic + beq Init_Panic ; Misc population lisori r8, 'idle' @@ -1302,7 +1302,7 @@ av set PSA.AVFeatureBit cmpwi r8, 0 mr r30, r9 lwz r31, EWA.CPUBase + CPU.IdleTaskPtr(r1) - bne- Init_Panic + bne Init_Panic stw r30, Task.AddressSpacePtr(r31) @@ -1317,7 +1317,7 @@ av set PSA.AVFeatureBit ; Put HTABORG and PTEGMask in KDP, and zero out the last PTEG - beq- cr5, @skip_zeroing_pteg + beq cr5, @skip_zeroing_pteg mfspr r8, sdr1 ; get settable HTABMASK bits @@ -1339,7 +1339,7 @@ av set PSA.AVFeatureBit @loop subic. r22, r22, 4 stwx r23, r8, r22 - bgt+ @loop + bgt @loop @skip_zeroing_pteg @@ -1352,7 +1352,7 @@ av set PSA.AVFeatureBit ; Copy the ConfigInfo pagemap into KDP, absolut-ising entries ; whose physical addresses are relative to ConfigInfo. - beq- cr5, @skip_copying_pagemap + beq cr5, @skip_copying_pagemap lwz r9, NKConfigurationInfo.PageMapInitOffset(r26) ; from base of CI lwz r22, NKConfigurationInfo.PageMapInitSize(r26) add r9, r9, r26 @@ -1363,7 +1363,7 @@ av set PSA.AVFeatureBit andi. r23, r21, PMDT.DaddyFlag | PMDT.PhysicalIsRelativeFlag cmpwi r23, PMDT.PhysicalIsRelativeFlag - bne- @physical_address_not_relative_to_config_info + bne @physical_address_not_relative_to_config_info rlwinm r21, r21, 0, ~PMDT.PhysicalIsRelativeFlag add r21, r21, r26 @@ -1374,7 +1374,7 @@ av set PSA.AVFeatureBit subic. r22, r22, 4 lwzx r20, r9, r22 ; load another word, but no be cray stwx r20, r18, r22 ; just save it in KDP - bgt+ @copyloop_pagemap + bgt @copyloop_pagemap @skip_copying_pagemap @@ -1455,7 +1455,7 @@ IRPTopOffset equ IRPOffset + 0x1000 oris r23, r23, 0x2000 ; no clue? stwu r23, 4(r8) - bgt+ @copyloop_segmaps + bgt @copyloop_segmaps @@ -1523,14 +1523,14 @@ IRPTopOffset equ IRPOffset + 0x1000 cmplwi cr7, r30, 0xffff ; if not at base: rlwinm. r31, r31, 0, PMDT.DaddyFlag | PMDT.CountingFlag ; if neither flag: - bgt- cr7, @finish_count ; stop counting + bgt cr7, @finish_count ; stop counting cmpwi cr6, r31, PMDT.DaddyFlag | PMDT.CountingFlag ; if both flags: - beq- @finish_count ; stop counting - beq+ cr6, @skip_pmdt ; next PMDT instead + beq @finish_count ; stop counting + beq cr6, @skip_pmdt ; next PMDT instead add r22, r22, r30 addi r22, r22, 1 - beq+ cr7, @next_segment ; else count and move on to next segment descriptor + beq cr7, @next_segment ; else count and move on to next segment descriptor @finish_count stw r22, KDP.VMMaxVirtualPages(r1) @@ -1555,7 +1555,7 @@ IRPTopOffset equ IRPOffset + 0x1000 ListFreePhysicalPages - beq- cr5, @skip + beq cr5, @skip lwz r21, KDP.KernelMemoryBase(r1) lwz r20, KDP.KernelMemoryEnd(r1) @@ -1583,7 +1583,7 @@ ListFreePhysicalPages @nextbank subic. r23, r23, 1 - blt- @done + blt @done lwzu r31, 8(r19) ; bank start address lwz r22, 4(r19) ; bank size @@ -1594,11 +1594,11 @@ ListFreePhysicalPages cmplw cr6, r31, r21 cmplw cr7, r31, r20 subi r22, r22, 4096 - blt+ @nextbank + blt @nextbank ; Check that this page is outside the kernel's reserved area - blt- cr6, @below_reserved - blt- cr7, @in_reserved + blt cr6, @below_reserved + blt cr7, @in_reserved @below_reserved stwu r31, 4(r29) ; write that part-PTE at the base of kernel memory @in_reserved @@ -1613,7 +1613,7 @@ ListFreePhysicalPages PrimeFreeListFromBanks - beq- cr5, PrimeFreeListFromSystemHeap + beq cr5, PrimeFreeListFromSystemHeap ; Add ~18 to 20 of these pages to the free list, depending on RAM size subf r22, r21, r29 @@ -1636,7 +1636,7 @@ PrimeFreeListFromBanks subi r17, r17, 1 subi r29, r29, 4 cmpwi r17, 0 - bgt+ @loop + bgt @loop b DonePrimingFreeList @@ -1651,7 +1651,7 @@ PrimeFreeListFromSystemHeap lwz r8, 0x05a8(r1) ; kdp.0x5a8 addi r18, r1, 0x2000 ; kdp.0x2000 subf. r8, r18, r8 - blt- DonePrimingFreeList + blt DonePrimingFreeList addi r8, r8, 0x1000 srwi r17, r8, 12 @@ -1670,7 +1670,7 @@ PrimeFreeListFromSystemHeap addi r17, r17, -0x01 addi r18, r18, 0x1000 cmpwi r17, 0x00 - bgt+ @stupidloop + bgt @stupidloop @@ -1714,7 +1714,7 @@ DonePrimingFreeList ; The replacement kernel needs to return to the Mac OS ; boot process. - beq- cr5, finish_old_world + beq cr5, finish_old_world @@ -1740,7 +1740,7 @@ ReconcileMemory slwi r8, r8, 2 ; Memory We Have versus Memory We Could Use - ; (see blt- below) + ; (see blt below) cmplw r22, r8 ; TotalPhysicalPages equals pages not yet in free list but that could go in. @@ -1750,7 +1750,7 @@ ReconcileMemory stw r19, KDP.TotalPhysicalPages(r1) ; r22 = pages in array destined to be mapped to blue area - blt- @less_than_VMMaxVirtualPages + blt @less_than_VMMaxVirtualPages subi r22, r8, 4 @less_than_VMMaxVirtualPages @@ -1794,7 +1794,7 @@ ReconcileMemory stwu r21, 0x0004(r29) addis r21, r21, 4 ; we just used a segment's worth of pages on this subis r22, r22, 1 ; pages in a segment - bgt+ @persegment + bgt @persegment ; Number of pages in that last segment sth r22, 0x0002(r8) @@ -1807,7 +1807,7 @@ ReconcileMemory ; If any, they will be chucked on the free list subf. r18, r17, r18 slwi r31, r17, 12 ; does this work with discontiguous banks? hmm... - ble- @no_leftover_ram + ble @no_leftover_ram ; See? _log 'Physical RAM greater than the initial logical area.^n Moving ' @@ -1824,7 +1824,7 @@ ReconcileMemory addi r31, r31, 4096 subi r18, r18, 1 cmpwi r18, 0 - bgt+ @loop + bgt @loop @no_leftover_ram @@ -1880,7 +1880,7 @@ finish_old_world lwz r27, 0x0630(r1) lwz r27, 0x0094(r27) bl PagingFunc4 - beq- setup_0x1160 + beq setup_0x1160 li r30, 0x00 stw r30, -0x0004(r29) eieio @@ -1892,7 +1892,7 @@ setup_0x1160 lwz r27, 0x0630(r1) lwz r27, 0x009c(r27) bl PagingFunc4 - beq- setup_0x1188 + beq setup_0x1188 li r30, 0x00 stw r30, -0x0004(r29) eieio @@ -1909,7 +1909,7 @@ setup_0x1188 setup_0x11a0 bl PagingFunc4 - beq- setup_0x11bc + beq setup_0x11bc li r30, 0x00 stw r30, -0x0004(r29) eieio @@ -1920,11 +1920,11 @@ setup_0x11bc bl PagingFunc1 cmplw r27, r19 addi r27, r27, -0x1000 - bgt+ setup_0x11a0 + bgt setup_0x11a0 lwz r27, 0x0630(r1) lwz r27, 0x00a4(r27) bl PagingFunc4 - beq- setup_0x11f0 + beq setup_0x11f0 li r30, 0x00 stw r30, -0x0004(r29) eieio diff --git a/NanoKernel/NKInterrupts.s b/NanoKernel/NKInterrupts.s index 103e3d7..93c6468 100644 --- a/NanoKernel/NKInterrupts.s +++ b/NanoKernel/NKInterrupts.s @@ -38,7 +38,7 @@ major_0x02980 ; OUTSIDE REFERER lwz r9, EWA.Enables(r1) rlwinm r23, r17, 31, 27, 31 rlwnm. r9, r9, r8, 0x00, 0x00 - bsol- cr3, major_0x02980_0x100 + bsol cr3, major_0x02980_0x100 lwz r6, -0x0014(r1) ori r7, r16, 0x10 neg r23, r23 @@ -70,10 +70,10 @@ major_0x02980 ; OUTSIDE REFERER lwz r8, 0x0034(r1) stw r8, 0x016c(r6) cmpwi cr1, r9, 0x14 - blt- cr4, major_0x04a20_0x18 - bne- cr2, TaskApproachTwo - blt- major_0x02980_0xa8 - bne- cr1, major_0x02980_0x178 + blt cr4, major_0x04a20_0x18 + bne cr2, TaskApproachTwo + blt major_0x02980_0xa8 + bne cr1, major_0x02980_0x178 b TaskApproachTwo major_0x02980_0xa8 @@ -91,13 +91,13 @@ major_0x02980_0xa8 lwz r1, -0x0004(r1) lwz r4, 0x0054(r6) lwz r3, 0x0654(r1) - blt- cr2, major_0x02980_0xec + blt cr2, major_0x02980_0xec lwz r3, 0x05b4(r1) _bclr r11, r11, 16 major_0x02980_0xec lwz r12, 0x0648(r1) - bsol- cr6, PreferRegistersFromEWASavingContextBlock + bsol cr6, PreferRegistersFromEWASavingContextBlock rlwinm r7, r7, 0, 29, 16 rlwimi r11, r7, 0, 20, 23 b IntReturn @@ -143,8 +143,8 @@ major_0x02980_0x134 ; OUTSIDE REFERER bc BO_IF, EWA.kFlag16, major_0x04a20_0x18 bc BO_IF_NOT, EWA.kFlagBlue, TaskApproachOne cmpwi cr1, r9, ecInstPageFault - blt+ major_0x02980_0xa8 ; when Enables[cause] is set! - beq- cr1, TaskApproachOne + blt major_0x02980_0xa8 ; when Enables[cause] is set! + beq cr1, TaskApproachOne major_0x02980_0x178 ; OUTSIDE REFERER lwz r1, EWA.PA_KDP(r1) @@ -209,7 +209,7 @@ major_0x02980_0x1e8 stw r29, 0x01ec(r6) stw r30, 0x01f4(r6) stw r31, 0x01fc(r6) - bnel- major_0x03e18_0xb4 + bnel major_0x03e18_0xb4 bc BO_IF_NOT, 12, major_0x02980_0x260 bl Save_v0_v31 @@ -232,7 +232,7 @@ major_0x02980_0x260 lwz r8, 0x00f4(r6) lwz r10, 0x00fc(r6) mtctr r8 - bnel- major_0x03e18_0x8 + bnel major_0x03e18_0x8 lwarx r8, 0, r1 sync stwcx. r8, 0, r1 @@ -241,7 +241,7 @@ major_0x02980_0x260 cmpwi r29, 0x00 stw r8, 0x0004(r1) lwz r28, 0x0210(r29) - beq- major_0x02980_0x2d0 + beq major_0x02980_0x2d0 mtspr vrsave, r28 major_0x02980_0x2d0 @@ -280,7 +280,7 @@ IntReturn ; OUTSIDE REFERER andi. r8, r7, (1 << (31 - 26)) | (1 << (31 - 27)) mfsprg r1, 0 - bnel- major_0x02ccc ; my counters say almost never called! + bnel major_0x02ccc ; my counters say almost never called! li r8, 0 stw r7, EWA.Flags(r1) stw r8, EWA.WeMightClear(r1) @@ -317,7 +317,7 @@ major_0x02ccc_0x30 ; according to my counter, this point is never reached rlwinm. r8, r7, 0, 8, 8 - beq- SuspendBlueTask + beq SuspendBlueTask stw r7, EWA.Flags(r1) lwz r8, 0x0104(r6) stw r8, 0x0000(r1) @@ -368,7 +368,7 @@ major_0x02ccc_0x30 mtmsr r15 isync rlwimi r25, r26, 2, 22, 29 ; apparently the lower byte of the entry is an FDP (code?) offset, /4! - bnelr- + bnelr b FDP_011c @@ -381,11 +381,11 @@ SuspendBlueTask bl LookupID cmpwi r9, Queue.kIDClass mr r30, r8 - bnel- @no_exception_handler + bnel @no_exception_handler lwz r28, Queue.ReservePtr(r30) cmpwi r28, 0 - beql- @no_memory_reserved_for_exception_messages + beql @no_memory_reserved_for_exception_messages ;notify exception handler _Lock PSA.SchLock, scratch1=r8, scratch2=r9 @@ -468,8 +468,8 @@ TaskApproachOne ; OUTSIDE REFERER srwi r8, r7, 24 rlwinm. r16, r16, 0, Task.kFlag9, Task.kFlag9 cmpwi cr1, r8, ecInstPageFault - bne- TaskNotSuitableForWhatWeWantToDo - bne- cr1, TaskNotSuitableForWhatWeWantToDo + bne TaskNotSuitableForWhatWeWantToDo + bne cr1, TaskNotSuitableForWhatWeWantToDo ; what is special about the upper 8 Flags? Are they Task-related? lwz r8, Task.Zero3(r31) @@ -510,8 +510,8 @@ TaskApproachTwo ; OUTSIDE REFERER srwi r8, r7, 24 rlwinm. r16, r16, 0, Task.kFlag9, Task.kFlag9 cmpwi cr1, r8, 0x14 - bne- TaskNotSuitableForWhatWeWantToDo - bne- cr1, TaskNotSuitableForWhatWeWantToDo + bne TaskNotSuitableForWhatWeWantToDo + bne cr1, TaskNotSuitableForWhatWeWantToDo lwz r8, Task.Zero4(r31) addi r8, r8, 1 @@ -531,7 +531,7 @@ CommonPathBetweenTaskIntFuncs lisori r17, Area.kSignature lwz r16, Area.Signature(r29) cmplw r16, r17 - bnel+ Local_Panic + bnel Local_Panic lwz r17, Area.Counter(r29) addi r17, r17, 1 @@ -544,9 +544,9 @@ CommonPathBetweenTaskIntFuncs cmpwi cr0, r9, ecInstPageFault cmpwi cr1, r16, 0 mr r26, r8 - bne- cr0, CanSendMessage - beq- cr1, CantSendMessage - beq- cr2, CanSendMessage + bne cr0, CanSendMessage + beq cr1, CantSendMessage + beq cr2, CanSendMessage CantSendMessage lwz r16, Task.Flags(r31) @@ -573,15 +573,15 @@ CantSendMessage bl CauseNotification cmpwi r8, 0 - beq+ IntLocalBlockMPCall ; jump if no error? + beq IntLocalBlockMPCall ; jump if no error? CanSendMessage mfcr r28 li r8, Message.Size - beq- cr2, major_0x02ccc_0x4a8 + beq cr2, major_0x02ccc_0x4a8 bl PoolAlloc mr. r26, r8 - beq- major_0x02ccc_PoolAllocFailed + beq major_0x02ccc_PoolAllocFailed addi r17, r31, Task.QueueMember addi r18, r31, Task.Semaphore @@ -612,7 +612,7 @@ major_0x02ccc_0x4a8 bl SchRdyTaskNow _AssertAndRelease PSA.SchLock, scratch=r31 mtcr r28 - bns- cr6, major_0x02ccc_0x504 + bns cr6, major_0x02ccc_0x504 lwz r8, 0x0064(r6) lwz r9, 0x0068(r6) stw r8, 0x0024(r6) @@ -663,8 +663,8 @@ IntDecrementer ; OUTSIDE REFERER lwz r8, KDP.OldKDP(r1) rlwinm. r9, r11, 0, 16, 16 cmpwi cr1, r8, 0x00 - beq- MaskedInterruptTaken - beq- cr1, IntDecrementer_0x54 + beq MaskedInterruptTaken + beq cr1, IntDecrementer_0x54 stw r16, ContextBlock.r16(r6) stw r17, ContextBlock.r17(r6) @@ -672,7 +672,7 @@ IntDecrementer ; OUTSIDE REFERER stw r25, ContextBlock.r25(r6) bl SchFiddlePriorityShifty - ble- IntDecrementer_0x48 + ble IntDecrementer_0x48 lwz r8, PSA.CriticalReadyQ + ReadyQueue.Timecake + 4(r1) mtspr dec, r8 @@ -727,7 +727,7 @@ IntDSI ; OUTSIDE REFERER andis. r28, r26, 0x400 mtsprg 3, r23 mfmsr r14 - bne- major_0x03324_0x9c + bne major_0x03324_0x9c ori r15, r14, 0x10 mtmsr r15 isync @@ -742,7 +742,7 @@ major_0x03324 ; OUTSIDE REFERER lwz r25, 0x0650(r1) li r21, 0x00 mfsprg r1, 0 - beq- major_0x03324_0x18 + beq major_0x03324_0x18 lwzx r18, r1, r18 major_0x03324_0x18 @@ -750,7 +750,7 @@ major_0x03324_0x18 lwz r16, EWA.Flags(r1) rlwinm r17, r27, 0, 6, 15 rlwimi r16, r16, 27, 26, 26 - bge- major_0x03324_0x58 + bge major_0x03324_0x58 rlwimi r25, r27, 7, 26, 29 rlwimi r25, r27, 12, 25, 25 lwz r26, 0x0b80(r25) @@ -777,7 +777,7 @@ major_0x03324_0x58 crclr cr5_so rlwimi r17, r26, 6, 26, 5 add r18, r18, r23 - blelr- cr3 + blelr cr3 neg r23, r23 add r18, r18, r23 blr @@ -801,12 +801,12 @@ major_0x03324_0x9c ; OUTSIDE REFERER mr r16, r28 crset cr3_so mfsprg r1, 0 - beq- major_0x03324_0x12c + beq major_0x03324_0x12c mr r18, r8 rlwinm r28, r27, 13, 25, 29 andis. r9, r31, 0x200 rlwimi r18, r17, 0, 0, 19 - beq- major_0x03324_0x118 + beq major_0x03324_0x118 lwzx r31, r1, r28 stwcx. r31, 0, r18 sync @@ -861,7 +861,7 @@ IntAlignment ; OUTSIDE REFERER addi r23, r1, KDP.RedVecBase - bne- major_0x03548_0x20 + bne major_0x03548_0x20 ; DSISR for misaligned X-form instruction: @@ -878,7 +878,7 @@ FDP_TableBase equ 0xa00 ; Get the FDP and F.O. if we were in MSR_LE mode lwz r25, KDP.PA_FDP(r1) - bne- major_0x03548_0x20 + bne major_0x03548_0x20 rlwinm. r21, r27, 17, 30, 31 ; evaluate hi two bits of XO (or 0 for d-form?) @@ -892,7 +892,7 @@ FDP_TableBase equ 0xa00 rlwimi r16, r16, 27, 26, 26 ; AllCpuFeatures: copy bit 21 to bit 26 - bne- @regidx + bne @regidx ; D-form (immediate-indexed) instruction lwz r26, FDP_TableBase + 4*(0x40 + 0x20)(r25) ; use upper quarter of table @@ -916,7 +916,7 @@ FDP_TableBase equ 0xa00 mtcr r26 rlwimi r17, r26, 6, 26, 5 crclr 23 ; unset bit 23 = cr5_so - bgelr- cr3 ; jump now if bit 12 is off + bgelr cr3 ; jump now if bit 12 is off ; if bit 12 was on, turn on paging and fetch the offending insn ; and also activate the Red vector table @@ -960,11 +960,11 @@ IntDSIOtherOther ; OUTSIDE REFERER mfspr r27, dar andis. r28, r31, 0xc030 lwz r1, -0x0004(r1) - bne- IntDSIOtherOther_0x1c8 + bne IntDSIOtherOther_0x1c8 mfspr r30, srr1 andi. r28, r30, 0x4000 mfsprg r30, 0 - beq- IntDSIOtherOther_0x100 + beq IntDSIOtherOther_0x100 stw r8, -0x00e0(r30) stw r9, -0x00dc(r30) mfcr r8 @@ -980,25 +980,25 @@ IntDSIOtherOther ; OUTSIDE REFERER lwz r17, 0x0028(r8) cmplw r27, r16 cmplw cr7, r27, r17 - blt- IntDSIOtherOther_0xe0 - bgt- cr7, IntDSIOtherOther_0xe0 + blt IntDSIOtherOther_0xe0 + bgt cr7, IntDSIOtherOther_0xe0 mr r31, r8 mr r8, r27 bl MPCall_95_0x1e4 - beq- IntDSIOtherOther_0xe0 + beq IntDSIOtherOther_0xe0 lwz r8, 0x0000(r30) lwz r16, 0x0098(r31) rlwinm r28, r8, 0, 29, 30 cmpwi cr7, r28, 0x04 cmpwi r28, 0x02 - beq- cr7, IntDSIOtherOther_0xe0 - beq- IntDSIOtherOther_0xe0 + beq cr7, IntDSIOtherOther_0xe0 + beq IntDSIOtherOther_0xe0 IntDSIOtherOther_0x98 addi r17, r31, 0x90 cmpw r16, r17 addi r17, r16, 0x14 - beq- IntDSIOtherOther_0x158 + beq IntDSIOtherOther_0x158 lwz r9, 0x0010(r16) add r9, r9, r17 @@ -1006,11 +1006,11 @@ IntDSIOtherOther_0xb0 lwz r18, 0x0000(r17) cmplw cr7, r17, r9 lwz r19, 0x0004(r17) - bgt- cr7, IntDSIOtherOther_0xd8 + bgt cr7, IntDSIOtherOther_0xd8 cmplw r27, r18 cmplw cr7, r27, r19 - blt- IntDSIOtherOther_0xd0 - ble- cr7, IntDSIOtherOther_0xe0 + blt IntDSIOtherOther_0xd0 + ble cr7, IntDSIOtherOther_0xe0 IntDSIOtherOther_0xd0 addi r17, r17, 0x08 @@ -1033,14 +1033,14 @@ IntDSIOtherOther_0xe0 IntDSIOtherOther_0x100 andis. r28, r31, 0x800 addi r29, r1, 800 - bnel- PagingFunc3 + bnel PagingFunc3 li r28, 0x43 and r28, r31, r28 cmpwi cr7, r28, 0x43 - beql+ Local_Panic + beql Local_Panic mfsprg r28, 2 mtlr r28 - bne- cr7, IntDSIOtherOther_0x144 + bne cr7, IntDSIOtherOther_0x144 mfspr r28, srr0 addi r28, r28, 0x04 lwz r26, 0x0e90(r1) @@ -1052,7 +1052,7 @@ IntDSIOtherOther_0x100 IntDSIOtherOther_0x144 andi. r28, r31, 0x03 li r8, ecDataSupAccessViolation - beq+ major_0x02980 + beq major_0x02980 li r8, ecDataWriteViolation b major_0x02980 @@ -1084,7 +1084,7 @@ IntDSIOtherOther_0x19c IntDSIOtherOther_0x1c8 andis. r28, r31, 0x8010 - bne- IntMachineCheckMemRetry_0x14c + bne IntMachineCheckMemRetry_0x14c _Lock PSA.HTABLock, scratch1=r28, scratch2=r31 @@ -1092,9 +1092,9 @@ IntDSIOtherOther_0x1c8 _AssertAndRelease PSA.HTABLock, scratch=r28 mfsprg r28, 2 mtlr r28 - beq+ IntDSIOtherOther_0x19c + beq IntDSIOtherOther_0x19c li r8, ecDataInvalidAccess - bge+ major_0x02980 + bge major_0x02980 li r8, ecDataPageFault b major_0x02980 @@ -1131,9 +1131,9 @@ IntMachineCheckMemRetry ; OUTSIDE REFERER lwz r27, 0x0694(r1) subf r28, r19, r27 cmpwi r28, -0x10 - blt- IntMachineCheckMemRetry_0x14c + blt IntMachineCheckMemRetry_0x14c cmpwi r28, 0x10 - bgt- IntMachineCheckMemRetry_0x14c + bgt IntMachineCheckMemRetry_0x14c _Lock PSA.HTABLock, scratch1=r28, scratch2=r29 @@ -1147,7 +1147,7 @@ IntMachineCheckMemRetry ; OUTSIDE REFERER rlwinm. r28, r28, 0, 0, 14 sync tlbie r27 - beq- IntMachineCheckMemRetry_0x124 + beq IntMachineCheckMemRetry_0x124 sync tlbsync @@ -1159,7 +1159,7 @@ IntMachineCheckMemRetry_0x124 IntMachineCheckMemRetry_0x14c ; OUTSIDE REFERER cmplw r10, r19 li r8, ecDataHardwareFault - bne+ major_0x02980 + bne major_0x02980 mfsprg r1, 0 mtsprg 3, r24 lmw r14, 0x0038(r1) @@ -1186,7 +1186,7 @@ IntISI ; OUTSIDE REFERER ; r13 = cr andis. r8, r11, 0x4020 - beq- major_0x039dc_0x14 + beq major_0x039dc_0x14 mfsprg r8, 0 stmw r14, 0x0038(r8) @@ -1196,7 +1196,7 @@ IntISI ; OUTSIDE REFERER bl PagingFunc1 _AssertAndRelease PSA.HTABLock, scratch=r28 mfsprg r8, 0 - bne- major_0x039dc + bne major_0x039dc mfsprg r24, 3 mfmsr r14 ori r15, r14, 0x10 @@ -1219,14 +1219,14 @@ IntISI ; OUTSIDE REFERER major_0x039dc ; OUTSIDE REFERER lmw r14, 0x0038(r8) li r8, ecInstPageFault - blt+ major_0x02980_0x134 + blt major_0x02980_0x134 li r8, ecInstInvalidAddress b major_0x02980_0x134 major_0x039dc_0x14 ; OUTSIDE REFERER andis. r8, r11, 0x800 li r8, ecInstSupAccessViolation - bne+ major_0x02980_0x134 + bne major_0x02980_0x134 li r8, ecInstHardwareFault b major_0x02980_0x134 @@ -1265,7 +1265,7 @@ IntMachineCheck ; OUTSIDE REFERER _log '^n' rlwinm. r8, r11, 0, 2, 2 - beq- @not_L1_data_cache_error + beq @not_L1_data_cache_error ;L1 data cache error bl FlushL1CacheUsingMSSCR0 @@ -1297,7 +1297,7 @@ IntDSIOther ; OUTSIDE REFERER mfspr r8, dsisr rlwimi r11, r8, 0, 0, 9 andis. r8, r11, 0x4020 - beq+ major_0x039dc_0x14 + beq major_0x039dc_0x14 mfsprg r8, 0 stmw r14, 0x0038(r8) lwz r1, -0x0004(r8) @@ -1308,7 +1308,7 @@ IntDSIOther ; OUTSIDE REFERER bl PagingFunc1 _AssertAndRelease PSA.HTABLock, scratch=r28 mfsprg r8, 0 - bne+ major_0x039dc + bne major_0x039dc lmw r14, 0x0038(r8) mfsprg r1, 2 mtlr r1 @@ -1334,9 +1334,9 @@ kcReturnFromException ; OUTSIDE REFERER ori r11, r11, 0x8000 mtcrf 0x3f, r7 cmplwi cr1, r3, 0x01 - blt- cr4, major_0x04a20_0x18 - blt- cr1, major_0x03be0_0x58 - beq- cr1, major_0x03be0_0x90 + blt cr4, major_0x04a20_0x18 + blt cr1, major_0x03be0_0x58 + beq cr1, major_0x03be0_0x90 addi r8, r3, -0x20 lwz r9, 0x0eac(r1) cmplwi r8, 0xe0 @@ -1344,7 +1344,7 @@ kcReturnFromException ; OUTSIDE REFERER stw r9, 0x0eac(r1) mfsprg r1, 0 rlwimi r7, r3, 24, 0, 7 - blt- major_0x03be0_0xe8 + blt major_0x03be0_0xe8 li r8, ecTrapInstr b major_0x02980_0x134 @@ -1360,7 +1360,7 @@ major_0x03be0_0x58 lwz r12, 0x008c(r6) lwz r3, 0x0094(r6) lwz r4, 0x009c(r6) - bnel- major_0x03e18 + bnel major_0x03e18 addi r9, r6, 0x40 b IntReturn @@ -1379,8 +1379,8 @@ major_0x03be0_0x90 lwz r12, 0x008c(r6) lwz r3, 0x0094(r6) lwz r4, 0x009c(r6) - bne- cr2, major_0x03be0_0xe8 - bns- cr6, major_0x03be0_0xe8 + bne cr2, major_0x03be0_0xe8 + bns cr6, major_0x03be0_0xe8 stmw r14, 0x0038(r1) lwz r17, 0x0064(r6) lwz r20, 0x0068(r6) @@ -1389,7 +1389,7 @@ major_0x03be0_0x90 lwz r18, 0x007c(r6) major_0x03be0_0xe8 - beq+ cr2, major_0x02980_0x178 + beq cr2, major_0x02980_0x178 crclr cr6_so mfspr r10, srr0 li r8, ecTrapInstr @@ -1542,14 +1542,14 @@ IntFPUnavail ; OUTSIDE REFERER major_0x03e18 ; OUTSIDE REFERER rlwinm. r8, r11, 0, 18, 18 - bnelr- + bnelr major_0x03e18_0x8 ; OUTSIDE REFERER lwz r8, 0x00e4(r6) rlwinm. r8, r8, 1, 0, 0 mfmsr r8 ori r8, r8, 0x2000 - beqlr- + beqlr mtmsr r8 isync ori r11, r11, 0x2000 @@ -1677,7 +1677,7 @@ major_0x04180 ; OUTSIDE REFERER lwz r10, 0x00d8(r6) mfspr r11, srr1 cmpwi r10, 0x00 - beql- major_0x04180_0x9c + beql major_0x04180_0x9c oris r11, r11, 0x200 stw r9, -0x027c(r1) mtspr srr1, r11 @@ -1740,14 +1740,14 @@ IntPerfMonitor ; OUTSIDE REFERER mflr r8 mfcr r13 cmpwi r8, 0xf20 - beq+ major_0x04180 + beq major_0x04180 mtcr r13 lwz r13, -0x0284(r1) lwz r8, -0x0280(r1) bl save_all_registers mr r28, r8 rlwinm. r9, r11, 0, 16, 16 - beq+ MaskedInterruptTaken + beq MaskedInterruptTaken _Lock PSA.SchLock, scratch1=r8, scratch2=r9 @@ -1758,7 +1758,7 @@ IntPerfMonitor ; OUTSIDE REFERER cmpwi r9, Notification.kIDClass mr r30, r8 - bne- IntPerfMonitor_0x88 + bne IntPerfMonitor_0x88 lwz r16, -0x0340(r28) lwz r17, -0x0008(r28) stw r16, 0x0010(r30) @@ -1785,7 +1785,7 @@ IntThermalEvent ; OUTSIDE REFERER bl save_all_registers mr r28, r8 rlwinm. r9, r11, 0, 16, 16 - beq+ MaskedInterruptTaken + beq MaskedInterruptTaken _log 'Thermal event^n' _Lock PSA.SchLock, scratch1=r8, scratch2=r9 @@ -1794,7 +1794,7 @@ IntThermalEvent ; OUTSIDE REFERER bl LookupID cmpwi r9, Notification.kIDClass mr r30, r8 - bne- @no_thermal_handler + bne @no_thermal_handler lwz r16, EWA.CPUBase + CPU.ID(r28) stw r16, Notification.MsgWord1(r30) @@ -1819,9 +1819,9 @@ kcRunAlternateContext ; OUTSIDE REFERER lwz r9, KDP.MinusOne1(r1) rlwinm r8, r3, 0, 0, 25 cmpw cr1, r8, r9 - bne+ IntReturn + bne IntReturn lwz r9, 0x0344(r1) - bne- cr1, major_0x043a0_0x48 + bne cr1, major_0x043a0_0x48 major_0x043a0_0x24 addi r8, r1, 0x420 @@ -1837,41 +1837,41 @@ major_0x043a0_0x24 major_0x043a0_0x48 lwz r9, 0x0348(r1) cmpw cr1, r8, r9 - beq- cr1, major_0x043a0_0x130 + beq cr1, major_0x043a0_0x130 lwz r9, 0x0350(r1) cmpw cr1, r8, r9 - beq- cr1, major_0x043a0_0x110 + beq cr1, major_0x043a0_0x110 lwz r9, 0x0358(r1) cmpw cr1, r8, r9 - beq- cr1, major_0x043a0_0xf0 + beq cr1, major_0x043a0_0xf0 mfsprg r1, 0 stmw r14, 0x0038(r1) lwz r1, -0x0004(r1) cmpw cr1, r8, r6 - beq- cr1, major_0x043a0_0x154 + beq cr1, major_0x043a0_0x154 mr r27, r8 addi r29, r1, 800 bl PagingFunc3 clrlwi r23, r8, 0x14 - beq- major_0x043a0_0x154 + beq major_0x043a0_0x154 cmplwi r23, 0xd00 mr r9, r8 mr r8, r31 - ble- major_0x043a0_0xc4 + ble major_0x043a0_0xc4 addi r27, r27, 0x1000 addi r29, r1, 800 bl PagingFunc3 - beq- major_0x043a0_0x154 + beq major_0x043a0_0x154 addi r31, r31, -0x1000 xor r23, r8, r31 rlwinm. r23, r23, 0, 25, 22 - bne- major_0x043a0_0x154 + bne major_0x043a0_0x154 major_0x043a0_0xc4 clrlwi r23, r31, 0x1e cmpwi r23, 0x03 rlwimi r8, r9, 0, 20, 31 - beq- major_0x043a0_0x154 + beq major_0x043a0_0x154 lwz r23, 0x0ea4(r1) addi r23, r23, 0x01 stw r23, 0x0ea4(r1) @@ -1927,7 +1927,7 @@ major_0x043a0_0x154 wordfill ; OUTSIDE REFERER subic. r22, r22, 4 stwx r23, r8, r22 - bne+ wordfill + bne wordfill blr @@ -1952,7 +1952,7 @@ kcResetSystem ; OUTSIDE REFERER ; This xoris/cmplwi technique is very cool xoris r8, r3, 'Ga' - beq- @is_601 + beq @is_601 mftb r9 b @endif_601 @is_601 @@ -1965,12 +1965,12 @@ kcResetSystem ; OUTSIDE REFERER andis. r9, r9, 0xffff cmplwi r8, 'ry' - bne- NonGaryReset + bne NonGaryReset ; r4 (i.e. A1) == 5 May 1956? xoris r8, r4, 0x0505 cmplwi r8, 0x1956 - bne- NonGaryReset + bne NonGaryReset andc r11, r11, r5 lwz r8, ContextBlock.r7(r6) @@ -2001,7 +2001,7 @@ NonGaryReset lwz r8, KDP.OldKDP(r1) cmpwi r8, 0 - beq+ ResetBuiltinKernel + beq ResetBuiltinKernel _log 'Unplugging the replacement nanokernel^n' @@ -2122,7 +2122,7 @@ IntExternalOrange ; OUTSIDE REFERER ; r13 = cr mtcrf 0x3f, r7 - bnel+ cr2, Local_Panic + bnel cr2, Local_Panic li r8, ecNoException b major_0x02980_0x134 @@ -2147,12 +2147,12 @@ IntProgram cmplwi cr0, r8, NanoKernelCallTable.ReturnFromException cmplwi cr1, r8, NanoKernelCallTable.MPDispatch - beq- cr0, @emutrap_0_return_from_exception - beq- cr1, @emutrap_8_mpdispatch + beq cr0, @emutrap_0_return_from_exception + beq cr1, @emutrap_8_mpdispatch cmplwi cr0, r8, NanoKernelCallTable.VMDispatch cmplwi cr1, r8, NanoKernelCallTable.Size - beq- cr0, @emutrap_3_vmdispatch - blt- cr1, @emutrap_other + beq cr0, @emutrap_3_vmdispatch + blt cr1, @emutrap_other ; Not from the emulator image? Return will be to next instruction, @@ -2192,13 +2192,13 @@ IntProgram xoris r8, r8, 0xfff cmplwi cr0, r8, NanoKernelCallTable.Size / 4 cmplwi cr1, r8, NanoKernelCallTable.ReturnFromException / 4 - bge- cr0, @trap_too_high + bge cr0, @trap_too_high cmplwi cr7, r8, NanoKernelCallTable.MPDispatch / 4 cmplwi cr0, r8, NanoKernelCallTable.VMDispatch / 4 slwi r8, r8, 2 - beq- cr1, @nonemu_return_from_exception - beq- cr7, @nonemu_mpdispatch - beq- cr0, @nonemu_vmdispatch + beq cr1, @nonemu_return_from_exception + beq cr7, @nonemu_mpdispatch + beq cr0, @nonemu_vmdispatch ; Fall through to some hard truths bc BO_IF, 16, @_IntProgram_0x150 @@ -2227,7 +2227,7 @@ IntProgram lwz r9, KDP.NanoKernelInfo + NKNanoKernelInfo.NanoKernelCallCounts(r8) addi r9, r9, 1 stw r9, KDP.NanoKernelInfo + NKNanoKernelInfo.NanoKernelCallCounts(r8) - bne+ @nonemu_go + bne @nonemu_go ; Non-emu MPDispatch trap with r0 == -1: muck around a bit? addi r10, r10, 4 @@ -2307,7 +2307,7 @@ IntExternalYellow ; OUTSIDE REFERER ; Sanity check rlwinm. r9, r11, 0, MSR_EEbit, MSR_EEbit - beq+ MaskedInterruptTaken + beq MaskedInterruptTaken ; How many CPUs? @@ -2319,7 +2319,7 @@ IntExternalYellow ; OUTSIDE REFERER ; Uniprocessor machine: go straight to PIH - blt+ kcPrioritizeInterrupts + blt kcPrioritizeInterrupts ; Check with the CPU plugin whether this is an interprocessor interrupt @@ -2338,9 +2338,9 @@ IntExternalYellow ; OUTSIDE REFERER cmpwi cr2, r8, -29279 ; interprocessor interrupt! ; else: real external interrupt - beq+ cr0, kcPrioritizeInterrupts - beq+ cr1, IntReturn - bne+ cr2, kcPrioritizeInterrupts + beq cr0, kcPrioritizeInterrupts + beq cr1, IntReturn + bne cr2, kcPrioritizeInterrupts mfsprg r9, 0 ; "alert" => run scheduler evaluation li r8, 1 @@ -2381,7 +2381,7 @@ SIGP bc BO_IF, 16, major_0x04a20_0x18 ; not sure about this cmpwi cr2, r8, 0 lwz r18, EWA.SIGPSelector(r23) - beq- cr2, @args_in_registers + beq cr2, @args_in_registers slwi r20, r18, 2 @args_in_registers @@ -2392,11 +2392,11 @@ SIGP lwz r17, CoherenceGroup.PA_CpuPluginDesc(r22) lwz r16, CoherenceGroup.CpuPluginSelectorCount(r22) mr. r17, r17 - beqlr- + beqlr slwi r16, r16, 2 li r8, -0x7267 cmplw r20, r16 - bgelr- + bgelr ; Save some registers in advance of this unusual "upcall". stw r10, EWA.SIGPSavedR10(r23) @@ -2416,7 +2416,7 @@ SIGP lwz r9, EWA.PA_CurAddressSpace(r23) lwz r8, CoherenceGroup.CpuPluginSpacePtr(r22) cmpw r9, r8 - beq- @noNeedToSwitchSpace + beq @noNeedToSwitchSpace bl SchSwitchSpace @noNeedToSwitchSpace @@ -2466,7 +2466,7 @@ SIGP addi r6, r23, -0x318 stw r6, EWA.PA_ContextBlock(r23) - beq- cr2, @args_in_registers_2 + beq cr2, @args_in_registers_2 ;args not in registers lwz r4, EWA.SIGPCallR4(r23) @@ -2505,14 +2505,14 @@ major_0x04a20_0x18 ; OUTSIDE REFERER lwz r7, -0x02b0(r23) andis. r8, r11, 0x02 stw r7, -0x0010(r23) - bne- major_0x04a20_0x30 + bne major_0x04a20_0x30 li r3, -0x7265 major_0x04a20_0x30 lwz r8, EWA.SIGPSpacOnResume(r23) lwz r9, -0x001c(r23) cmpw r9, r8 - beq- major_0x04a20_0x44 + beq major_0x04a20_0x44 bl SchSwitchSpace major_0x04a20_0x44 @@ -2551,7 +2551,7 @@ IntSyscall ; OUTSIDE REFERER ; Only r1 and LR have been saved, so these compares clobber cr0 cmpwi r0, -3 - bne- @not_minus_3 + bne @not_minus_3 ; sc -3: @@ -2559,7 +2559,7 @@ IntSyscall ; OUTSIDE REFERER mfspr r1, srr1 rlwinm. r0, r1, 26, 26, 27 ; nonsense code? _bclr r1, r1, 17 - blt- @dont_unset_pr ; r0 should never have bit 0 set + blt @dont_unset_pr ; r0 should never have bit 0 set mtspr srr1, r1 @dont_unset_pr @@ -2573,7 +2573,7 @@ IntSyscall ; OUTSIDE REFERER @not_minus_3 cmpwi r0, -1 mfsprg r1, 0 - bne- @not_minus_1 + bne @not_minus_1 ; sc -1: mess around with flags @@ -2586,7 +2586,7 @@ IntSyscall ; OUTSIDE REFERER @not_minus_1 cmpwi r0, -2 - bne- @not_any_special + bne @not_any_special ; sc -2: more flag nonsense? diff --git a/NanoKernel/NKMPCalls.s b/NanoKernel/NKMPCalls.s index 3e14119..611afd1 100644 --- a/NanoKernel/NKMPCalls.s +++ b/NanoKernel/NKMPCalls.s @@ -103,7 +103,7 @@ MPCallTableEnd lwz r16, KDP.NanoKernelInfo + NKNanoKernelInfo.MPDispatchCountTblPtr(r1) rlwinm r17, r15, 2, 20, 29 cmplwi r16, 0 - beq- @no_count + beq @no_count lwzx r18, r16, r17 addi r18, r18, 1 stwx r18, r16, r17 @@ -115,7 +115,7 @@ MPCallTableEnd lwzx r15, r16, r14 add r15, r15, r14 mtlr r15 - bltlr- + bltlr @@ -158,7 +158,7 @@ ScrambleMPCall ; OUTSIDE REFERER mfspr r16, pvr rlwinm. r16, r16, 0, 0, 14 - beq- @is_601 + beq @is_601 mftb r4 b @not_601 @is_601 @@ -295,24 +295,24 @@ MPCall_0 ; OUTSIDE REFERER andi. r16, r3, 0xfff mr r30, r7 mr r29, r6 - bne+ ReturnMPCallOOM + bne ReturnMPCallOOM ; Fail if this page is outside of the PAR rlwinm. r4, r3, 20, 12, 31 lwz r9, KDP.PrimaryAddrRangePages(r1) - beq+ ReturnMPCallOOM + beq ReturnMPCallOOM cmplw r4, r9 - bge+ ReturnMPCallOOM + bge ReturnMPCallOOM _Lock PSA.HTABLock, scratch1=r17, scratch2=r18 bl GetPARPageInfo - bge- cr4, MPCall_0_0xd8 - bgt- cr5, MPCall_0_0xd8 - bns- cr7, MPCall_0_0xd8 - bgt- cr7, MPCall_0_0xd8 - bltl+ cr5, RemovePageFromTLB - bgel+ cr5, VMSecondLastExportedFunc + bge cr4, MPCall_0_0xd8 + bgt cr5, MPCall_0_0xd8 + bns cr7, MPCall_0_0xd8 + bgt cr7, MPCall_0_0xd8 + bltl cr5, RemovePageFromTLB + bgel cr5, VMSecondLastExportedFunc ori r16, r16, 0x404 li r31, 0x03 rlwimi r9, r31, 0, 30, 31 @@ -376,17 +376,17 @@ MPRegisterCpuPlugin ; Check that address of CPU plugin is page-aligned, ; and that CPU plugin size if page-aligned and nonzero. andi. r8, r4, 0xfff - bne+ ReturnMPCallOOM + bne ReturnMPCallOOM andi. r8, r5, 0xfff cmpwi cr1, r5, 0 - bne+ ReturnMPCallOOM - beq+ cr1, ReturnMPCallOOM + bne ReturnMPCallOOM + beq cr1, ReturnMPCallOOM _Lock PSA.SchLock, scratch1=r18, scratch2=r19 ; r14 = coherence group ptr (motherpboard CGRP if not specified in first argument) mr. r8, r3 - bne- @use_specified_cgrp + bne @use_specified_cgrp mfsprg r15, 0 lwz r14, EWA.CPUBase + CPU.LLL + LLL.Freeform(r15) b @cgrp_done @@ -394,12 +394,12 @@ MPRegisterCpuPlugin bl LookupID cmpwi r9, CoherenceGroup.kIDClass mr r14, r8 - bne+ ReturnMPCallInvalidIDErr + bne ReturnMPCallInvalidIDErr @cgrp_done ; Fail if no CPU plugin descriptor is passed in fourth argument cmpwi r16, 0 - bne- @no_table_ptr + bne @no_table_ptr stw r16, CoherenceGroup.PA_CpuPluginDesc(r14) stw r16, CoherenceGroup.LA_CpuPluginDesc(r14) b ReleaseAndReturnMPCallInvalidIDErr @@ -409,19 +409,19 @@ MPRegisterCpuPlugin add r17, r4, r5 cmplw r16, r4 cmplw cr1, r16, r17 - blt+ ReleaseAndReturnMPCallOOM - bge+ cr1, ReleaseAndReturnMPCallOOM + blt ReleaseAndReturnMPCallOOM + bge cr1, ReleaseAndReturnMPCallOOM ; What the hell? Wouldn't this always fail? lwz r19, CoherenceGroup.PA_CpuPluginDesc(r14) mr. r19, r19 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr ; r18 = physical address of plugin (assumes page-aligned) mr r27, r4 addi r29, r1, KDP.BATs + 0xa0 bl PagingFunc3 - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM rlwinm r18, r31, 0, 0, 19 ; r18 = physical address of descriptor (does not assume page-aligned) @@ -429,7 +429,7 @@ MPRegisterCpuPlugin mr r19, r16 addi r29, r1, KDP.BATs + 0xa0 bl PagingFunc3 - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM rlwimi r19, r31, 0, 0, 19 ; Populate the coherence group structure. @@ -449,7 +449,7 @@ MPRegisterCpuPlugin lwz r27, 0(r19) addi r29, r1, KDP.BATs + 0xa0 bl PagingFunc3 - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM rlwimi r27, r31, 0, 0, 19 stw r27, CoherenceGroup.PA_CpuPluginStackPtrs(r14) @@ -468,19 +468,19 @@ MPRegisterCpuPlugin lwz r17, 0x1c(r19) cmplwi r17, 64 stw r17, CoherenceGroup.CpuPluginSelectorCount(r14) - bgt+ ReleaseAndReturnMPCallOOM + bgt ReleaseAndReturnMPCallOOM ; Convert those entries to physical addresses @table_convert_loop lwzu r27, 4(r16) addi r29, r1, KDP.BATs + 0xa0 bl PagingFunc3 - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM subi r17, r17, 1 rlwimi r27, r31, 0, 0, 19 cmpwi r17, 0 stw r27, 0(r16) - bgt+ @table_convert_loop + bgt @table_convert_loop @@ -505,7 +505,7 @@ MPProcessors mr. r8, r3 lwz r3, CoherenceGroup.CpuCount(r14) - beq+ CommonMPCallReturnPath + beq CommonMPCallReturnPath lwz r3, CoherenceGroup.ScheduledCpuCount(r14) b CommonMPCallReturnPath @@ -522,7 +522,7 @@ MPCreateProcess _Lock PSA.SchLock, scratch1=r16, scratch2=r17 mr. r8, r3 - bne- @spac_id_supplied + bne @spac_id_supplied lwz r3, PSA.SystemAddressSpaceID(r1) mr r8, r3 @spac_id_supplied @@ -533,19 +533,19 @@ MPCreateProcess cmpwi r9, AddressSpace.kIDClass mr r30, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr li r8, 0x20 ;Process.Size bl PoolAllocClear mr. r31, r8 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall li r9, Process.kIDClass bl MakeID cmpwi r8, 0x00 - bne- @did_not_fail + bne @did_not_fail mr r8, r31 bl PoolFree b ReleaseAndScrambleMPCall @@ -582,11 +582,11 @@ MPTerminateProcess bl LookupID cmpwi r9, Process.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, 0x0008(r31) rlwinm. r17, r16, 0, 30, 30 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM ori r16, r16, 0x02 stw r16, 0x0008(r31) mr r8, r3 @@ -608,15 +608,15 @@ MPDeleteProcess mr r8, r3 bl LookupID cmpwi r9, Process.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Process.Flags(r31) lwz r17, Process.TaskCount(r31) rlwinm. r8, r16, 0, Process.kFlag30, Process.kFlag30 cmpwi cr1, r17, 0 - beq+ ReleaseAndReturnMPCallOOM - bne+ cr1, ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM + bne cr1, ReleaseAndReturnMPCallOOM mr r8, r3 bl DeleteID @@ -639,7 +639,7 @@ MPCall_6_0x78 ; OUTSIDE REFERER lwz r17, KDP.PA_ECB(r1) lwz r31, EWA.PA_CurTask(r16) - beq- MPCall_6_0xb4 + beq MPCall_6_0xb4 lwz r8, ContextBlock.PriorityShifty(r17) rlwinm r8, r8, 0, 24, 21 oris r8, r8, 0x8000 @@ -679,19 +679,19 @@ MPYieldWithHint rlwinm. r8, r7, 0, 10, 10 lwz r17, KDP.PA_ECB(r1) lwz r31, EWA.PA_CurTask(r16) - beq- @i_am_important ; not 68k mode? + beq @i_am_important ; not 68k mode? clrlwi. r8, r3, 31 lwz r8, ContextBlock.PriorityShifty(r17) rlwinm r8, r8, 0, 24, 21 oris r8, r8, 0x8000 stw r8, ContextBlock.PriorityShifty(r17) - beq- @i_am_important ; MPYield call + beq @i_am_important ; MPYield call ; If this task is lbz r16, Task.Priority(r31) cmpwi r16, Task.kNominalPriority - bge- @return + bge @return mr r8, r31 bl SchTaskUnrdy li r16, Task.kNominalPriority @@ -722,7 +722,7 @@ MPYieldWithHint MPDelayUntil rlwinm. r8, r7, 0, EWA.kFlagBlue, EWA.kFlagBlue - bne+ ReturnMPCallBlueBlocking + bne ReturnMPCallBlueBlocking _Lock PSA.SchLock, scratch1=r16, scratch2=r17 b _MPDelayUntilCommon @@ -740,14 +740,14 @@ MPDelayUntilSys rlwinm. r8, r7, 0, EWA.kFlagBlue, EWA.kFlagBlue lwz r16, KDP.NanoKernelInfo + NKNanoKernelInfo.ExternalIntCount(r1) - beq- _MPDelayUntilCommon + beq _MPDelayUntilCommon ; Why the hell are we counting interrupts? lwz r17, PSA.OtherSystemContextPtr(r1) lwz r18, KDP.PA_ECB(r1) cmpw r16, r17 stw r16, PSA.OtherSystemContextPtr(r1) - bne+ ReturnZeroFromMPCall + bne ReturnZeroFromMPCall lwz r8, ContextBlock.PriorityShifty(r18) rlwinm r8, r8, 0, 24, 21 @@ -759,7 +759,7 @@ MPDelayUntilSys lwz r16, PSA.BlueSpinningOn(r1) cmpwi r16, -1 li r16, 0 - bne- _MPDelayUntilCommon + bne _MPDelayUntilCommon stw r16, PSA.BlueSpinningOn(r1) b ReleaseAndReturnZeroFromMPCall @@ -809,7 +809,7 @@ MPCall_34 ; OUTSIDE REFERER ; r9 = kind bl MakeID cmpwi r8, 0x00 - beq+ ScrambleMPCall + beq ScrambleMPCall mr r5, r8 b ReturnZeroFromMPCall @@ -821,7 +821,7 @@ MPCall_35 ; OUTSIDE REFERER mr r8, r3 bl DeleteID cmpwi r8, 0x01 - beq+ ReturnZeroFromMPCall + beq ReturnZeroFromMPCall b ReturnMPCallInvalidIDErr @@ -837,7 +837,7 @@ MPCall_36 ; OUTSIDE REFERER mr r4, r9 mr r5, r8 - bne+ ReturnZeroFromMPCall + bne ReturnZeroFromMPCall b ReturnMPCallInvalidIDErr @@ -868,7 +868,7 @@ KCGetNextID ; OUTSIDE REFERER bl GetNextIDOfClass cmpwi r8, 0x00 mr r4, r8 - bne+ ReturnZeroFromMPCall + bne ReturnZeroFromMPCall b ReturnMPCallInvalidIDErr @@ -895,7 +895,7 @@ KCGetNextIDOwnedByProcess ; OUTSIDE REFERER mr r8, r3 bl LookupID cmpwi r9, Process.kIDClass - bne+ ReturnMPCallInvalidIDErr + bne ReturnMPCallInvalidIDErr ; Loop over IDs (and resolve them) until one is owned by the Process @@ -909,7 +909,7 @@ KCGetNextIDOwnedByProcess ; OUTSIDE REFERER ; RET ID r8 mr. r5, r8 - beq+ ReturnMPCallInvalidIDErr + beq ReturnMPCallInvalidIDErr ; ARG ID r8 bl LookupID @@ -917,28 +917,28 @@ KCGetNextIDOwnedByProcess ; OUTSIDE REFERER cmpwi r4, Task.kIDClass cmpwi cr1, r4, Timer.kIDClass - beq- @task - beq- cr1, @timer + beq @task + beq cr1, @timer cmpwi r4, Queue.kIDClass cmpwi cr1, r4, Semaphore.kIDClass - beq- @queue - beq- cr1, @semaphore + beq @queue + beq cr1, @semaphore cmpwi r4, CriticalRegion.kIDClass cmpwi cr1, r4, AddressSpace.kIDClass - beq- @critical_region - beq- cr1, @address_space + beq @critical_region + beq cr1, @address_space cmpwi r4, EventGroup.kIDClass cmpwi cr1, r4, Area.kIDClass - beq- @event_group - beq- cr1, @area + beq @event_group + beq cr1, @area cmpwi r4, Notification.kIDClass cmpwi cr1, r4, ConsoleLog.kIDClass - beq- @notification - beq- cr1, @console_log + beq @notification + beq cr1, @console_log b ReturnParamErrFromMPCall @@ -947,67 +947,67 @@ KCGetNextIDOwnedByProcess ; OUTSIDE REFERER lwz r9, Task.ProcessID(r8) rlwinm. r17, r17, 0, 15, 15 - beq- @not_owned_by_blue_process + beq @not_owned_by_blue_process lwz r9, PSA.blueProcessPtr(r1) lwz r9, Task.ID(r9) @not_owned_by_blue_process cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @timer lwz r9, Timer.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @queue lwz r9, Queue.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @semaphore lwz r9, Semaphore.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @critical_region lwz r9, CriticalRegion.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @address_space lwz r9, AddressSpace.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @event_group lwz r9, EventGroup.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @area lwz r9, Area.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @notification lwz r9, Notification.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @console_log lwz r9, ConsoleLog.ProcessID(r8) cmpw r9, r3 - bne+ @try_another_id + bne @try_another_id b ReturnZeroFromMPCall @@ -1021,7 +1021,7 @@ MPCall_38 ; OUTSIDE REFERER bl LookupID cmpwi r9, Process.kIDClass - bne+ ReturnMPCallInvalidIDErr + bne ReturnMPCallInvalidIDErr mr r31, r8 MPCall_38_0x14 @@ -1029,7 +1029,7 @@ MPCall_38_0x14 li r9, 0x02 bl GetNextIDOfClass cmpwi r8, 0x00 - beq+ ReturnMPCallInvalidIDErr + beq ReturnMPCallInvalidIDErr mr r4, r8 ; r8 = id @@ -1040,13 +1040,13 @@ MPCall_38_0x14 lwz r17, 0x0064(r8) lwz r16, 0x0060(r8) rlwinm. r17, r17, 0, 15, 15 - beq- MPCall_38_0x48 + beq MPCall_38_0x48 lwz r16, -0x041c(r1) lwz r16, 0x0000(r16) MPCall_38_0x48 cmpw r16, r3 - beq+ ReturnZeroFromMPCall + beq ReturnZeroFromMPCall b MPCall_38_0x14 @@ -1055,7 +1055,7 @@ MPCall_38_0x48 MPCall_62 ; OUTSIDE REFERER mr. r8, r3 - bne- MPCall_62_0x18 + bne MPCall_62_0x18 mfsprg r15, 0 lwz r31, EWA.CPUBase + CPU.LLL + LLL.Freeform(r15) lwz r3, 0x0000(r31) @@ -1066,14 +1066,14 @@ MPCall_62_0x18 bl LookupID cmpwi r9, CoherenceGroup.kIDClass - bne+ ReturnMPCallInvalidIDErr + bne ReturnMPCallInvalidIDErr MPCall_62_0x24 mr r8, r4 li r9, 0x07 bl GetNextIDOfClass cmpwi r8, 0x00 - beq+ ReturnMPCallInvalidIDErr + beq ReturnMPCallInvalidIDErr mr r4, r8 ; r8 = id @@ -1084,7 +1084,7 @@ MPCall_62_0x24 lwz r16, 0x0008(r8) lwz r17, 0x0000(r16) cmpw r17, r3 - bne+ MPCall_62_0x24 + bne MPCall_62_0x24 b ReturnZeroFromMPCall @@ -1093,7 +1093,7 @@ MPCall_62_0x24 KCCreateCpuStruct ; OUTSIDE REFERER mr. r8, r3 - bne- KCCreateCpuStruct_0x14 + bne KCCreateCpuStruct_0x14 mfsprg r15, 0 lwz r30, EWA.CPUBase + CPU.LLL + LLL.Freeform(r15) b KCCreateCpuStruct_0x24 @@ -1104,7 +1104,7 @@ KCCreateCpuStruct_0x14 cmpwi r9, CoherenceGroup.kIDClass mr r30, r8 - bne+ ReturnMPCallInvalidIDErr + bne ReturnMPCallInvalidIDErr KCCreateCpuStruct_0x24 li r8, 960 @@ -1115,7 +1115,7 @@ KCCreateCpuStruct_0x24 ; r8 = ptr mr. r31, r8 - beq+ ScrambleMPCall + beq ScrambleMPCall _Lock PSA.SchLock, scratch1=r16, scratch2=r17 @@ -1210,12 +1210,12 @@ MPDeleteProcessor bl LookupID cmpwi r9, CPU.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, CPU.Flags(r31) lisori r17, 9 and. r17, r17, r16 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM mfsprg r15, 0 @@ -1253,12 +1253,12 @@ KCStartCPU ; OUTSIDE REFERER mr r8, r3 bl LookupID cmpwi r9, CPU.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r30, r8 lwz r16, CPU.Flags(r30) rlwinm. r8, r16, 0, 28, 28 - bne+ ReleaseAndReturnZeroFromMPCall + bne ReleaseAndReturnZeroFromMPCall mfsprg r15, 0 li r16, kResetProcessor @@ -1274,8 +1274,8 @@ KCStartCPU ; OUTSIDE REFERER bl SIGP cmpwi r8, -0x7264 cmpwi cr1, r8, 0 - beq+ ReleaseAndReturnMPCallOOM - bne+ cr1, ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM + bne cr1, ReleaseAndReturnMPCallOOM ; Every CPU gets an idle task @@ -1291,7 +1291,7 @@ KCStartCPU ; OUTSIDE REFERER mr r7, r31 mr. r31, r8 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall stw r31, CPU.IdleTaskPtr(r30) @@ -1344,10 +1344,10 @@ MPCall_44_0x15c bl SIGP cmpwi r8, -0x7264 cmpwi cr1, r8, 0x00 - beq+ MPCall_44_0x15c + beq MPCall_44_0x15c - bne- cr1, MPCall_Panic + bne cr1, MPCall_Panic mfsprg r15, 0 @@ -1371,8 +1371,8 @@ MPCall_44_0x15c cmpwi r8, -0x7264 cmpwi cr1, r8, 0 - beq+ @retry - bne- cr1, MPCall_Panic + beq @retry + bne cr1, MPCall_Panic _log 'Processor scheduled^n' @@ -1395,19 +1395,19 @@ KCStopScheduling ; OUTSIDE REFERER bl LookupID cmpwi r9, CPU.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r30, r8 lwz r16, 0x0018(r30) rlwinm. r8, r16, 0, 28, 28 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall lwz r31, 0x001c(r30) clrlwi. r8, r16, 0x1f - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lbz r17, 0x0019(r31) cmpwi r17, 0x00 - beq- KCStopScheduling_0x94 + beq KCStopScheduling_0x94 lwz r17, 0x0064(r31) oris r17, r17, 0x80 stw r17, 0x0064(r31) @@ -1458,10 +1458,10 @@ MPCpuPlugin MPCall_47 ; OUTSIDE REFERER rlwinm. r8, r7, 0, 12, 12 lwz r15, 0x00d8(r6) - beq+ ReturnMPCallOOM + beq ReturnMPCallOOM cmpwi r15, 0x00 mr r16, r2 - beq+ ReturnMPCallOOM + beq ReturnMPCallOOM mr r17, r3 mr r18, r4 mr r19, r5 @@ -1492,10 +1492,10 @@ MPCall_48_Bad ; OUTSIDE REFERER NKxprintf ; OUTSIDE REFERER rlwinm. r9, r11, 0, 27, 27 mr r8, r3 - beq- NKxprintf_0x1c + beq NKxprintf_0x1c li r9, 0x00 bl V2P - beq- NKxprintf_0x24 + beq NKxprintf_0x24 rlwimi r8, r17, 0, 0, 19 NKxprintf_0x1c @@ -1518,8 +1518,8 @@ NKPrintHex cmpwi r4, 1 cmpwi cr1, r4, 2 - beq- @byte - beq- cr1, @half + beq @byte + beq cr1, @half bl Printw @@ -1553,7 +1553,7 @@ KCSetBlueProcessID ; OUTSIDE REFERER mfsprg r16, 0 rlwinm. r8, r7, 0, 10, 10 lwz r31, EWA.PA_CurTask(r16) - beq+ ReturnMPCallOOM + beq ReturnMPCallOOM mr r8, r3 ; r8 = id @@ -1562,7 +1562,7 @@ KCSetBlueProcessID ; OUTSIDE REFERER ; r9 = 0:inval, 1:proc, 2:task, 3:timer, 4:q, 5:sema, 6:cr, 7:cpu, 8:addrspc, 9:evtg, 10:cohg, 11:area, 12:not, 13:log cmpwi r9, Process.kIDClass - bne+ ReturnMPCallInvalidIDErr + bne ReturnMPCallInvalidIDErr stw r3, Task.ProcessID(r31) stw r4, 0x00ec(r31) b ReturnZeroFromMPCall @@ -1579,10 +1579,10 @@ KCRegisterThermalHandler ; OUTSIDE REFERER _Lock PSA.SchLock, scratch1=r16, scratch2=r17 mr. r8, r3 - beq- @is_zero + beq @is_zero bl LookupID cmpwi r9, Notification.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr @is_zero stw r3, PSA.ThermalHandlerID(r1) @@ -1601,10 +1601,10 @@ KCRegisterPMFHandler ; OUTSIDE REFERER _Lock PSA.SchLock, scratch1=r16, scratch2=r17 mr. r8, r3 - beq- @is_zero + beq @is_zero bl LookupID cmpwi r9, Notification.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr @is_zero stw r3, PSA.PMFHandlerID(r1) @@ -1626,11 +1626,11 @@ KCMarkPMFTask ; OUTSIDE REFERER mr. r8, r3 lwz r31, EWA.PA_CurTask(r30) - beq- @use_blue_task_instead + beq @use_blue_task_instead bl LookupID cmpwi r9, Task.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr @use_blue_task_instead ; Insert bit 31 of r4 into bit 21 of these flags @@ -1663,18 +1663,18 @@ NKLocateInfoRecord cmpwi r3, 5 cmpwi cr1, r3, 2 - beq- @ProcessorInfo - beq- cr1, @SystemInfo + beq @ProcessorInfo + beq cr1, @SystemInfo cmpwi r3, 3 cmpwi cr1, r3, 4 - beq- @DiagInfo - beq- cr1, @NanoKernelInfo + beq @DiagInfo + beq cr1, @NanoKernelInfo cmpwi r3, 7 cmpwi cr1, r3, 6 - beq- @ProcessorState - bne+ cr1, ReturnParamErrFromMPCall + beq @ProcessorState + bne cr1, ReturnParamErrFromMPCall lwz r4, KDP.InfoRecord + InfoRecord.NKHWInfoPtr(r1) lhz r16, KDP.InfoRecord + InfoRecord.NKHWInfoLen(r1) @@ -1730,7 +1730,7 @@ NKLocateInfoRecord NKSetPrInfoClockRates cmplwi r3, 2 - bge+ ReturnParamErrFromMPCall + bge ReturnParamErrFromMPCall mulli r17, r3, 16 addi r18, r1, KDP.ProcessorInfo + NKProcessorInfo.ClockRates @@ -1773,7 +1773,7 @@ NKSetClockStep ; OUTSIDE REFERER lwz r8, EWA.CPUBase + CPU.LLL + LLL.Freeform(r9) lwz r9, 0x0024(r8) cmpwi r9, 0x01 - bgt+ ReturnMPCallOOM + bgt ReturnMPCallOOM lhz r19, 0x0f7e(r1) _log 'NKSetClockStep - current ' mr r8, r19 @@ -1784,8 +1784,8 @@ NKSetClockStep ; OUTSIDE REFERER _log '^n' cmplwi r3, 0x02 cmpw cr1, r3, r19 - bge+ ReturnParamErrFromMPCall - beq+ cr1, ReturnMPCallOOM + bge ReturnParamErrFromMPCall + beq cr1, ReturnMPCallOOM mulli r17, r3, 0x10 addi r18, r1, 0xf80 sth r17, 0x0f7e(r1) @@ -1801,13 +1801,13 @@ NKSetClockStep ; OUTSIDE REFERER lwz r16, 0x0008(r18) stw r16, -0x0438(r1) - bgt- cr1, NKSetClockStep_0xec + bgt cr1, NKSetClockStep_0xec lwz r31, -0x0434(r1) lbz r18, 0x0017(r31) cmpwi r18, 0x00 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall mr r8, r31 bl DequeueTimer @@ -1820,7 +1820,7 @@ NKSetClockStep_0xec cmpwi r18, 0x01 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall bl GetTime stw r8, 0x0038(r31) stw r9, 0x003c(r31) @@ -1847,24 +1847,24 @@ NKSetClockDriftCorrection ; OUTSIDE REFERER lwz r31, -0x0364(r1) mfsprg r9, 0 cmpwi r31, 0x00 - beq+ ReturnMPCallOOM + beq ReturnMPCallOOM lwz r8, EWA.CPUBase + CPU.LLL + LLL.Freeform(r9) lwz r9, 0x0024(r8) cmpwi r9, 0x01 - bgt+ ReturnMPCallOOM + bgt ReturnMPCallOOM lwz r19, 0x0fa0(r1) cmpwi r3, 0x00 cmpw cr1, r3, r19 stw r3, 0x0fa0(r1) - beq- NKSetClockDriftCorrection_0x12c - beq+ cr1, ReturnZeroFromMPCall + beq NKSetClockDriftCorrection_0x12c + beq cr1, ReturnZeroFromMPCall lis r16, 0x3b9a ori r16, r16, 0xca00 lwz r17, 0x0f88(r1) srwi r17, r17, 7 divw r18, r16, r3 cmpw r18, r17 - bge- NKSetClockDriftCorrection_0x64 + bge NKSetClockDriftCorrection_0x64 divw r16, r16, r17 mr r18, r17 divw r17, r3, r16 @@ -1895,7 +1895,7 @@ NKSetClockDriftCorrection_0x6c cmpwi r18, 0x01 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall bl GetTime stw r8, 0x0038(r31) stw r9, 0x003c(r31) @@ -1917,7 +1917,7 @@ NKSetClockDriftCorrection_0x12c cmpwi r18, 0x00 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall mr r8, r31 bl DequeueTimer @@ -1939,10 +1939,10 @@ MPCall_115 ; OUTSIDE REFERER cmpwi r9, ConsoleLog.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r30, 0x000c(r31) cmpwi r30, 0x00 - bne- MPCall_115_0x94 + bne MPCall_115_0x94 _Lock PSA.DbugLock, scratch1=r16, scratch2=r17 @@ -1951,32 +1951,32 @@ MPCall_115 ; OUTSIDE REFERER MPCall_115_0x54 addi r30, r30, 0x01 andi. r29, r30, 0xfff - bne- MPCall_115_0x64 + bne MPCall_115_0x64 lwz r30, -0x1000(r30) MPCall_115_0x64 lbz r16, 0x0000(r30) cmpwi r16, 0x00 - beq+ MPCall_115_0x54 + beq MPCall_115_0x54 stw r30, 0x000c(r31) _AssertAndRelease PSA.DbugLock, scratch=r16 MPCall_115_0x94 cmpwi r5, 0x00 - ble+ ReleaseAndReturnMPCallOOM + ble ReleaseAndReturnMPCallOOM rlwinm. r9, r11, 0, 27, 27 mr r8, r4 crmove 30, 2 - beq- MPCall_115_0xd0 + beq MPCall_115_0xd0 li r9, 0x00 bl MPCall_95_0x45c - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM add r8, r4, r5 li r9, 0x00 addi r8, r8, -0x01 mr r30, r8 bl MPCall_95_0x45c - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM MPCall_115_0xd0 lwz r28, -0x0404(r1) @@ -1987,18 +1987,18 @@ MPCall_115_0xd0 MPCall_115_0xe0 cmpw r28, r29 cmplw cr1, r4, r30 - beq- MPCall_115_0x144 - bgt- cr1, MPCall_115_0x144 + beq MPCall_115_0x144 + bgt cr1, MPCall_115_0x144 rlwinm r16, r4, 0, 0, 19 mr r8, r4 - beq- cr7, MPCall_115_0x11c + beq cr7, MPCall_115_0x11c cmpw r16, r27 mr r17, r26 - beq- MPCall_115_0x11c + beq MPCall_115_0x11c mr r27, r16 li r9, 0x00 bl MPCall_95_0x45c - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM mr r26, r17 MPCall_115_0x11c @@ -2035,10 +2035,10 @@ KCRegisterExternalHandler _Lock PSA.SchLock, scratch1=r16, scratch2=r17 mr. r8, r3 - beq- @zero + beq @zero bl LookupID cmpwi r9, Notification.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr @zero stw r3, PSA.ExternalHandlerID(r1) @@ -2056,7 +2056,7 @@ MPCall_133 ; OUTSIDE REFERER cmpw r3, r0 lwz r16, 0x0edc(r1) li r17, 0x0b - blt- MPCall_133_0x34 + blt MPCall_133_0x34 and r3, r3, r17 or r16, r16, r3 b MPCall_133_0x3c @@ -2071,16 +2071,16 @@ MPCall_133_0x3c extsh r17, r4 cmpwi r16, -0x01 cmpwi cr1, r17, -0x01 - beq- MPCall_133_0x60 - bgt- MPCall_133_0x5c + beq MPCall_133_0x60 + bgt MPCall_133_0x5c li r16, 0x00 MPCall_133_0x5c sth r16, -0x0360(r1) MPCall_133_0x60 - beq- cr1, MPCall_133_0x70 - bgt- cr1, MPCall_133_0x6c + beq cr1, MPCall_133_0x70 + bgt cr1, MPCall_133_0x6c li r17, 0x00 MPCall_133_0x6c @@ -2091,16 +2091,16 @@ MPCall_133_0x70 extsh r17, r5 cmpwi r16, -0x01 cmpwi cr1, r17, -0x01 - beq- MPCall_133_0x90 - bgt- MPCall_133_0x8c + beq MPCall_133_0x90 + bgt MPCall_133_0x8c li r16, 0x00 MPCall_133_0x8c sth r16, -0x035c(r1) MPCall_133_0x90 - beq- cr1, MPCall_133_0xa0 - bgt- cr1, MPCall_133_0x9c + beq cr1, MPCall_133_0xa0 + bgt cr1, MPCall_133_0x9c li r17, 0x00 MPCall_133_0x9c diff --git a/NanoKernel/NKPaging.s b/NanoKernel/NKPaging.s index c16fc4d..69f4dd4 100644 --- a/NanoKernel/NKPaging.s +++ b/NanoKernel/NKPaging.s @@ -55,22 +55,22 @@ PagingFunc1 ; OUTSIDE REFERER lwz r17, 0x0020(r31) cmplw r16, r27 lwz r18, 0x007c(r31) - bgt- @_1a0 - bgt+ @_44 + bgt @_1a0 + bgt @_44 and r28, r27, r18 rlwinm. r26, r17, 0, 16, 16 lwz r17, 0x0038(r31) - beq- @_fc + beq @_fc lwz r18, 0x0070(r31) subf r19, r16, r28 clrlwi r31, r18, 0x1e cmpwi cr7, r17, -0x01 cmpwi cr6, r31, 0x00 - beq- cr7, @_1a0 - beq+ cr6, @_44 + beq cr7, @_1a0 + beq cr6, @_44 cmpwi r17, 0x01 add r31, r18, r19 - blt+ @_44 + blt @_44 li r26, 0x00 b @_208 @@ -81,10 +81,10 @@ PagingFunc1 ; OUTSIDE REFERER mr r26, r30 mr r8, r27 bl MPCall_95_0x254 - beq- @_12c + beq @_12c lhz r16, 0x0000(r30) rlwinm. r8, r16, 0, 16, 16 - bne- @_12c + bne @_12c srwi r16, r16, 1 sth r16, 0x0000(r30) @@ -95,8 +95,8 @@ PagingFunc1 ; OUTSIDE REFERER cmpwi cr6, r9, 0x00 li r8, 0x801 li r9, 0x01 - bne- @_154 - beq- cr6, @_154 + bne @_154 + beq cr6, @_154 li r8, 0x881 li r9, 0x81 @@ -106,7 +106,7 @@ PagingFunc1 ; OUTSIDE REFERER rlwimi r31, r28, 0, 0, 19 cmplwi cr6, r30, 0x800 cmplwi r30, 0x01 - bge- cr6, @_2ec + bge cr6, @_2ec cmplw cr7, r30, r9 ori r31, r31, 0x100 rlwimi r31, r28, 28, 28, 28 @@ -117,8 +117,8 @@ PagingFunc1 ; OUTSIDE REFERER rlwimi r31, r28, 30, 31, 31 rlwimi r31, r28, 0, 30, 30 xori r31, r31, 0x02 - beq- @_208 - blt+ cr7, @_44 + beq @_208 + blt cr7, @_44 bl Local_Panic @_1a0 @@ -136,17 +136,17 @@ PagingFunc1 ; OUTSIDE REFERER lhz r31, 0x0002(r29) subf r30, r30, r28 cmplw cr7, r30, r31 - bgt+ cr7, @_1b8 + bgt cr7, @_1b8 lwz r28, 0x0690(r1) lwz r31, 0x0004(r29) cmpwi cr7, r28, 0x00 - bnel- cr7, @_314 + bnel cr7, @_314 rlwinm. r26, r31, 23, 29, 30 cmplwi cr7, r26, 0x06 - beq- @_200 + beq @_200 cmplwi cr6, r26, 0x02 - beq- cr7, @_368 - beq- cr6, @_3b8 + beq cr7, @_368 + beq cr6, @_3b8 b @_44 dc.l 0x41800168 dc.l 0x418101bc @@ -172,28 +172,28 @@ PagingFunc1 ; OUTSIDE REFERER lwz r30, 0x0010(r29) cmpwi cr7, r28, 0x00 lwzu r28, 0x0018(r29) - bge- cr6, @_298 + bge cr6, @_298 cmpwi cr6, r30, 0x00 lwzu r30, 0x0008(r29) - bge- cr7, @_298 + bge cr7, @_298 cmpwi cr7, r28, 0x00 lwzu r28, 0x0008(r29) - bge- cr6, @_298 + bge cr6, @_298 cmpwi cr6, r30, 0x00 lwzu r30, 0x0008(r29) - bge- cr7, @_298 + bge cr7, @_298 cmpwi cr7, r28, 0x00 lwzu r28, 0x0008(r29) - bge- cr6, @_298 + bge cr6, @_298 cmpwi cr6, r30, 0x00 addi r29, r29, 0x08 - bge- cr7, @_298 + bge cr7, @_298 cmpwi cr7, r28, 0x00 addi r29, r29, 0x08 - bge- cr6, @_298 + bge cr6, @_298 rlwinm r28, r31, 0, 26, 26 addi r29, r29, 0x08 - blt- cr7, @_3e0 + blt cr7, @_3e0 @_298 cmpwi r26, 0x00 @@ -213,9 +213,9 @@ PagingFunc1 ; OUTSIDE REFERER stw r29, 0x0698(r1) addi r28, r28, 0x01 stw r28, 0x0e94(r1) - beq+ @_44 + beq @_44 cmpwi r26, 0x5a5a - bne- @_2f4 + bne @_2f4 stw r29, 0x0690(r1) @_2ec @@ -246,7 +246,7 @@ PagingFunc1 ; OUTSIDE REFERER rlwinm. r28, r28, 0, 0, 14 sync tlbie r29 - beq- @_354 + beq @_354 sync tlbsync @@ -267,7 +267,7 @@ PagingFunc1 ; OUTSIDE REFERER cmplwi cr6, r30, 0x800 cmplwi cr7, r30, 0x81 cmplwi r30, 0x01 - bge+ cr6, @_2ec + bge cr6, @_2ec cmplwi cr7, r30, 0x81 ori r31, r31, 0x100 rlwimi r31, r28, 3, 24, 24 @@ -275,8 +275,8 @@ PagingFunc1 ; OUTSIDE REFERER rlwimi r31, r28, 1, 25, 25 xori r31, r31, 0x40 rlwimi r31, r28, 30, 31, 31 - beq+ @_208 - blt+ cr7, @_44 + beq @_208 + blt cr7, @_44 bl Local_Panic @_3b8 @@ -294,12 +294,12 @@ PagingFunc1 ; OUTSIDE REFERER @_3e0 cmplw cr6, r28, r26 addi r29, r29, -0x50 - ble- cr6, @_400 + ble cr6, @_400 crnot 2, 2 lwz r30, KDP.PTEGMask(r1) xori r31, r31, 0x800 xor r29, r29, r30 - beq+ @_228 + beq @_228 @_400 lwz r26, 0x069c(r1) @@ -319,16 +319,16 @@ PagingFunc1 ; OUTSIDE REFERER rlwimi r29, r26, 0, 0, 25 lwz r31, 0x0004(r29) lwz r30, 0x0000(r29) - beq- cr6, @_444 + beq cr6, @_444 rlwinm r28, r31, 30, 25, 25 andc. r28, r28, r30 - bne+ @_420 + bne @_420 @_444 addi r9, r9, -0x01 cmpwi cr7, r9, 0x00 rlwinm r31, r30, 0, 25, 25 - blel+ cr7, Local_Panic + blel cr7, Local_Panic rlwinm r28, r30, 1, 0, 3 neg r31, r31 rlwimi r28, r30, 22, 4, 9 @@ -349,7 +349,7 @@ PagingFunc1 ; OUTSIDE REFERER mfspr r31, pvr rlwinm. r31, r31, 0, 0, 14 tlbie r28 - beq- @_4b0 + beq @_4b0 sync tlbsync @@ -369,11 +369,11 @@ PagingFunc1 ; OUTSIDE REFERER mr r31, r8 cmplw r16, r28 mr r8, r28 - bgt- @_600 - bgt+ Local_Panic + bgt @_600 + bgt Local_Panic bl MPCall_95_0x1e4 mr r26, r30 - beql+ @_88 + beql @_88 @_500 lwz r28, 0x0000(r26) @@ -381,10 +381,10 @@ PagingFunc1 ; OUTSIDE REFERER andi. r30, r28, 0x800 rlwinm r30, r28, 23, 9, 28 xor r30, r30, r29 - beq+ Local_Panic + beq Local_Panic andi. r30, r30, 0xffff xori r28, r28, 0x800 - bne+ Local_Panic + bne Local_Panic rlwimi r28, r31, 0, 0, 19 rlwimi r28, r31, 29, 27, 27 rlwimi r28, r31, 27, 28, 28 @@ -431,15 +431,15 @@ PagingFunc1 ; OUTSIDE REFERER lwz r31, -0x0004(r26) andi. r31, r31, 0xe01 cmpwi r31, 0xa01 - bgt+ cr7, @_60c - beq+ @_60c + bgt cr7, @_60c + beq @_60c lwz r26, -0x0004(r26) slwi r30, r30, 2 rlwinm r31, r26, 22, 30, 31 cmpwi cr7, r31, 0x03 rlwinm r26, r26, 22, 0, 29 add r26, r26, r30 - bnel+ cr7, @_88 + bnel cr7, @_88 b @_500 @@ -457,7 +457,7 @@ PagingFunc2 ; OUTSIDE REFERER addis r31, r31, -0x1000 mr. r31, r31 mtsrin r30, r31 - bne+ @_18 + bne @_18 isync PagingFunc2AndAHalf @@ -466,7 +466,7 @@ PagingFunc2AndAHalf rlwinm. r31, r31, 0, 0, 14 addi r29, r1, 0x00 stw r28, 0x05ec(r1) - beq- @_168 + beq @_168 li r30, 0x00 mtspr ibat0u, r30 mtspr ibat1u, r30 @@ -604,22 +604,22 @@ PagingFunc3 ; OUTSIDE REFERER rlwimi r28, r30, 15, 0, 14 xor r31, r27, r30 andc. r31, r31, r28 - beq- @_54 + beq @_54 lwzu r30, 0x0008(r29) rlwimi r28, r30, 15, 0, 14 xor r31, r27, r30 andc. r31, r31, r28 - beq- @_54 + beq @_54 lwzu r30, 0x0008(r29) rlwimi r28, r30, 15, 0, 14 xor r31, r27, r30 andc. r31, r31, r28 - beq- @_54 + beq @_54 lwzu r30, 0x0008(r29) rlwimi r28, r30, 15, 0, 14 xor r31, r27, r30 andc. r31, r31, r28 - bne- PagingFunc4 + bne PagingFunc4 @_54 andi. r31, r30, 0x01 @@ -627,7 +627,7 @@ PagingFunc3 ; OUTSIDE REFERER lwzu r31, 0x0004(r29) and r28, r27, r28 or r31, r31, r28 - bnelr- + bnelr @@ -651,7 +651,7 @@ PagingFunc4 ; OUTSIDE REFERER lwz r31, 0x0010(r29) cmpw cr7, r30, r28 lwzu r28, 0x0018(r29) - bne- cr6, @_50 + bne cr6, @_50 @_48 lwzu r31, -0x0014(r29) @@ -660,30 +660,30 @@ PagingFunc4 ; OUTSIDE REFERER @_50 cmpw cr6, r30, r31 lwzu r31, 0x0008(r29) - beq+ cr7, @_48 + beq cr7, @_48 cmpw cr7, r30, r28 lwzu r28, 0x0008(r29) - beq+ cr6, @_48 + beq cr6, @_48 cmpw cr6, r30, r31 lwzu r31, 0x0008(r29) - beq+ cr7, @_48 + beq cr7, @_48 cmpw cr7, r30, r28 lwzu r28, 0x0008(r29) - beq+ cr6, @_48 + beq cr6, @_48 cmpw cr6, r30, r31 lwzu r31, -0x000c(r29) - beqlr- cr7 + beqlr cr7 cmpw cr7, r30, r28 lwzu r31, 0x0008(r29) - beqlr- cr6 + beqlr cr6 lwzu r31, 0x0008(r29) - beqlr- cr7 + beqlr cr7 lwz r31, KDP.PTEGMask(r1) xori r30, r30, 0x40 andi. r28, r30, 0x40 addi r29, r29, -0x3c xor r29, r29, r31 - bne+ @_2c + bne @_2c blr @@ -698,14 +698,14 @@ PagingFlushTLB ; OUTSIDE REFERER subi r29, r29, 1 << pb cmpwi r29, 0 tlbie r29 - bgt+ @loop + bgt @loop mfspr r29, pvr rlwinm. r29, r29, 0, 0, 14 ; All cpus sync - beqlr- + beqlr ; Non-601 stuff tlbsync diff --git a/NanoKernel/NKPoolAllocator.s b/NanoKernel/NKPoolAllocator.s index 25719ef..8597314 100644 --- a/NanoKernel/NKPoolAllocator.s +++ b/NanoKernel/NKPoolAllocator.s @@ -173,8 +173,8 @@ _PoolAllocCommon cmpwi r8, 0 cmpwi cr1, r8, 0xfd8 - ble+ _PoolPanic - bgt- cr1, @request_too_large + ble _PoolPanic + bgt cr1, @request_too_large ; Up-align to 32b boundary and snatch an extra 8b @@ -203,7 +203,7 @@ _PoolAllocCommon lwz r17, PSA.UnheldFreePageCount(r1) subf. r16, r9, r16 subf r17, r9, r17 - blt- _PoolReturn + blt _PoolReturn stw r16, PSA.FreePageCount(r1) stw r17, PSA.UnheldFreePageCount(r1) @@ -239,8 +239,8 @@ _PoolAllocCommon cmplw r16, r8 lis r20, 'fr' - bgt- @decide_whether_to_split - beq- @do_not_split + bgt @decide_whether_to_split + beq @do_not_split ori r20, r20, 'ee' @@ -253,8 +253,8 @@ _PoolAllocCommon lwz r19, Block.Signature(r18) cmplw cr1, r18, r15 cmpw r19, r20 - ble+ cr1, _PoolPanic - bne- @physically_adjacent_block_is_not_free + ble cr1, _PoolPanic + bne @physically_adjacent_block_is_not_free lwz r17, Block.OffsetToNext(r18) rotlwi r19, r19, 8 @@ -279,7 +279,7 @@ _PoolAllocCommon subf r16, r8, r16 cmpwi r16, 40 - blt- @do_not_split + blt @do_not_split ; Use the rightmost part of the block, leaving ptr in r15 @@ -323,7 +323,7 @@ _PoolAllocCommon @clrloop stwu r14, 4(r15) cmpw r15, r16 - ble+ @clrloop + ble @clrloop b _PoolReturn @@ -378,7 +378,7 @@ _PoolAddBlockToFreeList lhz r16, Block.Signature(r15) _lfinish cmplwi r16, 0x876c ; Block.kAllocSig >> 16 - bne+ _PoolPanic + bne _PoolPanic stw r20, Block.Signature(r15) ; Insert into the global free block list @@ -404,8 +404,8 @@ _PoolMergeAdjacentFreeBlocks lwz r19, Block.Signature(r18) ; r19 = signature of that block cmplw cr1, r18, r15 cmpw r19, r20 - ble+ cr1, _PoolPanic ; die if block was of non-positive size! - bnelr- ; return if block to right is not free + ble cr1, _PoolPanic ; die if block was of non-positive size! + bnelr ; return if block to right is not free lwz r17, Block.OffsetToNext(r18) rotlwi r19, r19, 8 ; scramble old signature to clarify mem dumps @@ -466,7 +466,7 @@ _pool_page_seg equ 0x1000 subi r16, r16, 32 cmpwi r16, 0 dcbz r16, r17 - bgt+ @zeroloop + bgt @zeroloop ; Begin block @@ -552,7 +552,7 @@ PoolCheck lwz r18, Block.OffsetToNext(r17) cmpwi r18, 0 add r20, r18, r17 - bne+ @next_segment + bne @next_segment ; If there are no more Begins, we are done @@ -578,27 +578,27 @@ _PoolCheckBlocks lisori r18, Block.kEndSig cmpw r17, r18 li r9, 0 - beq- @return + beq @return lisori r18, Block.kAllocSig cmpw r17, r18 - beq- @block_is_allocated + beq @block_is_allocated lisori r18, Block.kFreeSig li r9, 4 cmpw r17, r18 - bne- @block_corrupt + bne @block_corrupt ; From now we assume Free lwz r17, Block.FreePrev(r16) cmpwi r17, 0 li r9, 5 - beq- @block_corrupt + beq @block_corrupt lwz r17, Block.FreeNext(r16) cmpwi r17, 0 li r9, 6 - beq- @block_corrupt + beq @block_corrupt @block_is_allocated ;or block is free (fallthru) @@ -606,7 +606,7 @@ _PoolCheckBlocks add r16, r16, r17 cmpwi r17, 0 li r9, 7 - bgt+ @loop + bgt @loop ; 4: neither Allocated nor Free @@ -655,19 +655,19 @@ _PoolCheckBlocks lbzu r8, 1(r16) cmpwi r8, ' ' - bgt- @dont_use_space + bgt @dont_use_space li r8, ' ' @dont_use_space bl Printc - bdnz+ @dump_next_char + bdnz @dump_next_char _log '*^n' subi r17, r17, 1 addi r16, r16, 1 cmpwi r17, 0x00 - bne+ @dump_next_line + bne @dump_next_line mr r8, r18 diff --git a/NanoKernel/NKPowerCalls.s b/NanoKernel/NKPowerCalls.s index 9384ee7..389ddf6 100644 --- a/NanoKernel/NKPowerCalls.s +++ b/NanoKernel/NKPowerCalls.s @@ -55,17 +55,17 @@ kcPowerDispatch @use_provided_mcr and. r8, r4, r9 - bgt- cr7, PowerEarlyReturnError ; invalid selector - bne- PowerEarlyReturnSuccess + bgt cr7, PowerEarlyReturnError ; invalid selector + bne PowerEarlyReturnSuccess cmplwi cr7, r3, 11 - beq- cr7, PwrInfiniteLoop + beq cr7, PwrInfiniteLoop cmplwi cr7, r3, 8 - beq- cr7, PwrSuspendSystem + beq cr7, PwrSuspendSystem cmplwi cr7, r3, 9 - beq- cr7, PwrSetICTC + beq cr7, PwrSetICTC ; Fall through to 0-7: PwrIdle @@ -130,7 +130,7 @@ PwrIdle addi r3, r3, 26 rlwnm r3, r8, r3, 30, 31 cmpwi r3, 0 - beq- PowerEarlyRestoreReturnError + beq PowerEarlyRestoreReturnError ; Depending on pre-programmed flags, set: @@ -139,12 +139,12 @@ PwrIdle lbz r9, KDP.CpuSpecificByte2(r1) cmpwi r9, 0 - beq- @set_neither + beq @set_neither mfspr r27, hid0 ; will restore r27 => HID0 when system wakes below mr r8, r27 cmpwi r9, 1 - beq- @set_only_nhr + beq @set_only_nhr oris r9, r3, 0x0100 ; set bit 7 srw r9, r9, r9 ; shift right by 0-3 @@ -159,7 +159,7 @@ PwrIdle ; Flush L1 and L2 caches if argument & 4 cmplwi r26, 4 - beql- FlushCaches + beql FlushCaches ; Set MSR bits to enter the selected pwrmgt state @@ -167,7 +167,7 @@ PwrIdle mfmsr r8 ori r8, r8, 0x8002 ; Always set MSR[EE] and MSR[RI] so we can wake! cmplwi r3, 0 ; If using HID0[pwrmgt state], set MSR[POW] so it takes effect - beq- @no_pow + beq @no_pow oris r8, r8, 4 @no_pow sync ; Apply MSR! @@ -185,7 +185,7 @@ IntReturnToFullOn lbz r8, KDP.CpuSpecificByte2(r1) cmpwi r8, 0 - beq- @hid_was_not_changed + beq @hid_was_not_changed mtspr hid0, r27 @hid_was_not_changed @@ -252,7 +252,7 @@ PwrSuspendSystem lwz r9, CoherenceGroup.ScheduledCpuCount(r8) cmpwi r9, 1 li r3, -0x7267 - bgt+ IntReturn + bgt IntReturn ; Some breathing room @@ -277,7 +277,7 @@ PwrSuspendSystem lwz r26, KDP.ProcessorInfo + NKProcessorInfo.ProcessorFlags(r1) andi. r26, r26, 1 << NKProcessorInfo.hasL2CR - beq- @no_need_to_deactivate_l2 + beq @no_need_to_deactivate_l2 mfspr r9, l2cr clrlwi r9, r9, 1 ; unset L2CR[L2E] mtspr l2cr, r9 @@ -299,7 +299,7 @@ PwrSuspendSystem ; Save floats andi. r8, r11, 0x2000 ; MSR[FP] - beq- @no_save_float + beq @no_save_float mfmsr r8 ori r8, r8, 0x2000 ; ensure that MSR bit is set? mtmsr r8 @@ -335,7 +335,7 @@ PwrSuspendSystem mftbu r8 lwz r9, NKProcessorState.saveTBU(r16) cmpw r8, r9 - bne+ @tb_retry + bne @tb_retry ; Save MSR @@ -421,7 +421,7 @@ PwrSuspendSystem addis r8, r8, -0x10 mr. r9, r9 mtsrin r8, r9 - bne+ @srin_loop + bne @srin_loop isync @@ -446,10 +446,10 @@ PwrSuspendSystem lwz r26, KDP.ProcessorInfo + NKProcessorInfo.ProcessorFlags(r1) andi. r26, r26, 1 << NKProcessorInfo.hasL2CR - beq- @no_need_to_reactivate_l2 + beq @no_need_to_reactivate_l2 lwz r8, KDP.ProcessorInfo + NKProcessorInfo.ProcessorL2DSize(r1) mr. r8, r8 - beq- @no_need_to_reactivate_l2 + beq @no_need_to_reactivate_l2 mfspr r9, hid0 rlwinm r9, r9, 0, 12, 10 @@ -470,7 +470,7 @@ PwrSuspendSystem @l2_reactivate_loop mfspr r8, l2cr rlwinm. r8, r8, 31, 0, 0 - bne+ @l2_reactivate_loop + bne @l2_reactivate_loop mfspr r8, l2cr @@ -518,7 +518,7 @@ PwrSuspendSystem ; Load floats andi. r8, r11, 0x2000 ; MSR[FP] - beq- @no_restore_float + beq @no_restore_float mfmsr r8 ori r8, r8, 0x2000 ; ensure that MSR bit is set? mtmsr r8 @@ -677,7 +677,7 @@ ActuallySuspend mtmsr r8 ; sleep now isync cmpwi r1, 0 - beq+ @evil_aligned_sleep_loop ; re-sleep until the world is sane? + beq @evil_aligned_sleep_loop ; re-sleep until the world is sane? lwz r0, 0(r9) andi. r1, r1, 0 b @evil_aligned_sleep_loop ; actually, there is no escape diff --git a/NanoKernel/NKPrimaryIntHandlers.s b/NanoKernel/NKPrimaryIntHandlers.s index 0a25da5..5569523 100644 --- a/NanoKernel/NKPrimaryIntHandlers.s +++ b/NanoKernel/NKPrimaryIntHandlers.s @@ -65,9 +65,9 @@ CommonPIHPath ; OUTSIDE REFERER CommonPIHPath_0xc ; OUTSIDE REFERER cmpwi cr7, r28, 0 li r31, 0 - blt- cr7, @negative + blt cr7, @negative - beq- cr7, @zero_rupt + beq cr7, @zero_rupt ori r28, r28, 0x8000 lwz r31, KDP.PostIntMaskInit(r1) @zero_rupt @@ -76,16 +76,16 @@ CommonPIHPath_0xc ; OUTSIDE REFERER cmpwi cr1, r27, 0 lwz r29, KDP.ClearIntMaskInit(r1) - bne- @noperf - bne- cr1, @CommonPIHPath_0x78 + bne @noperf + bne cr1, @CommonPIHPath_0x78 @noperf rlwinm. r8, r7, 0, 10, 10 - beq- @actual_meat + beq @actual_meat sth r28, 0x0000(r23) or r13, r13, r31 - bgt- cr7, @negative + bgt cr7, @negative and r13, r13, r29 @negative @@ -103,7 +103,7 @@ CommonPIHPath_0xc ; OUTSIDE REFERER bl LookupID cmpwi r9, Notification.kIDClass mr r30, r8 - bne- @no_handler_notification + bne @no_handler_notification clrlwi r9, r28, 17 stw r9, Notification.MsgWord1(r30) @@ -152,12 +152,12 @@ CommonPIHPath_0xc ; OUTSIDE REFERER cmpwi r29, 0 lhz r16, Task.CPUIndex(r31) - beq- @task_not_running + beq @task_not_running lhz r17, EWA.CPUIndex(r30) cmpw cr1, r16, r17 rlwinm. r8, r28, 0, Task.kFlag26, Task.kFlag26 - beq- cr1, @running_on_this_cpu - bne- @flag_and_run + beq cr1, @running_on_this_cpu + bne @flag_and_run @running_on_this_cpu mr r8, r31 @@ -169,7 +169,7 @@ CommonPIHPath_0xc ; OUTSIDE REFERER RemoveFromList r16, scratch1=r17, scratch2=r18 lbz r17, Task.Timer + Timer.Byte3(r31) cmpwi r17, 1 - bne- @task_timer_not_in_use + bne @task_timer_not_in_use addi r8, r31, Task.Timer bl DequeueTimer @task_timer_not_in_use @@ -202,8 +202,8 @@ CommonPIHPath_0xc ; OUTSIDE REFERER KCPropogateExternalInterrupt ; OUTSIDE REFERER rlwinm. r8, r7, 0, 10, 10 cmplwi cr1, r3, 7 - bne- @notthegumdropbuttons - bgt- cr1, @too_high + bne @notthegumdropbuttons + bgt cr1, @too_high _Lock PSA.PIHLock, scratch1=r8, scratch2=r9 @@ -213,7 +213,7 @@ KCPropogateExternalInterrupt ; OUTSIDE REFERER ; r28 = max(current level, desired level) cmpw r3, r28 - ble- @desired_is_lower + ble @desired_is_lower mr r28, r3 @desired_is_lower @@ -300,7 +300,7 @@ PDM_PIH mfsprg r30, 3 - bne- @nocount + bne @nocount lwz r21, KDP.NanoKernelInfo + NKNanoKernelInfo.ExternalIntCount(r1) addi r21, r21, 0x01 stw r21, KDP.NanoKernelInfo + NKNanoKernelInfo.ExternalIntCount(r1) @@ -377,7 +377,7 @@ PBX_PIH addi r9, r1, -0x750 andis. r8, r11, 0x02 mfsprg r30, 3 - bne- PBX_PIH_0x38 + bne PBX_PIH_0x38 lwz r21, 0x0e80(r1) addi r21, r21, 0x01 stw r21, 0x0e80(r1) @@ -441,7 +441,7 @@ GazellePIH addi r9, r1, -0x750 andis. r8, r11, 0x02 mfsprg r30, 3 - bne- GazellePIH_0x38 + bne GazellePIH_0x38 lwz r21, 0x0e80(r1) addi r21, r21, 0x01 stw r21, 0x0e80(r1) @@ -485,18 +485,18 @@ GazellePIH_0x38 isync andis. r28, r23, 0x10 li r28, 0x07 - bne- GazellePIH_0x104 + bne GazellePIH_0x104 rlwinm r28, r23, 0, 15, 16 rlwimi. r28, r23, 0, 22, 31 li r28, 0x04 - bne- GazellePIH_0x104 + bne GazellePIH_0x104 andis. r28, r23, 0x5fca rlwimi. r28, r23, 0, 17, 20 li r28, 0x02 - bne- GazellePIH_0x104 + bne GazellePIH_0x104 andis. r28, r23, 0x04 li r28, 0x01 - bne- GazellePIH_0x104 + bne GazellePIH_0x104 li r28, 0x00 GazellePIH_0x104 @@ -529,7 +529,7 @@ TNT_PIH addi r9, r1, -0x750 andis. r8, r11, 0x02 mfsprg r30, 3 - bne- TNT_PIH_0x38 + bne TNT_PIH_0x38 lwz r21, 0x0e80(r1) addi r21, r21, 0x01 stw r21, 0x0e80(r1) @@ -562,18 +562,18 @@ TNT_PIH_0x38 isync rlwinm. r28, r23, 0, 11, 11 li r28, 0x07 - bne- TNT_PIH_0xd8 + bne TNT_PIH_0xd8 rlwinm r28, r23, 0, 15, 16 rlwimi. r28, r23, 0, 21, 31 li r28, 0x04 - bne- TNT_PIH_0xd8 + bne TNT_PIH_0xd8 rlwinm. r28, r23, 0, 17, 17 li r28, 0x03 - bne- TNT_PIH_0xd8 + bne TNT_PIH_0xd8 andis. r28, r23, 0x7fea rlwimi. r28, r23, 0, 18, 19 li r28, 0x02 - bne- TNT_PIH_0xd8 + bne TNT_PIH_0xd8 rlwinm. r28, r23, 14, 31, 31 TNT_PIH_0xd8 @@ -605,7 +605,7 @@ GossamerPIH addi r9, r1, -0x750 andis. r8, r11, 0x02 mfsprg r30, 3 - bne- GossamerPIH_0x38 + bne GossamerPIH_0x38 lwz r21, 0x0e80(r1) addi r21, r21, 0x01 stw r21, 0x0e80(r1) @@ -648,24 +648,24 @@ GossamerPIH_0x38 isync rlwinm. r28, r23, 0, 11, 11 li r28, 0x07 - bne- GossamerPIH_0x118 + bne GossamerPIH_0x118 rlwinm r28, r23, 0, 15, 16 rlwimi. r28, r23, 0, 22, 31 li r28, 0x04 - bne- GossamerPIH_0x118 + bne GossamerPIH_0x118 clrlwi. r28, r24, 0x1e li r28, 0x04 - bne- GossamerPIH_0x118 + bne GossamerPIH_0x118 rlwinm. r28, r24, 0, 21, 21 li r28, 0x03 - bne- GossamerPIH_0x118 + bne GossamerPIH_0x118 andis. r28, r23, 0x3fea rlwimi. r28, r23, 0, 17, 20 li r28, 0x02 - bne- GossamerPIH_0x118 + bne GossamerPIH_0x118 rlwinm. r28, r24, 0, 20, 20 li r28, 0x01 - bne- GossamerPIH_0x118 + bne GossamerPIH_0x118 rlwinm. r28, r23, 14, 31, 31 GossamerPIH_0x118 @@ -698,7 +698,7 @@ NewWorldPowerBookPIH addi r9, r1, -0x750 andis. r8, r11, 0x02 mfsprg r30, 3 - bne- NewWorldPowerBookPIH_0x38 + bne NewWorldPowerBookPIH_0x38 lwz r21, 0x0e80(r1) addi r21, r21, 0x01 stw r21, 0x0e80(r1) @@ -738,13 +738,13 @@ NewWorldPowerBookPIH_0x38 NewWorldPowerBookPIH_0xb0 lwz r26, 0x001c(r25) and. r26, r24, r26 - bne- NewWorldPowerBookPIH_0xd4 + bne NewWorldPowerBookPIH_0xd4 lwzu r26, -0x0004(r25) and. r26, r23, r26 - bne- NewWorldPowerBookPIH_0xd4 + bne NewWorldPowerBookPIH_0xd4 addi r28, r28, -0x01 cmplwi r28, 0x00 - bne+ NewWorldPowerBookPIH_0xb0 + bne NewWorldPowerBookPIH_0xb0 NewWorldPowerBookPIH_0xd4 mtsrin r21, r22 @@ -775,7 +775,7 @@ CordycepsPIH addi r9, r1, -0x750 andis. r8, r11, 0x02 mfsprg r30, 3 - bne- CordycepsPIH_0x38 + bne CordycepsPIH_0x38 lwz r21, 0x0e80(r1) addi r21, r21, 0x01 stw r21, 0x0e80(r1) @@ -839,7 +839,7 @@ NewWorldPIH addi r9, r1, -0x750 andis. r8, r11, 0x02 mfsprg r30, 3 - bne- NewWorldPIH_0x38 + bne NewWorldPIH_0x38 lwz r21, 0x0e80(r1) addi r21, r21, 0x01 stw r21, 0x0e80(r1) @@ -860,8 +860,8 @@ NewWorldPIH_0x38 isync cmpwi cr1, r27, 0x00 andis. r26, r11, 0x02 - beq- cr1, NewWorldPIH_0x23c - beq- NewWorldPIH_0x150 + beq cr1, NewWorldPIH_0x23c + beq NewWorldPIH_0x150 lbz r29, 0x0f93(r20) stb r28, 0x0f93(r20) addi r26, r1, 0x912 @@ -869,7 +869,7 @@ NewWorldPIH_0x38 cmplwi r27, 0x01 bne+ cr1, NewWorldPIH_0xa8 addi r27, r27, -0x01 - ble- NewWorldPIH_0x1fc + ble NewWorldPIH_0x1fc lbzx r26, r26, r27 lbz r28, 0x3f00(r26) b NewWorldPIH_0x1fc @@ -877,7 +877,7 @@ NewWorldPIH_0x38 NewWorldPIH_0xa8 cmplwi r27, 0x01 addi r27, r27, -0x01 - ble- NewWorldPIH_0x1fc + ble NewWorldPIH_0x1fc add r26, r26, r27 addi r27, r20, 0xf93 lbz r24, 0x0000(r26) @@ -886,8 +886,8 @@ NewWorldPIH_0xc0 lbzu r28, -0x0001(r27) cmpw r24, r28 cmpwi cr1, r28, 0xfe - beq- NewWorldPIH_0xdc - bne+ cr1, NewWorldPIH_0xc0 + beq NewWorldPIH_0xdc + bne cr1, NewWorldPIH_0xc0 li r28, -0x01 b NewWorldPIH_0x1fc @@ -936,8 +936,8 @@ NewWorldPIH_0x150 cmplwi r26, 0x40 cmplwi cr1, r26, 0x41 li r29, 0x00 - beq- NewWorldPIH_0x208 - bge- cr1, NewWorldPIH_0x218 + beq NewWorldPIH_0x208 + bge cr1, NewWorldPIH_0x218 cmplw r26, r27 lis r27, 0x02 ori r27, r27, 0xb0 @@ -1027,7 +1027,7 @@ UnknownPIH addi r9, r1, -0x750 andis. r8, r11, 0x02 mfsprg r30, 3 - bne- UnknownPIH_0x38 + bne UnknownPIH_0x38 lwz r21, 0x0e80(r1) addi r21, r21, 0x01 stw r21, 0x0e80(r1) @@ -1048,10 +1048,10 @@ UnknownPIH_0x38 isync cmpwi cr1, r27, 0x00 andis. r26, r11, 0x02 - beq- cr1, UnknownPIH_0x23c - beq- UnknownPIH_0x170 + beq cr1, UnknownPIH_0x23c + beq UnknownPIH_0x170 cmplwi r27, 0x01 - ble- UnknownPIH_0x1f8 + ble UnknownPIH_0x1f8 addi r27, r27, -0x01 addi r26, r1, 0x912 add r26, r26, r27 @@ -1068,7 +1068,7 @@ UnknownPIH_0xac lis r28, -0x8000 srw r28, r28, r24 and. r27, r27, r28 - bne- UnknownPIH_0xc8 + bne UnknownPIH_0xc8 li r28, -0x01 b UnknownPIH_0x1f8 @@ -1094,7 +1094,7 @@ UnknownPIH_0xf4 addi r26, r26, -0x01 lbz r26, 0x0000(r26) cmpwi r26, 0xff - beq- UnknownPIH_0x114 + beq UnknownPIH_0x114 b UnknownPIH_0x118 UnknownPIH_0x114 @@ -1110,7 +1110,7 @@ UnknownPIH_0x118 stwx r28, r22, r27 eieio cmpwi r26, 0x800 - beq- UnknownPIH_0x158 + beq UnknownPIH_0x158 lis r28, 0x01 ori r28, r28, 0x00 rlwinm r27, r26, 5, 16, 31 @@ -1138,8 +1138,8 @@ UnknownPIH_0x170 clrlwi r26, r26, 0x14 cmplwi r26, 0x31 cmplwi cr1, r26, 0x28 - beq- UnknownPIH_0x204 - bge- cr1, UnknownPIH_0x214 + beq UnknownPIH_0x204 + bge cr1, UnknownPIH_0x214 rlwinm r27, r26, 5, 16, 31 add r28, r28, r27 lwbrx r28, r22, r28 diff --git a/NanoKernel/NKProcInfoTbl.s b/NanoKernel/NKProcInfoTbl.s index a47fbb0..2ea381f 100644 --- a/NanoKernel/NKProcInfoTbl.s +++ b/NanoKernel/NKProcInfoTbl.s @@ -49,4 +49,4 @@ OverrideProcessorInfo subic. r9, r9, 4 lwzx r12, r11, r9 stwx r12, r10, r9 - bgt+ @loop + bgt @loop diff --git a/NanoKernel/NKRTASCalls.s b/NanoKernel/NKRTASCalls.s index 710fa66..620af05 100644 --- a/NanoKernel/NKRTASCalls.s +++ b/NanoKernel/NKRTASCalls.s @@ -17,7 +17,7 @@ Local_Panic set * kcRTASDispatch ; OUTSIDE REFERER lwz r8, 0x0908(r1) cmpwi r8, 0x00 - bne- rtas_is_available + bne rtas_is_available li r3, -0x01 b IntReturn @@ -30,7 +30,7 @@ rtas_is_available lwz r8, EWA.Enables(r1) stw r7, 0x0000(r6) stw r8, 0x0004(r6) - bns- cr6, kcRTASDispatch_0x5c + bns cr6, kcRTASDispatch_0x5c stw r17, 0x0024(r6) stw r20, 0x0028(r6) stw r21, 0x002c(r6) @@ -46,7 +46,7 @@ kcRTASDispatch_0x5c mfctr r8 stw r10, 0x00fc(r6) stw r8, 0x00f4(r6) - ble- cr3, kcRTASDispatch_0x8c + ble cr3, kcRTASDispatch_0x8c lwz r8, 0x00c4(r9) mfspr r12, mq mtspr mq, r8 @@ -80,21 +80,21 @@ kcRTASDispatch_0x8c stw r29, 0x01ec(r6) stw r30, 0x01f4(r6) stw r31, 0x01fc(r6) - bnel+ major_0x03e18_0xb4 + bnel major_0x03e18_0xb4 stw r11, 0x00a4(r6) mr r27, r3 addi r29, r1, 800 bl PagingFunc3 - beql+ Local_Panic + beql Local_Panic rlwimi r3, r31, 0, 0, 19 lhz r8, 0x0004(r3) cmpwi r8, 0x00 - beq- kcRTASDispatch_0x14c + beq kcRTASDispatch_0x14c slwi r8, r8, 2 lwzx r27, r8, r3 addi r29, r1, 800 bl PagingFunc3 - beql+ Local_Panic + beql Local_Panic lwzx r9, r8, r3 rlwimi r9, r31, 0, 0, 19 stwx r9, r8, r3 @@ -126,7 +126,7 @@ kcRTASDispatch_0x190 dcbf r29, r28 sync icbi r29, r28 - bge+ kcRTASDispatch_0x190 + bge kcRTASDispatch_0x190 sync isync lwz r8, 0x0000(r6) @@ -142,7 +142,7 @@ kcRTASDispatch_0x190 lwz r8, 0x00f4(r6) lwz r10, 0x00fc(r6) mtctr r8 - bnel+ major_0x03e18_0x8 + bnel major_0x03e18_0x8 lwz r8, 0x010c(r6) stw r8, 0x0004(r1) lwz r2, 0x0114(r6) diff --git a/NanoKernel/NKReplacementInit.s b/NanoKernel/NKReplacementInit.s index 0b0ce52..15fb42c 100644 --- a/NanoKernel/NKReplacementInit.s +++ b/NanoKernel/NKReplacementInit.s @@ -25,7 +25,7 @@ InitReplacement @wipeloop subic. r12, r12, 4 stwx r0, r13, r12 - bgt+ @wipeloop + bgt @wipeloop ; Copy the old KDP to r4 + 10 pages. @@ -40,7 +40,7 @@ InitReplacement subic. r12, r12, 4 lwzx r10, r11, r12 stwx r10, r1, r12 - bgt+ @kdp_copyloop + bgt @kdp_copyloop ; IRP goes at the base of the area we were given. @@ -69,7 +69,7 @@ InitReplacement ; discarded - bne- @emulatordata_ptr_provided + bne @emulatordata_ptr_provided addi r6, r1, 0x1000 @emulatordata_ptr_provided @@ -150,7 +150,7 @@ InitReplacement lhz r12, KDP.InfoRecord + InfoRecord.NKNanoKernelInfoVer(r11) cmpwi r12, 0x0101 - bgt- @replaces_later_than_0101 + bgt @replaces_later_than_0101 ; lwz r12, KDP.PA_ECB_Old(r1) @@ -168,7 +168,7 @@ InitReplacement ; Obviously cannot replace a v2 NanoKernel like myself cmpwi r12, 0x0200 - bge- CancelReplacement + bge CancelReplacement lwz r12, EWA.PA_ContextBlock(r11) stw r12, EWA.PA_ContextBlock(r1) @@ -188,7 +188,7 @@ InitReplacement lwz r10, 0x05b4(r11) cmpw r12, r10 - beq- replace_old_kernel_0x198 + beq replace_old_kernel_0x198 stw r12, 0x05b4(r1) stw r0, 0x06b4(r1) lwz r10, 0x05b0(r11) @@ -242,7 +242,7 @@ replace_old_kernel_0x198 @wipeloop subic. r12, r12, 4 stwx r0, r10, r12 - bgt+ @wipeloop + bgt @wipeloop @@ -292,7 +292,7 @@ replace_old_kernel_0x198 lhz r10, KDP.InfoRecord + InfoRecord.NKProcessorInfoVer(r1) cmplwi r10, 0x0112 - bge- @ProcessorInfo_version_already_current + bge @ProcessorInfo_version_already_current li r12, 160 li r10, 0x0112 @@ -359,7 +359,7 @@ replace_old_kernel_0x198 endif cmplwi r23, 0x27f3 ; set bit 27 on ROM 2.7f3 or later - blt- @oldrom ; means later than PDM and Cordyceps + blt @oldrom ; means later than PDM and Cordyceps _bset r8, r8, 27 @oldrom @@ -429,7 +429,7 @@ MoveRecord ; OUTSIDE REFERER subf r9, r22, r9 ; r9 = offset of old address in irp cmplwi r9, 0x1000 - bge- @kdp + bge @kdp add r21, r9, r11 ; r21 = the old address if it had been in KDP instead? @@ -444,10 +444,10 @@ MoveRecord ; OUTSIDE REFERER ; @loop subic. r12, r12, 4 - blt- @exit_loop + blt @exit_loop lwzx r9, r21, r12 stwx r9, r10, r12 - bgt+ @loop + bgt @loop @exit_loop lwz r22, KDP.PA_ConfigInfo(r1) @@ -456,7 +456,7 @@ MoveRecord ; OUTSIDE REFERER subf r10, r1, r10 lisori r21, -9 * 4096 cmpw r10, r21 ; if dest is nearer than 9 pages below kdp... - blt- @0x50 + blt @0x50 add r10, r10, r22 blr @0x50 diff --git a/NanoKernel/NKScheduler.s b/NanoKernel/NKScheduler.s index a641b12..08a67f3 100644 --- a/NanoKernel/NKScheduler.s +++ b/NanoKernel/NKScheduler.s @@ -95,7 +95,7 @@ SchInit addi r23, r23, 1 cmpwi r23, 4 addi r9, r9, 32 ;ReadyQueue.Size - blt+ @loop + blt @loop @@ -106,7 +106,7 @@ SchInit lwz r17, ContextBlock.PriorityShifty(r16) andi. r9, r17, 0xF li r17, 2 - bnelr- + bnelr stw r17, ContextBlock.PriorityShifty(r16) blr @@ -299,193 +299,193 @@ Restore_v0_v31 ; OUTSIDE REFERER li r9, -0x8e0 lvx v31, r8, r9 vor v0, v31, v31 - bge- major_0x13988_0x108 + bge major_0x13988_0x108 li r8, 0x00 lvx v0, r8, r10 major_0x13988_0x108 vor v1, v31, v31 - ble- major_0x13988_0x118 + ble major_0x13988_0x118 li r9, 0x10 lvx v1, r9, r10 major_0x13988_0x118 vor v2, v31, v31 - bne- major_0x13988_0x128 + bne major_0x13988_0x128 li r8, 0x20 lvx v2, r8, r10 major_0x13988_0x128 vor v3, v31, v31 - bns- major_0x13988_0x138 + bns major_0x13988_0x138 li r9, 0x30 lvx v3, r9, r10 major_0x13988_0x138 vor v4, v31, v31 - bge- cr1, major_0x13988_0x148 + bge cr1, major_0x13988_0x148 li r8, 0x40 lvx v4, r8, r10 major_0x13988_0x148 vor v5, v31, v31 - ble- cr1, major_0x13988_0x158 + ble cr1, major_0x13988_0x158 li r9, 0x50 lvx v5, r9, r10 major_0x13988_0x158 vor v6, v31, v31 - bne- cr1, major_0x13988_0x168 + bne cr1, major_0x13988_0x168 li r8, 0x60 lvx v6, r8, r10 major_0x13988_0x168 vor v7, v31, v31 - bns- cr1, major_0x13988_0x178 + bns cr1, major_0x13988_0x178 li r9, 0x70 lvx v7, r9, r10 major_0x13988_0x178 vor v8, v31, v31 - bge- cr2, major_0x13988_0x188 + bge cr2, major_0x13988_0x188 li r8, 0x80 lvx v8, r8, r10 major_0x13988_0x188 vor v9, v31, v31 - ble- cr2, major_0x13988_0x198 + ble cr2, major_0x13988_0x198 li r9, 0x90 lvx v9, r9, r10 major_0x13988_0x198 vor v10, v31, v31 - bne- cr2, major_0x13988_0x1a8 + bne cr2, major_0x13988_0x1a8 li r8, 160 lvx v10, r8, r10 major_0x13988_0x1a8 vor v11, v31, v31 - bns- cr2, major_0x13988_0x1b8 + bns cr2, major_0x13988_0x1b8 li r9, 0xb0 lvx v11, r9, r10 major_0x13988_0x1b8 vor v12, v31, v31 - bge- cr3, major_0x13988_0x1c8 + bge cr3, major_0x13988_0x1c8 li r8, 0xc0 lvx v12, r8, r10 major_0x13988_0x1c8 vor v13, v31, v31 - ble- cr3, major_0x13988_0x1d8 + ble cr3, major_0x13988_0x1d8 li r9, 0xd0 lvx v13, r9, r10 major_0x13988_0x1d8 vor v14, v31, v31 - bne- cr3, major_0x13988_0x1e8 + bne cr3, major_0x13988_0x1e8 li r8, 0xe0 lvx v14, r8, r10 major_0x13988_0x1e8 vor v15, v31, v31 - bns- cr3, major_0x13988_0x1f8 + bns cr3, major_0x13988_0x1f8 li r9, 240 lvx v15, r9, r10 major_0x13988_0x1f8 vor v16, v31, v31 - bge- cr4, major_0x13988_0x208 + bge cr4, major_0x13988_0x208 li r8, 0x100 lvx v16, r8, r10 major_0x13988_0x208 vor v17, v31, v31 - ble- cr4, major_0x13988_0x218 + ble cr4, major_0x13988_0x218 li r9, 0x110 lvx v17, r9, r10 major_0x13988_0x218 vor v18, v31, v31 - bne- cr4, major_0x13988_0x228 + bne cr4, major_0x13988_0x228 li r8, 0x120 lvx v18, r8, r10 major_0x13988_0x228 vor v19, v31, v31 - bns- cr4, major_0x13988_0x238 + bns cr4, major_0x13988_0x238 li r9, 0x130 lvx v19, r9, r10 major_0x13988_0x238 vor v20, v31, v31 - bge- cr5, major_0x13988_0x248 + bge cr5, major_0x13988_0x248 li r8, 320 lvx v20, r8, r10 major_0x13988_0x248 vor v21, v31, v31 - ble- cr5, major_0x13988_0x258 + ble cr5, major_0x13988_0x258 li r9, 0x150 lvx v21, r9, r10 major_0x13988_0x258 vor v22, v31, v31 - bne- cr5, major_0x13988_0x268 + bne cr5, major_0x13988_0x268 li r8, 0x160 lvx v22, r8, r10 major_0x13988_0x268 vor v23, v31, v31 - bns- cr5, major_0x13988_0x278 + bns cr5, major_0x13988_0x278 li r9, 0x170 lvx v23, r9, r10 major_0x13988_0x278 vor v24, v31, v31 - bge- cr6, major_0x13988_0x288 + bge cr6, major_0x13988_0x288 li r8, 0x180 lvx v24, r8, r10 major_0x13988_0x288 vor v25, v31, v31 - ble- cr6, major_0x13988_0x298 + ble cr6, major_0x13988_0x298 li r9, 400 lvx v25, r9, r10 major_0x13988_0x298 vor v26, v31, v31 - bne- cr6, major_0x13988_0x2a8 + bne cr6, major_0x13988_0x2a8 li r8, 0x1a0 lvx v26, r8, r10 major_0x13988_0x2a8 vor v27, v31, v31 - bns- cr6, major_0x13988_0x2b8 + bns cr6, major_0x13988_0x2b8 li r9, 0x1b0 lvx v27, r9, r10 major_0x13988_0x2b8 vor v28, v31, v31 - bge- cr7, major_0x13988_0x2c8 + bge cr7, major_0x13988_0x2c8 li r8, 0x1c0 lvx v28, r8, r10 major_0x13988_0x2c8 vor v29, v31, v31 - ble- cr7, major_0x13988_0x2d8 + ble cr7, major_0x13988_0x2d8 li r9, 0x1d0 lvx v29, r9, r10 major_0x13988_0x2d8 vor v30, v31, v31 - bne- cr7, major_0x13988_0x2e8 + bne cr7, major_0x13988_0x2e8 li r8, 480 lvx v30, r8, r10 major_0x13988_0x2e8 vor v31, v31, v31 - bns- cr7, major_0x13988_0x2f8 + bns cr7, major_0x13988_0x2f8 li r9, 0x1f0 lvx v31, r9, r10 @@ -508,10 +508,10 @@ Save_v0_v31 ; OUTSIDE REFERER mfspr r5, vrsave lwz r2, 0x00d8(r6) cmplwi r2, 0x00 - beqlr- + beqlr andis. r3, r11, 0x200 stw r5, 0x0210(r2) - beqlr- + beqlr mfmsr r3 rlwinm r11, r11, 0, 7, 5 oris r3, r3, 0x200 @@ -525,152 +525,152 @@ Save_v0_v31 ; OUTSIDE REFERER mfvscr v0 li r3, 0x200 stvx v0, r3, r2 - bne- Save_v0_v31_0x5c + bne Save_v0_v31_0x5c li r3, 0x20 stvx v2, r3, r2 Save_v0_v31_0x5c - bns- Save_v0_v31_0x68 + bns Save_v0_v31_0x68 li r4, 0x30 stvx v3, r4, r2 Save_v0_v31_0x68 - bge- cr1, Save_v0_v31_0x74 + bge cr1, Save_v0_v31_0x74 li r3, 0x40 stvx v4, r3, r2 Save_v0_v31_0x74 - ble- cr1, Save_v0_v31_0x80 + ble cr1, Save_v0_v31_0x80 li r4, 0x50 stvx v5, r4, r2 Save_v0_v31_0x80 - bne- cr1, Save_v0_v31_0x8c + bne cr1, Save_v0_v31_0x8c li r3, 0x60 stvx v6, r3, r2 Save_v0_v31_0x8c - bns- cr1, Save_v0_v31_0x98 + bns cr1, Save_v0_v31_0x98 li r4, 0x70 stvx v7, r4, r2 Save_v0_v31_0x98 - bge- cr2, Save_v0_v31_0xa4 + bge cr2, Save_v0_v31_0xa4 li r3, 0x80 stvx v8, r3, r2 Save_v0_v31_0xa4 - ble- cr2, Save_v0_v31_0xb0 + ble cr2, Save_v0_v31_0xb0 li r4, 0x90 stvx v9, r4, r2 Save_v0_v31_0xb0 - bne- cr2, Save_v0_v31_0xbc + bne cr2, Save_v0_v31_0xbc li r3, 160 stvx v10, r3, r2 Save_v0_v31_0xbc - bns- cr2, Save_v0_v31_0xc8 + bns cr2, Save_v0_v31_0xc8 li r4, 0xb0 stvx v11, r4, r2 Save_v0_v31_0xc8 - bge- cr3, Save_v0_v31_0xd4 + bge cr3, Save_v0_v31_0xd4 li r3, 0xc0 stvx v12, r3, r2 Save_v0_v31_0xd4 - ble- cr3, Save_v0_v31_0xe0 + ble cr3, Save_v0_v31_0xe0 li r4, 0xd0 stvx v13, r4, r2 Save_v0_v31_0xe0 - bne- cr3, Save_v0_v31_0xec + bne cr3, Save_v0_v31_0xec li r3, 0xe0 stvx v14, r3, r2 Save_v0_v31_0xec - bns- cr3, Save_v0_v31_0xf8 + bns cr3, Save_v0_v31_0xf8 li r4, 240 stvx v15, r4, r2 Save_v0_v31_0xf8 - bge- cr4, Save_v0_v31_0x104 + bge cr4, Save_v0_v31_0x104 li r3, 0x100 stvx v16, r3, r2 Save_v0_v31_0x104 - ble- cr4, Save_v0_v31_0x110 + ble cr4, Save_v0_v31_0x110 li r4, 0x110 stvx v17, r4, r2 Save_v0_v31_0x110 - bne- cr4, Save_v0_v31_0x11c + bne cr4, Save_v0_v31_0x11c li r3, 0x120 stvx v18, r3, r2 Save_v0_v31_0x11c - bns- cr4, Save_v0_v31_0x128 + bns cr4, Save_v0_v31_0x128 li r4, 0x130 stvx v19, r4, r2 Save_v0_v31_0x128 - bge- cr5, Save_v0_v31_0x134 + bge cr5, Save_v0_v31_0x134 li r3, 320 stvx v20, r3, r2 Save_v0_v31_0x134 - ble- cr5, Save_v0_v31_0x140 + ble cr5, Save_v0_v31_0x140 li r4, 0x150 stvx v21, r4, r2 Save_v0_v31_0x140 - bne- cr5, Save_v0_v31_0x14c + bne cr5, Save_v0_v31_0x14c li r3, 0x160 stvx v22, r3, r2 Save_v0_v31_0x14c - bns- cr5, Save_v0_v31_0x158 + bns cr5, Save_v0_v31_0x158 li r4, 0x170 stvx v23, r4, r2 Save_v0_v31_0x158 - bge- cr6, Save_v0_v31_0x164 + bge cr6, Save_v0_v31_0x164 li r3, 0x180 stvx v24, r3, r2 Save_v0_v31_0x164 - ble- cr6, Save_v0_v31_0x170 + ble cr6, Save_v0_v31_0x170 li r4, 400 stvx v25, r4, r2 Save_v0_v31_0x170 - bne- cr6, Save_v0_v31_0x17c + bne cr6, Save_v0_v31_0x17c li r3, 0x1a0 stvx v26, r3, r2 Save_v0_v31_0x17c - bns- cr6, Save_v0_v31_0x188 + bns cr6, Save_v0_v31_0x188 li r4, 0x1b0 stvx v27, r4, r2 Save_v0_v31_0x188 - bge- cr7, Save_v0_v31_0x194 + bge cr7, Save_v0_v31_0x194 li r3, 0x1c0 stvx v28, r3, r2 Save_v0_v31_0x194 - ble- cr7, Save_v0_v31_0x1a0 + ble cr7, Save_v0_v31_0x1a0 li r4, 0x1d0 stvx v29, r4, r2 Save_v0_v31_0x1a0 - bne- cr7, Save_v0_v31_0x1ac + bne cr7, Save_v0_v31_0x1ac li r3, 480 stvx v30, r3, r2 Save_v0_v31_0x1ac - bns- cr7, Save_v0_v31_0x1b8 + bns cr7, Save_v0_v31_0x1b8 li r4, 0x1f0 stvx v31, r4, r2 @@ -705,8 +705,8 @@ SchTaskUnrdy ; Panic if State==0, return early if this task is not enqueued (i.e. LLL.Next==0) cmpwi cr1, r18, 0 cmpwi r17, 0 - beq+ cr1, Local_Panic - beq- @return_early + beq cr1, Local_Panic + beq @return_early RemoveFromList r16, scratch1=r17, scratch2=r18 @@ -728,8 +728,8 @@ SchTaskUnrdy cmpwi r18, 0 ; Crash if we popped from an empty queue! lwz r16, PSA.PriorityFlags(r1) - blt+ Local_Panic - bne- @return_early + blt Local_Panic + bne @return_early lwz r18, ReadyQueue.LLL + LLL.Freeform(r17) andc r16, r16, r18 ; If this queue is empty then unset the corresponding stw r16, PSA.PriorityFlags(r1) ; bit in PSA.PriorityFlags @@ -769,7 +769,7 @@ _SchRdyTaskCommon lis r17, 0x8000 ; ...0000 cmpwi r16, 0 lbz r18, Task.Priority(r8) - bne+ Local_Panic + bne Local_Panic ; Set the KDP priority flag for this task. @@ -798,7 +798,7 @@ _SchRdyTaskCommon addi r16, r8, Task.QueueMember - bne- cr1, @as_next + bne cr1, @as_next stw r17, LLL.Freeform(r16) @@ -847,7 +847,7 @@ SchSwitchSpace lwz r16, AddressSpace.Signature(r8) lisori r17, AddressSpace.kSignature cmpw r16, r17 - bne+ Local_Panic + bne Local_Panic ; Intend to skip the dssall instruction if Altivec is... present? absent? rlwinm. r16, r7, 0, 12, 12 ; seems to be leftover from Init.s Altivec testing @@ -887,7 +887,7 @@ SchSwitchSpace mtsr 14, r16 mtsr 15, r17 - beq- @skip_dssall + beq @skip_dssall dssall ; flush pending vector ops? @skip_dssall @@ -901,7 +901,7 @@ SchSwitchSpace mfpvr r16 rlwinm. r16, r16, 0, 0, 14 cmpwi cr1, r9, 0 ; arg r9 is 0 when called from Init.s - beq- @is_601 + beq @is_601 ; Fill the BATs on "real" PowerPC CPUs @@ -911,8 +911,8 @@ SchSwitchSpace cmplw r16, r17 lwz r17, AddressSpace.BAT0L(r8) - beq- cr1, @definitely_set_BAT0 - beq- @skip_setting_BAT0 + beq cr1, @definitely_set_BAT0 + beq @skip_setting_BAT0 @definitely_set_BAT0 ; r9 is zero or the addrspc bats match low physical memory mtspr dbat0u, r0 @@ -929,8 +929,8 @@ SchSwitchSpace lwz r17, AddressSpace.BAT1U(r9) cmplw r16, r17 lwz r17, AddressSpace.BAT1L(r8) - beq- cr1, @definitely_set_BAT1 - beq- @skip_setting_BAT1 + beq cr1, @definitely_set_BAT1 + beq @skip_setting_BAT1 @definitely_set_BAT1 mtspr dbat1u, r0 @@ -947,8 +947,8 @@ SchSwitchSpace lwz r17, AddressSpace.BAT2U(r9) cmplw r16, r17 lwz r17, AddressSpace.BAT2L(r8) - beq- cr1, @definitely_set_BAT2 - beq- @skip_setting_BAT2 + beq cr1, @definitely_set_BAT2 + beq @skip_setting_BAT2 @definitely_set_BAT2 mtspr dbat2u, r0 @@ -965,8 +965,8 @@ SchSwitchSpace lwz r17, AddressSpace.BAT3U(r9) cmplw r16, r17 lwz r17, AddressSpace.BAT3L(r8) - beq- cr1, @definitely_set_BAT3 - beq- @skip_setting_BAT3 + beq cr1, @definitely_set_BAT3 + beq @skip_setting_BAT3 @definitely_set_BAT3 mtspr dbat3u, r0 @@ -986,11 +986,11 @@ SchSwitchSpace lwz r16, AddressSpace.ExtraBAT0U(r8) rlwinm. r17, r17, 0, 31-NKProcessorInfo.hasExtraBATs, 31-NKProcessorInfo.hasExtraBATs lwz r17, AddressSpace.ExtraBAT0U(r9) - beq- @return + beq @return cmplw r16, r17 lwz r17, AddressSpace.ExtraBAT0L(r8) - beq- cr1, @definitely_set_ExtraBAT0 - beq- @skip_setting_ExtraBAT0 + beq cr1, @definitely_set_ExtraBAT0 + beq @skip_setting_ExtraBAT0 @definitely_set_ExtraBAT0 mtspr 0x238, r0 @@ -1006,8 +1006,8 @@ SchSwitchSpace lwz r17, AddressSpace.ExtraBAT1U(r9) cmplw r16, r17 lwz r17, AddressSpace.ExtraBAT1L(r8) - beq- cr1, @definitely_set_ExtraBAT1 - beq- @skip_setting_ExtraBAT1 + beq cr1, @definitely_set_ExtraBAT1 + beq @skip_setting_ExtraBAT1 @definitely_set_ExtraBAT1 mtspr 0x23a, r0 @@ -1023,8 +1023,8 @@ SchSwitchSpace lwz r17, AddressSpace.ExtraBAT2U(r9) cmplw r16, r17 lwz r17, AddressSpace.ExtraBAT2L(r8) - beq- cr1, @definitely_set_ExtraBAT2 - beq- @skip_setting_ExtraBAT2 + beq cr1, @definitely_set_ExtraBAT2 + beq @skip_setting_ExtraBAT2 @definitely_set_ExtraBAT2 mtspr 0x23c, r0 @@ -1040,8 +1040,8 @@ SchSwitchSpace lwz r17, AddressSpace.ExtraBAT3U(r9) cmplw r16, r17 lwz r17, AddressSpace.ExtraBAT3L(r8) - beq- cr1, @definitely_set_ExtraBAT3 - beq- @skip_setting_ExtraBAT3 + beq cr1, @definitely_set_ExtraBAT3 + beq @skip_setting_ExtraBAT3 @definitely_set_ExtraBAT3 mtspr 0x23e, r0 @@ -1062,8 +1062,8 @@ SchSwitchSpace lwz r17, 0x0080(r9) cmplw r16, r17 lwz r17, 0x0084(r8) - beq- cr1, SetAddrSpcRegisters_0x284 - beq- SetAddrSpcRegisters_0x29c + beq cr1, SetAddrSpcRegisters_0x284 + beq SetAddrSpcRegisters_0x29c SetAddrSpcRegisters_0x284: rlwimi r16, r17, 0, 25, 31 @@ -1078,8 +1078,8 @@ SetAddrSpcRegisters_0x29c: lwz r17, 0x0088(r9) cmplw r16, r17 lwz r17, 0x008c(r8) - beq- cr1, SetAddrSpcRegisters_0x2b4 - beq- SetAddrSpcRegisters_0x2cc + beq cr1, SetAddrSpcRegisters_0x2b4 + beq SetAddrSpcRegisters_0x2cc SetAddrSpcRegisters_0x2b4: rlwimi r16, r17, 0, 25, 31 @@ -1094,8 +1094,8 @@ SetAddrSpcRegisters_0x2cc: lwz r17, 0x0090(r9) cmplw r16, r17 lwz r17, 0x0094(r8) - beq- cr1, SetAddrSpcRegisters_0x2e4 - beq- SetAddrSpcRegisters_0x2fc + beq cr1, SetAddrSpcRegisters_0x2e4 + beq SetAddrSpcRegisters_0x2fc SetAddrSpcRegisters_0x2e4: rlwimi r16, r17, 0, 25, 31 @@ -1110,8 +1110,8 @@ SetAddrSpcRegisters_0x2fc: lwz r17, 0x0098(r9) cmplw r16, r17 lwz r17, 0x009c(r8) - beq- cr1, SetAddrSpcRegisters_0x314 - beqlr- + beq cr1, SetAddrSpcRegisters_0x314 + beqlr SetAddrSpcRegisters_0x314: rlwimi r16, r17, 0, 25, 31 @@ -1133,7 +1133,7 @@ SchReturn lwz r1, EWA.PA_KDP(r1) cmpwi cr1, r8, 0 - bne- SchExitInterrupt + bne SchExitInterrupt beq+ cr1, SchExitInterrupt bl SchSaveStartingAtR14 @@ -1159,15 +1159,15 @@ SchEval bl SchFiddlePriorityShifty lbz r27, 0x0019(r31) - blt- major_0x142dc_0x58 + blt major_0x142dc_0x58 li r26, 0x01 - beq- major_0x142dc_0x38 + beq major_0x142dc_0x38 li r26, 0x00 major_0x142dc_0x38 cmpw r27, r26 mr r8, r31 - beq- major_0x142dc_0x58 + beq major_0x142dc_0x58 bl SchTaskUnrdy stb r26, 0x0019(r31) mr r8, r31 @@ -1182,7 +1182,7 @@ major_0x142dc_0x5c mr r30, r31 cmpwi r27, 0x00 cntlzw r26, r27 - beq- major_0x142dc_0x140 + beq major_0x142dc_0x140 addi r25, r1, -0x9f0 mulli r26, r26, 0x20 add r26, r26, r25 @@ -1195,12 +1195,12 @@ major_0x142dc_0x80 lhz r25, 0x001a(r30) rlwinm. r8, r24, 0, 25, 26 cmpw cr1, r25, r28 - beq- major_0x142dc_0xb8 - beq- cr1, major_0x142dc_0xb8 + beq major_0x142dc_0xb8 + beq cr1, major_0x142dc_0xb8 lwz r29, 0x0008(r29) addi r30, r29, -0x08 cmpw r29, r26 - bne+ major_0x142dc_0x80 + bne major_0x142dc_0x80 lwz r25, 0x0000(r26) andc r27, r27, r25 b major_0x142dc_0x5c @@ -1211,8 +1211,8 @@ major_0x142dc_0xb8 lbz r27, 0x0019(r31) cmpwi cr1, r25, 0x02 cmpw cr2, r28, r27 - bne- cr1, major_0x142dc_0xd8 - blt- cr2, major_0x142dc_0xd8 + bne cr1, major_0x142dc_0xd8 + blt cr2, major_0x142dc_0xd8 mr r30, r31 major_0x142dc_0xd8 ; OUTSIDE REFERER @@ -1220,7 +1220,7 @@ major_0x142dc_0xd8 ; OUTSIDE REFERER addi r29, r30, 0x08 cmpwi r28, 0x00 lwz r26, 0x0008(r30) - beq- major_0x142dc_0x140 + beq major_0x142dc_0x140 RemoveFromList r29, scratch1=r28, scratch2=r27 lwz r27, 0x001c(r30) lwz r28, 0x0014(r26) @@ -1231,8 +1231,8 @@ major_0x142dc_0xd8 ; OUTSIDE REFERER addi r28, r28, -0x01 cmpwi r28, 0x00 stw r28, 0x0010(r26) - bltl+ Local_Panic - bne- major_0x142dc_0x140 + bltl Local_Panic + bne major_0x142dc_0x140 lwz r28, 0x0000(r26) andc r27, r27, r28 stw r27, -0x0970(r1) @@ -1255,8 +1255,8 @@ major_0x142dc_0x140 major_0x142dc_0x184 cmpw cr3, r30, r31 rlwinm. r8, r25, 0, 27, 27 - bne- cr3, major_0x14548 - bne- major_0x14548 + bne cr3, major_0x14548 + bne major_0x14548 bl GetTime bl major_0x148ec lwz r27, 0x0064(r31) @@ -1314,7 +1314,7 @@ SchExitInterrupt ; OUTSIDE REFERER mtspr srr0, r10 mtspr srr1, r11 rlwinm. r8, r8, 0, 27, 27 - beq- SchExitInterrupt_0x2c + beq SchExitInterrupt_0x2c mfxer r8 rlwinm r8, r8, 0, 23, 21 rlwimi r8, r7, 19, 23, 23 @@ -1358,7 +1358,7 @@ major_0x14548 ; OUTSIDE REFERER stw r8, 0x00f4(r6) mfspr r8, pvr rlwinm. r8, r8, 0, 0, 14 - bne- major_0x14548_0x58 + bne major_0x14548_0x58 mfspr r8, mq stw r8, 0x00c4(r6) @@ -1372,11 +1372,11 @@ major_0x14548_0x58 lwz r8, 0x0018(r14) stw r5, 0x012c(r6) stw r8, 0x0134(r6) - bnel+ Save_f0_f31 + bnel Save_f0_f31 lwz r31, -0x0008(r14) lwz r30, -0x0260(r14) rlwinm. r8, r7, 0, 12, 12 - bnel+ Save_v0_v31 + bnel Save_v0_v31 stw r11, 0x00a4(r6) lwz r8, 0x00e8(r31) addi r8, r8, 0x01 @@ -1390,10 +1390,10 @@ major_0x14548_0x58 stb r28, -0x0117(r14) cmplw r30, r31 lwz r16, 0x0010(r31) - beq- major_0x14548_0xd4 + beq major_0x14548_0xd4 cmpwi r16, 0x00 mr r8, r31 - beql+ SchRdyTaskNow + beql SchRdyTaskNow major_0x14548_0xd4 mfsprg r19, 0 @@ -1422,7 +1422,7 @@ major_0x14548_0xd4 lwz r18, 0x0070(r30) lwz r9, -0x001c(r19) cmpw r18, r9 - beq- major_0x14548_0x148 + beq major_0x14548_0x148 mr r8, r18 bl SchSwitchSpace @@ -1431,16 +1431,16 @@ major_0x14548_0x148 mtcr r7 lis r28, 0x00 ori r28, r28, 0x10 - bne- cr2, major_0x14548_0x20c + bne cr2, major_0x14548_0x20c and. r28, r28, r27 li r8, 0x00 - beq- major_0x14548_0x20c + beq major_0x14548_0x20c andc r27, r27, r28 lwz r29, PSA.MCR(r1) stw r27, 0x0064(r30) stw r8, PSA.MCR(r1) - blt- cr2, major_0x14548_0x1cc - bsol+ cr6, Local_Panic + blt cr2, major_0x14548_0x1cc + bsol cr6, Local_Panic clrlwi r8, r7, 0x08 stw r8, 0x0000(r6) lwz r6, KDP.PA_ECB(r1) @@ -1455,7 +1455,7 @@ major_0x14548_0x148 stw r26, -0x000c(r19) lwz r13, 0x00dc(r6) lwz r11, 0x00a4(r6) - bsol+ cr6, Local_Panic + bsol cr6, Local_Panic rlwimi r11, r7, 0, 20, 23 rlwimi r7, r8, 0, 9, 16 rlwimi r11, r27, 24, 29, 29 @@ -1469,7 +1469,7 @@ major_0x14548_0x1cc lwz r18, 0x067c(r1) cmplwi r17, 0xffff lwz r26, KDP.PostIntMaskInit(r1) - beq- major_0x14548_0x1f8 + beq major_0x14548_0x1f8 sth r17, 0x0000(r18) li r17, -0x01 sth r17, -0x043c(r1) @@ -1477,7 +1477,7 @@ major_0x14548_0x1cc major_0x14548_0x1f8 cmpwi r29, 0x00 or r13, r13, r29 - bne- major_0x14548_0x20c + bne major_0x14548_0x20c lwz r29, KDP.ClearIntMaskInit(r1) and r13, r13, r29 @@ -1485,7 +1485,7 @@ major_0x14548_0x20c lwz r29, 0x00d8(r6) cmpwi r29, 0x00 lwz r8, 0x0210(r29) - beq- major_0x14548_0x220 + beq major_0x14548_0x220 mtspr vrsave, r8 major_0x14548_0x220 @@ -1497,7 +1497,7 @@ major_0x14548_0x220 mtctr r8 mfspr r8, pvr rlwinm. r8, r8, 0, 0, 14 - bne- major_0x14548_0x24c + bne major_0x14548_0x24c lwz r8, 0x00c4(r6) mtspr mq, r8 @@ -1539,7 +1539,7 @@ major_0x14548_0x24c lwz r29, 0x01ec(r6) lwz r30, 0x01f4(r6) lwz r31, 0x01fc(r6) - beq- major_0x14548_0x380 + beq major_0x14548_0x380 mfmsr r8 ori r8, r8, 0x2000 ori r11, r11, 0x2000 @@ -1611,10 +1611,10 @@ major_0x148ec ; OUTSIDE REFERER lwz r17, 0x00dc(r31) lwz r16, 0x00d8(r31) andi. r22, r17, 0x01 - bne- major_0x148ec_0x58 + bne major_0x148ec_0x58 subfc r17, r19, r17 subfe. r16, r18, r16 - bge- major_0x148ec_0x54 + bge major_0x148ec_0x54 li r16, 0x00 li r17, 0x00 @@ -1626,9 +1626,9 @@ major_0x148ec_0x58 stw r17, 0x00dc(r31) lwz r17, 0x00fc(r31) andi. r22, r17, 0x01 - bne- major_0x148ec_0x78 + bne major_0x148ec_0x78 subf. r17, r19, r17 - bge- major_0x148ec_0x78 + bge major_0x148ec_0x78 li r17, 0x00 major_0x148ec_0x78 @@ -1641,7 +1641,7 @@ major_0x148ec_0x78 lwz r18, 0x0010(r18) cmpwi cr1, r19, 0x02 cmpwi r18, 0x00 - bge- cr1, major_0x148ec_0xb0 + bge cr1, major_0x148ec_0xb0 lwz r16, 0x00fc(r30) lwz r17, 0x00fc(r30) srawi r16, r16, 31 @@ -1650,8 +1650,8 @@ major_0x148ec_0x78 major_0x148ec_0xb0 lwz r16, 0x00d8(r30) lwz r17, 0x00dc(r30) - bgt- major_0x148ec_0xc8 - bne- cr1, major_0x148ec_0xc8 + bgt major_0x148ec_0xc8 + bne cr1, major_0x148ec_0xc8 li r16, 0x00 lwz r17, 0x0f2c(r1) @@ -1689,7 +1689,7 @@ major_0x149d4_0xc: lwz r16, Task.QueueMember + LLL.Freeform(r8) ; points to RDYQ cmpwi r18, 0 lwz r17, Task.Weight(r8) - beq+ Local_Panic + beq Local_Panic ; Get queue info lwz r18, ReadyQueue.TotalWeight(r16) @@ -1699,10 +1699,10 @@ major_0x149d4_0xc: ; Skip calculation if only task in queue cmpw r18, r17 rlwinm r17, r17, 10, 0, 22 ; r17 *= 1024, but with minor masking typo? - beq- @is_only_weighted_task + beq @is_only_weighted_task divw. r18, r17, r18 ; r8 = my share of this queue's weight, out of 1024 - ble- @no_time ; if not specified, fall back on 1/1024 + ble @no_time ; if not specified, fall back on 1/1024 ; t = t * r18 = my share of queue's time, out of 1024 mulhw r17, r20, r18 @@ -1723,7 +1723,7 @@ major_0x149d4_0xc: lbz r18, Task.Priority(r8) cmpwi r18, Task.kNominalPriority ori r20, r20, 1 ; why make this odd? - bge- @nominal_or_idle + bge @nominal_or_idle ;critical or latency protected stw r20, 0x00fc(r8) @@ -1736,9 +1736,9 @@ major_0x149d4_0xc: cmpwi r16, 0 cmplwi cr2, r17, 0 - blt- @definitely_do_the_thing - bgtlr- - bgtlr- cr2 + blt @definitely_do_the_thing + bgtlr + bgtlr cr2 @definitely_do_the_thing ;double-int is negative or zero @@ -1769,22 +1769,22 @@ SchFiddlePriorityShifty ; OUTSIDE REFERER lwz r18, KDP.PA_ECB(r1) nand. r8, r8, r8 lwz r17, ContextBlock.PriorityShifty(r18) - bltlr- ; return if flag 10 was unset + bltlr ; return if flag 10 was unset cmpwi r17, 0 rlwinm r9, r17, 0, 22, 22 - blt- @pshifty_high_bit_set + blt @pshifty_high_bit_set cmpwi r9, 0x200 lwz r16, ContextBlock.r25(r18) - beq- @pshifty_bit_22_set + beq @pshifty_bit_22_set clrlwi r8, r16, 29 clrlwi r9, r17, 28 cmpwi r8, 6 - bgt- @pshifty_bit_22_set + bgt @pshifty_bit_22_set cmpw r8, r9 - bltlr- + bltlr cmpw r8, r8 @pshifty_bit_22_set @@ -1815,7 +1815,7 @@ FlagSchEvaluationIfTaskRequires ; OUTSIDE REFERER mfsprg r15, 0 rlwinm. r16, r16, 0, Task.kFlag25, Task.kFlag26 - bne- FlagSchEval + bne FlagSchEval addi r16, r15, EWA.CPUBase lbz r17, Task.Priority(r8) @@ -1827,7 +1827,7 @@ FlagSchEvaluationIfTaskRequires ; OUTSIDE REFERER lwz r14, CoherenceGroup.ScheduledCpuCount(r19) cmpwi r14, 2 - blt- FlagSchEval + blt FlagSchEval ; Multiprocessor systems: @@ -1855,8 +1855,8 @@ FlagSchEvaluationIfTaskRequires ; OUTSIDE REFERER cmpw cr1, r17, r20 rlwinm. r21, r21, 0, CPU.kFlagScheduled, CPU.kFlagScheduled - bge- cr1, @cpu_not_best_for_task - beq- @cpu_not_best_for_task + bge cr1, @cpu_not_best_for_task + beq @cpu_not_best_for_task mr r17, r20 mr r18, r16 @@ -1867,8 +1867,8 @@ FlagSchEvaluationIfTaskRequires ; OUTSIDE REFERER cmpwi cr1, r14, 0 cmpw r16, r19 - ble- cr1, @exit_loop - beq+ @loop_hit_the_coherence_group ; skip the owner of the linked list + ble cr1, @exit_loop + beq @loop_hit_the_coherence_group ; skip the owner of the linked list b @loop @exit_loop @@ -1879,13 +1879,13 @@ FlagSchEvaluationIfTaskRequires ; OUTSIDE REFERER ; No suitable CPU found (all running important-er tasks) lbz r16, Task.Priority(r8) cmpw r17, r16 - blelr- + blelr ; Was this CPU the most suitable? lhz r17, EWA.CPUIndex(r15) lhz r18, CPU.EWA + EWA.CPUIndex(r18) cmpw r18, r17 - bne- AlertSchEvalOnOtherCPU + bne AlertSchEvalOnOtherCPU ; otherwise fall through to FlagSchEvalOnThisCPU @@ -1907,7 +1907,7 @@ FlagSchEval lhz r18, Task.CPUIndex(r8) lhz r17, EWA.CPUIndex(r15) cmpw r17, r18 - beq+ FlagSchEvalOnThisCPU + beq FlagSchEvalOnThisCPU ; To force a scheduler evaluation to run on *another* CPU, we interrupt it @@ -2118,12 +2118,12 @@ SchIdleTask ; If the loop started with r31==0, make another round of syscalls cmpwi r31, 0 - beq- @make_calls + beq @make_calls ; But if we counted down from >=1 to zero, then just do that again subi r31, r31, 1 cmplwi r31, 0 - bgt- @startagain + bgt @startagain @make_calls @@ -2135,14 +2135,14 @@ SchIdleTask li r0, 46 ; KCCpuPlugin sc cmpwi r3, 0 - beq- @startagain + beq @startagain li r3, 1 li r4, 0 twi 31, r31, 5 ; PowerCall(1) cmpwi r3, 0 - beq- @startagain + beq @startagain lisori r31, 10*1000000 diff --git a/NanoKernel/NKScreenConsole.s b/NanoKernel/NKScreenConsole.s index ec1df2b..32ee9b1 100644 --- a/NanoKernel/NKScreenConsole.s +++ b/NanoKernel/NKScreenConsole.s @@ -29,7 +29,7 @@ InitScreenConsole ; OUTSIDE REFERER InitScreenConsole_0x18 cmplw r30, r31 addi r29, r31, 0x04 - bge- InitScreenConsole_0x2c + bge InitScreenConsole_0x2c stwu r29, -0x1000(r31) b InitScreenConsole_0x18 @@ -63,7 +63,7 @@ ScreenConsole_putchar ; OUTSIDE REFERER addi r30, r30, 0x01 andi. r29, r30, 0xfff stw r30, -0x0404(r1) - bnelr- + bnelr lwz r30, -0x1000(r30) stw r30, -0x0404(r1) blr @@ -83,11 +83,11 @@ ScreenConsole_redraw ; OUTSIDE REFERER mtsprg 3, r26 lwz r26, 0x0edc(r1) andi. r26, r26, 0x08 - beq- major_0x18bec + beq major_0x18bec lwz r14, -0x0404(r1) lwz r15, -0x0400(r1) cmpw r14, r15 - beq- major_0x18bec + beq major_0x18bec bl major_0x18c18 ScreenConsole_redraw_0x40 @@ -107,7 +107,7 @@ ScreenConsole_redraw_0x40 ScreenConsole_redraw_0x74 cmpw r14, r15 - beq- ScreenConsole_redraw_0x118 + beq ScreenConsole_redraw_0x118 lbz r25, 0x0000(r15) addi r15, r15, 0x01 andi. r17, r15, 0xfff @@ -117,27 +117,27 @@ ScreenConsole_redraw_0x74 ScreenConsole_redraw_0x90 cmplwi r25, 0x0d cmplwi cr1, r25, 0x0a - beq+ ScreenConsole_redraw_0x74 - beq- cr1, ScreenConsole_redraw_0xc0 + beq ScreenConsole_redraw_0x74 + beq cr1, ScreenConsole_redraw_0xc0 cmpwi r25, 0x00 cmpwi cr1, r25, 0x07 - beq+ ScreenConsole_redraw_0x74 - beq- cr1, ScreenConsole_redraw_0xe4 + beq ScreenConsole_redraw_0x74 + beq cr1, ScreenConsole_redraw_0xe4 bl major_0x18e54 lhz r17, -0x0358(r1) cmpw r9, r17 - blt+ ScreenConsole_redraw_0x74 + blt ScreenConsole_redraw_0x74 ScreenConsole_redraw_0xc0 cmpwi r16, 0x00 - bne- ScreenConsole_redraw_0xcc + bne ScreenConsole_redraw_0xcc mr r16, r15 ScreenConsole_redraw_0xcc bl funny_thing lhz r17, -0x0356(r1) cmpw r10, r17 - blt+ ScreenConsole_redraw_0x74 + blt ScreenConsole_redraw_0x74 stw r16, -0x0400(r1) b ScreenConsole_redraw_0x40 @@ -145,7 +145,7 @@ ScreenConsole_redraw_0xe4 lhz r17, -0x0356(r1) addi r17, r17, -0x01 cmpw r10, r17 - blt+ ScreenConsole_redraw_0x74 + blt ScreenConsole_redraw_0x74 lwz r17, -0x0438(r1) slwi r25, r17, 2 add r25, r25, r17 @@ -155,7 +155,7 @@ ScreenConsole_redraw_0xe4 ScreenConsole_redraw_0x108 mfspr r25, dec subf. r25, r17, r25 - bge+ ScreenConsole_redraw_0x108 + bge ScreenConsole_redraw_0x108 b ScreenConsole_redraw_0x74 ScreenConsole_redraw_0x118 @@ -163,7 +163,7 @@ ScreenConsole_redraw_0x118 mfspr r31, pvr rlwinm. r31, r31, 0, 0, 14 li r31, 0x00 - bne- ScreenConsole_redraw_0x140 + bne ScreenConsole_redraw_0x140 mtspr ibat3l, r31 isync mtspr ibat3u, r18 @@ -195,7 +195,7 @@ major_0x18bec ; OUTSIDE REFERER major_0x18c08 ; OUTSIDE REFERER mfsrin r31, r27 cmpwi r31, 0x00 - beqlr- + beqlr b PagingFunc4 @@ -204,14 +204,14 @@ major_0x18c18 ; OUTSIDE REFERER mflr r13 lwz r27, -0x08f8(r1) cmpwi r27, 0x00 - bne- major_0x18c18_0x40 + bne major_0x18c18_0x40 lwz r27, 0x0630(r1) lhz r31, 0x0378(r27) cmpwi r31, 0x00 - beq- major_0x18c18_0x40 + beq major_0x18c18_0x40 lwz r31, 0x037c(r27) cmpwi r31, 0x00 - beq- major_0x18c18_0x40 + beq major_0x18c18_0x40 stw r31, -0x08f8(r1) lhz r31, 0x0384(r27) sth r31, -0x08f4(r1) @@ -221,33 +221,33 @@ major_0x18c18 ; OUTSIDE REFERER major_0x18c18_0x40 li r27, 0x8a4 bl major_0x18c08 - beq- major_0x18c18_0xe0 + beq major_0x18c18_0xe0 rlwimi. r27, r31, 0, 0, 19 - ble- major_0x18c18_0xe0 + ble major_0x18c18_0xe0 lwz r27, 0x0000(r27) cmpwi r27, 0x00 - ble- major_0x18c18_0xe0 + ble major_0x18c18_0xe0 bl major_0x18c08 - beq- major_0x18c18_0xe0 + beq major_0x18c18_0xe0 rlwimi r27, r31, 0, 0, 19 lwz r27, 0x0000(r27) cmpwi r27, 0x00 - ble- major_0x18c18_0xe0 + ble major_0x18c18_0xe0 addi r27, r27, 0x16 bl major_0x18c08 - beq- major_0x18c18_0xe0 + beq major_0x18c18_0xe0 rlwimi r27, r31, 0, 0, 19 lwz r27, 0x0000(r27) cmpwi r27, 0x00 - ble- major_0x18c18_0xe0 + ble major_0x18c18_0xe0 bl major_0x18c08 - beq- major_0x18c18_0xe0 + beq major_0x18c18_0xe0 rlwimi r27, r31, 0, 0, 19 lwz r27, 0x0000(r27) cmpwi r27, 0x00 - ble- major_0x18c18_0xe0 + ble major_0x18c18_0xe0 bl major_0x18c08 - beq- major_0x18c18_0xe0 + beq major_0x18c18_0xe0 rlwimi r27, r31, 0, 0, 19 lwz r3, 0x0000(r27) lhz r5, 0x0004(r27) @@ -255,7 +255,7 @@ major_0x18c18_0x40 lhz r6, 0x0020(r27) srwi r6, r6, 3 cmplwi r6, 0x08 - bgt- major_0x18c18_0xe0 + bgt major_0x18c18_0xe0 stw r3, -0x08f8(r1) sth r5, -0x08f4(r1) sth r6, -0x08f2(r1) @@ -265,7 +265,7 @@ major_0x18c18_0xe0 lhz r5, -0x08f4(r1) lhz r6, -0x08f2(r1) cmpwi r3, 0x00 - bne- major_0x18d5c + bne major_0x18d5c b major_0x18bec @@ -297,9 +297,9 @@ major_0x18c18_0xe0 major_0x18d5c ; OUTSIDE REFERER cmpwi cr4, r6, 0x02 bl major_0x19ab0 - blt- cr4, major_0x18d5c_0x18 + blt cr4, major_0x18d5c_0x18 bl major_0x19b00 - beq- cr4, major_0x18d5c_0x18 + beq cr4, major_0x18d5c_0x18 bl load_log_colours major_0x18d5c_0x18 @@ -307,7 +307,7 @@ major_0x18d5c_0x18 mfspr r31, pvr rlwinm. r31, r31, 0, 0, 14 li r31, 0x00 - bne- major_0x18d5c_0x3c + bne major_0x18d5c_0x3c mfspr r19, ibat3l mfspr r18, ibat3u mtspr ibat3l, r31 @@ -321,7 +321,7 @@ major_0x18d5c_0x3c major_0x18d5c_0x48 isync rlwinm r29, r3, 0, 0, 7 - beq- major_0x18d5c_0x70 + beq major_0x18d5c_0x70 li r30, 0x7e or r30, r30, r29 li r31, 0x32 @@ -367,8 +367,8 @@ major_0x18e24_0x4 lbz r25, 0x0000(r21) cmplwi r25, 0x00 addi r21, r21, 0x01 - beq- major_0x18e24_0x28 - bge+ cr1, major_0x18e24_0x4 + beq major_0x18e24_0x28 + bge cr1, major_0x18e24_0x4 bl major_0x18e54 b major_0x18e24_0x4 @@ -397,12 +397,12 @@ major_0x18e54 ; OUTSIDE REFERER add r7, r7, r27 add r7, r7, r28 subf. r27, r3, r7 - blt- major_0x18e54_0x174 + blt major_0x18e54_0x174 li r8, 0x00 major_0x18e54_0x50 - beq- cr4, major_0x18e54_0x9c - bgt- cr4, major_0x18e54_0xe0 + beq cr4, major_0x18e54_0x9c + bgt cr4, major_0x18e54_0xe0 lbz r27, 0x0000(r23) rlwinm r27, r27, 28, 28, 29 lwzx r28, r24, r27 @@ -479,7 +479,7 @@ major_0x18e54_0x160 cmplwi r8, 0x0a add r7, r7, r5 addi r23, r23, 0x100 - blt+ major_0x18e54_0x50 + blt major_0x18e54_0x50 major_0x18e54_0x174 addi r9, r9, 0x01 @@ -501,13 +501,13 @@ funny_thing_0xc funny_thing_0x10 lhz r25, -0x0358(r1) cmpw r9, r25 - bge- funny_thing_0x28 + bge funny_thing_0x28 li r25, 0x20 bl major_0x18e54 b funny_thing_0x10 funny_thing_0x28 - beq- cr2, funny_thing_0x3c + beq cr2, funny_thing_0x3c li r9, 0x00 addi r10, r10, 0x01 li r25, 0x20 diff --git a/NanoKernel/NKSleep.s b/NanoKernel/NKSleep.s index 095d3f9..52bd06d 100644 --- a/NanoKernel/NKSleep.s +++ b/NanoKernel/NKSleep.s @@ -28,7 +28,7 @@ MPGetKernelStateSize lwz r8, EWA.CPUBase + CPU.LLL + LLL.Freeform(r9) lwz r9, CoherenceGroup.ScheduledCpuCount(r8) cmpwi r9, 1 - bgt+ Local_ReturnInsufficientResourcesErrFromMPCall + bgt Local_ReturnInsufficientResourcesErrFromMPCall bl KernelStateSize @@ -50,16 +50,16 @@ MPGetKernelState lwz r8, EWA.CPUBase + CPU.LLL + LLL.Freeform(r9) lwz r9, CoherenceGroup.ScheduledCpuCount(r8) cmpwi r9, 1 - bgt+ Local_ReturnInsufficientResourcesErrFromMPCall + bgt Local_ReturnInsufficientResourcesErrFromMPCall clrlwi. r8, r5, 20 - bne+ Local_ReturnParamErrFromMPCall + bne Local_ReturnParamErrFromMPCall bl KernelStateSize cmpw r3, r8 - blt+ Local_ReturnParamErrFromMPCall + blt Local_ReturnParamErrFromMPCall cmpw r4, r9 - blt+ Local_ReturnParamErrFromMPCall + blt Local_ReturnParamErrFromMPCall bl PagingFlushTLB mfsprg r9, 0 @@ -73,7 +73,7 @@ MPGetKernelState mfpvr r8 rlwinm. r8, r8, 0, 0, 14 - bne- @not_601 + bne @not_601 mfspr r8, mq stw r8, ContextBlock.MQ(r6) @not_601 @@ -87,9 +87,9 @@ MPGetKernelState lwz r8, EWA.r6(r9) stw r5, ContextBlock.r5(r6) stw r8, ContextBlock.r6(r6) - bnel+ Save_f0_f31 + bnel Save_f0_f31 rlwinm. r8, r7, 0, 12, 12 ; flags - bnel+ Save_v0_v31 + bnel Save_v0_v31 lwz r3, ContextBlock.r3(r6) lwz r4, ContextBlock.r4(r6) @@ -99,7 +99,7 @@ MPGetKernelState mr r27, r5 addi r29, r1, 800 bl PagingFunc3 - beq+ Local_ReturnInsufficientResourcesErrFromMPCall + beq Local_ReturnInsufficientResourcesErrFromMPCall rlwimi r27, r31, 0, 0, 19 mr r17, r27 addi r15, r17, 0x34 @@ -109,13 +109,13 @@ MPGetKernelState_0xc8 mr r27, r5 addi r29, r1, 800 bl PagingFunc3 - beq+ Local_ReturnInsufficientResourcesErrFromMPCall + beq Local_ReturnInsufficientResourcesErrFromMPCall rlwimi r27, r31, 0, 0, 19 stwu r27, 0x0004(r15) addi r3, r3, -0x01 addi r5, r5, 0x1000 cmpwi r3, 0x00 - bge+ MPGetKernelState_0xc8 + bge MPGetKernelState_0xc8 addi r15, r15, 0x04 subf r15, r17, r15 stw r15, 0x0034(r17) @@ -174,7 +174,7 @@ MPGetKernelState_0x1a4 andi. r19, r18, 0xe00 lhz r16, 0x0002(r30) cmplwi r19, 0xc00 - bne- MPGetKernelState_0x1dc + bne MPGetKernelState_0x1dc addi r16, r16, 0x01 slwi r16, r16, 2 stw r16, 0x0000(r29) @@ -186,12 +186,12 @@ MPGetKernelState_0x1a4 MPGetKernelState_0x1dc cmpwi r15, 0x00 - bne- MPGetKernelState_0x1fc + bne MPGetKernelState_0x1fc cmplwi r16, 0xffff - bne- MPGetKernelState_0x1fc + bne MPGetKernelState_0x1fc addis r31, r31, 0x1000 cmpwi r31, 0x00 - bne+ MPGetKernelState_0x1a0 + bne MPGetKernelState_0x1a0 b MPGetKernelState_0x204 MPGetKernelState_0x1fc @@ -211,7 +211,7 @@ MPGetKernelState_0x208 addi r29, r29, 0x0c addi r14, r14, 0x01 cmpwi r19, 0x00 - beq- MPGetKernelState_0x238 + beq MPGetKernelState_0x238 add r16, r19, r18 b MPGetKernelState_0x208 @@ -221,7 +221,7 @@ MPGetKernelState_0x238 MPGetKernelState_0x240 cmpw r31, r19 - beq- MPGetKernelState_0x264 + beq MPGetKernelState_0x264 li r18, 0x10 stw r18, 0x0000(r29) stw r31, 0x0004(r29) @@ -246,7 +246,7 @@ MPGetKernelState_0x270 addi r30, r30, 0x0c addi r14, r14, -0x01 cmpwi r14, 0x00 - bne+ MPGetKernelState_0x270 + bne MPGetKernelState_0x270 subf r8, r17, r29 stw r8, 0x0020(r17) lwz r24, 0x001c(r17) @@ -308,7 +308,7 @@ RestoreKernelState_0x38 addi r30, r30, 0x0c addi r14, r14, -0x01 cmpwi r14, 0x00 - bne+ RestoreKernelState_0x38 + bne RestoreKernelState_0x38 lwz r16, 0x0024(r17) mtsprg 0, r16 lwz r8, 0x0028(r17) @@ -340,7 +340,7 @@ RestoreKernelState_0x38 mfpvr r8 rlwinm. r8, r8, 0, 0, 14 - bne- RestoreKernelState_0xf8 + bne RestoreKernelState_0xf8 lwz r8, 0x00c4(r6) DIALECT POWER mtmq r8 @@ -364,7 +364,7 @@ RestoreKernelState_0xf8 lwz r29, 0x00d8(r6) cmpwi r29, 0x00 lwz r8, 0x0210(r29) - beq- RestoreKernelState_0x144 + beq RestoreKernelState_0x144 mtspr vrsave, r8 RestoreKernelState_0x144 @@ -436,7 +436,7 @@ KernelStateSize andi. r18, r18, PMDT.TopFieldMask ; r18 = 3b field at top of pageAttr lhz r16, PMDT.PageCount(r17) ; PageCountMinus1(16b) cmplwi r18, PMDT.DaddyFlag | PMDT.CountingFlag - bne- @entry_seems_blank + bne @entry_seems_blank addi r16, r16, 1 add r19, r19, r16 @@ -445,14 +445,14 @@ KernelStateSize @entry_seems_blank cmpwi r15, 0 ; if not full-segment, might not be blank? - bne- @continue_next_entry + bne @continue_next_entry cmplwi r16, 0xffff - bne- @continue_next_entry + bne @continue_next_entry ; This is the "normal" way to loop to the next segment addis r31, r31, 0x1000 cmpwi r31, 0 - bne+ @next_segment + bne @next_segment b @exit @continue_next_entry @@ -467,7 +467,7 @@ KernelStateSize add r8, r8, r19 cmpwi r14, 0x00 ; no entries? fail! - beq+ Local_ReturnInsufficientResourcesErrFromMPCall + beq Local_ReturnInsufficientResourcesErrFromMPCall mulli r9, r14, 12 add r8, r8, r9 ; 12 bytes per SegMap entry @@ -492,7 +492,7 @@ KernelStateSize cmpwi r19, 0 ; last segment? add r16, r19, r18 - beq- @exit_pool_counter + beq @exit_pool_counter b @next_pool_segment ; odd... what happened here? @exit_pool_counter @@ -504,7 +504,7 @@ KernelStateSize @next_page_in_freelist cmpw r18, r16 - beq- @exit_freelist_counter + beq @exit_freelist_counter addi r9, r9, 16 addi r14, r14, 1 lwz r18, LLL.Next(r18) @@ -544,7 +544,7 @@ CoherenceFunc_0x138 ; OUTSIDE REFERER AnotherCoherenceFunc ; OUTSIDE REFERER cmpwi r26, 0x00 - beqlr- + beqlr mflr r22 addi r24, r24, -0x01 mr r28, r25 @@ -554,7 +554,7 @@ AnotherCoherenceFunc_0x14 clrlwi r25, r23, 0x14 subfic r25, r25, 0x1000 cmplw r25, r26 - blt- AnotherCoherenceFunc_0x2c + blt AnotherCoherenceFunc_0x2c mr r25, r26 AnotherCoherenceFunc_0x2c @@ -566,12 +566,12 @@ AnotherCoherenceFunc_0x2c AnotherCoherenceFunc_0x3c lbzu r27, 0x0001(r24) stbu r27, 0x0001(r23) - bdnz+ AnotherCoherenceFunc_0x3c + bdnz AnotherCoherenceFunc_0x3c bl YetAnotherCoherenceFunc_0x64 subf r26, r25, r26 add r28, r28, r25 cmpwi r26, 0x00 - bne+ AnotherCoherenceFunc_0x14 + bne AnotherCoherenceFunc_0x14 mtlr r22 blr @@ -579,7 +579,7 @@ AnotherCoherenceFunc_0x3c YetAnotherCoherenceFunc ; OUTSIDE REFERER cmpwi r26, 0x00 - beqlr- + beqlr mr r19, r25 mr r20, r26 mflr r22 @@ -591,7 +591,7 @@ YetAnotherCoherenceFunc_0x1c clrlwi r24, r23, 0x14 subfic r24, r24, 0x1000 cmplw r24, r26 - blt- YetAnotherCoherenceFunc_0x34 + blt YetAnotherCoherenceFunc_0x34 mr r24, r26 YetAnotherCoherenceFunc_0x34 @@ -601,11 +601,11 @@ YetAnotherCoherenceFunc_0x34 YetAnotherCoherenceFunc_0x3c lbzu r27, 0x0001(r23) stbu r27, 0x0001(r25) - bdnz+ YetAnotherCoherenceFunc_0x3c + bdnz YetAnotherCoherenceFunc_0x3c add r28, r28, r24 subf r26, r24, r26 cmpwi r26, 0x00 - bne+ YetAnotherCoherenceFunc_0x1c + bne YetAnotherCoherenceFunc_0x1c bl YetAnotherCoherenceFunc_0x64 mtlr r22 blr @@ -627,7 +627,7 @@ YetAnotherCoherenceFunc_0x88 icbi 0, r19 add r19, r19, r21 cmpw r19, r20 - blt+ YetAnotherCoherenceFunc_0x88 + blt YetAnotherCoherenceFunc_0x88 sync isync blr diff --git a/NanoKernel/NKSync.s b/NanoKernel/NKSync.s index e052f37..a346d3a 100644 --- a/NanoKernel/NKSync.s +++ b/NanoKernel/NKSync.s @@ -25,7 +25,7 @@ MPCreateQueue li r8, Queue.Size bl PoolAlloc mr. r31, r8 - beq+ ScrambleMPCall + beq ScrambleMPCall ; List of messages waiting for tasks InitList r8, 'MSGQ', scratch=r16 @@ -94,7 +94,7 @@ MPDeleteQueue cmpwi r9, Queue.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr ; Delete all auto-allocated messages @@ -102,7 +102,7 @@ MPDeleteQueue addi r30, r31, Queue.Messages lwz r8, Queue.Messages + LLL.Next(r31) cmpw r8, r30 - beq- @exit_note_free_loop + beq @exit_note_free_loop RemoveFromList r8, scratch1=r16, scratch2=r17 bl PoolFree b @note_free_loop @@ -113,7 +113,7 @@ MPDeleteQueue lwz r30, Queue.ReservePtr(r31) @notr_free_loop mr. r8, r30 - beq- @exit_notr_free_loop + beq @exit_notr_free_loop lwz r30, Message.LLL + LLL.Next(r30) bl PoolFree b @notr_free_loop @@ -134,7 +134,7 @@ MPDeleteQueue lwz r16, Queue.BlockedTasks + LLL.Next(r31) cmpw r16, r30 subi r8, r16, Task.QueueMember - beq- @exit_task_loop + beq @exit_task_loop ; Manipulate its r3 from afar lwz r17, Task.ContextBlockPtr(r8) @@ -144,7 +144,7 @@ MPDeleteQueue ; If blocked with timeout, dequeue task's internal timer lbz r17, Task.Timer + Timer.Byte3(r8) cmpwi r17, 1 - bne- @no_timeout + bne @no_timeout addi r8, r8, Task.Timer bl DequeueTimer @no_timeout @@ -195,7 +195,7 @@ MPDeleteQueue MPSetQueueReserve cmpwi r4, 0 - blt+ ReturnMPCallOOM + blt ReturnMPCallOOM _Lock PSA.SchLock, scratch1=r16, scratch2=r17 @@ -203,25 +203,25 @@ MPSetQueueReserve bl LookupID cmpwi r9, Queue.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r29, Queue.ReserveCount(r31) lwz r30, Queue.ReservePtr(r31) cmpw r29, r4 - beq+ ReleaseAndReturnZeroFromMPCall - blt- @make_more + beq ReleaseAndReturnZeroFromMPCall + blt @make_more ; NEW < OLD @free_loop mr. r8, r30 - beq- @free_loop_failed + beq @free_loop_failed subi r29, r29, 1 lwz r30, LLL.Next(r30) bl PoolFree cmpw r29, r4 - bgt+ @free_loop + bgt @free_loop ;free loop succeeded stw r4, Queue.ReserveCount(r31) @@ -240,7 +240,7 @@ MPSetQueueReserve li r8, Message.Size bl PoolAlloc cmpwi r8, 0 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall addi r29, r29, 1 @@ -254,7 +254,7 @@ MPSetQueueReserve cmpw r29, r4 stw r8, Queue.ReservePtr(r31) mr r30, r8 - blt+ @alloc_loop + blt @alloc_loop b ReleaseAndReturnZeroFromMPCall @@ -284,18 +284,18 @@ MPNotifyQueue cmpwi r9, Queue.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, Queue.ReserveCount(r31) li r8, Message.Size cmpwi r16, 0 - bne- @try_reserve + bne @try_reserve ;no reservation available bl PoolAlloc cmpwi r8, 0 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall lisori r17, Message.kSignature stw r17, Message.LLL + LLL.Signature(r8) @@ -305,7 +305,7 @@ MPNotifyQueue @try_reserve lwz r17, Queue.ReservePtr(r31) mr. r8, r17 - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM lwz r17, Message.LLL + LLL.Next(r17) stw r17, Queue.ReservePtr(r31) @@ -362,7 +362,7 @@ EnqueueMessage lwz r16, Queue.BlockedTasks + LLL.Next(r31) cmpw r16, r31 subi r8, r16, Task.QueueMember - beq- @no_task + beq @no_task ; Saves us special-casing lwz r17, Task.ContextBlockPtr(r8) @@ -373,7 +373,7 @@ EnqueueMessage ; De-fang the task's blocking timeout lbz r17, Task.Timer + Timer.Byte3(r8) cmpwi r17, 1 - bne- @no_timeout + bne @no_timeout addi r8, r8, Task.Timer bl DequeueTimer @no_timeout @@ -431,14 +431,14 @@ MPWaitOnQueue mr r8, r3 bl LookupID cmpwi r9, Queue.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Queue.Messages + LLL.Next(r31) addi r17, r31, Queue.Messages cmpw r16, r17 - beq- @no_messages_pending + beq @no_messages_pending ;messages pending lwz r4, Message.Word1(r16) @@ -455,7 +455,7 @@ MPWaitOnQueue lbz r17, Message.LLL + LLL.Signature + 3(r16) ; 'r' if mem-reserved message, else 'e' mr r8, r16 cmpwi r17, Message.kReservedSignature & 0xFF - beq- @immediate_msg_was_reserved + beq @immediate_msg_was_reserved ;immediate message was not reserved ... return noErr bl PoolFree @@ -477,12 +477,12 @@ MPWaitOnQueue ;special case: zero timeout ... return cmpwi r17, 0 lwz r19, EWA.PA_CurTask(r30) - beq+ ReleaseAndTimeoutMPCall + beq ReleaseAndTimeoutMPCall ;special case: blue may not block lwz r16, Task.Flags(r19) rlwinm. r16, r16, 0, Task.kFlagBlue, Task.kFlagBlue - beq- @bot_blue + beq @bot_blue stw r3, PSA.BlueSpinningOn(r1) b ReleaseAndReturnMPCallBlueBlocking @bot_blue @@ -515,7 +515,7 @@ MPWaitOnQueue cmpw r17, r16 li r16, 2 - beq- @wait_forever + beq @wait_forever ;committed to arming task's built-in timer (finite timeout) stb r16, Timer.Kind(r30) @@ -569,14 +569,14 @@ MPQueryQueue bl LookupID cmpwi r9, Queue.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Queue.Messages + LLL.Next(r31) addi r17, r31, Queue.Messages cmpw r16, r17 - beq+ ReleaseAndTimeoutMPCall + beq ReleaseAndTimeoutMPCall b ReleaseAndReturnZeroFromMPCall @@ -614,12 +614,12 @@ MPQueryQueue MPCreateSemaphore cmpw r4, r3 - bgt+ ReturnMPCallOOM + bgt ReturnMPCallOOM li r8, Semaphore.Size bl PoolAlloc mr. r31, r8 - beq+ ScrambleMPCall + beq ScrambleMPCall InitList r31, Semaphore.kSignature, scratch=r16 @@ -680,13 +680,13 @@ MPWaitOnSemaphore mr r8, r3 bl LookupID cmpwi r9, Semaphore.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Semaphore.Value(r31) cmpwi r16, 0 subi r16, r16, 1 - ble- @must_wait + ble @must_wait ;easiest case ... decrement and return stw r16, Semaphore.Value(r31) @@ -696,14 +696,14 @@ MPWaitOnSemaphore ;next easiest case ... instant timeout cmpwi r4, 0 mfsprg r30, 0 - beq+ ReleaseAndTimeoutMPCall + beq ReleaseAndTimeoutMPCall lwz r8, EWA.PA_CurTask(r30) ;special case: blue may not block lwz r16, Task.Flags(r8) rlwinm. r16, r16, 0, Task.kFlagBlue, Task.kFlagBlue - beq- @bot_blue + beq @bot_blue stw r3, PSA.BlueSpinningOn(r1) b ReleaseAndReturnMPCallBlueBlocking @bot_blue @@ -730,7 +730,7 @@ MPWaitOnSemaphore cmpw r4, r16 li r17, 2 - beq- @wait_forever + beq @wait_forever ;committed to creating a timer (finite timeout) stb r17, Timer.Kind(r30) @@ -785,13 +785,13 @@ MPQuerySemaphore bl LookupID cmpwi r9, Semaphore.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Semaphore.Value(r31) cmpwi r16, 0 - ble+ ReleaseAndTimeoutMPCall + ble ReleaseAndTimeoutMPCall b ReleaseAndReturnZeroFromMPCall @@ -819,7 +819,7 @@ MPSignalSemaphore cmpwi r9, Semaphore.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr bl SignalSemaphore @@ -844,11 +844,11 @@ SignalSemaphore ; OUTSIDE REFERER bl UnblockBlueIfCouldBePolling lwz r16, 0x0008(r31) cmpw r16, r31 - beq- SignalSemaphore_0x80 + beq SignalSemaphore_0x80 addi r8, r16, -0x08 lbz r17, 0x0037(r8) cmpwi r17, 0x01 - bne- SignalSemaphore_0x30 + bne SignalSemaphore_0x30 addi r8, r8, 0x20 bl DequeueTimer @@ -875,7 +875,7 @@ SignalSemaphore_0x80 cmpw r16, r17 addi r16, r16, 0x01 li r8, kMPInsufficientResourcesErr - bgelr- + bgelr stw r16, 0x0010(r31) li r8, 0x00 blr @@ -900,7 +900,7 @@ MPDeleteSemaphore bl LookupID cmpwi r9, Semaphore.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r3 bl UnblockBlueIfCouldBePolling @@ -910,13 +910,13 @@ MPCall_21_0x34 lwz r16, LLL.Next(r31) cmpw r16, r30 addi r8, r16, -0x08 - beq- MPCall_21_0x98 + beq MPCall_21_0x98 lwz r17, 0x0088(r8) li r18, kMPDeletedErr stw r18, 0x011c(r17) lbz r17, 0x0037(r8) cmpwi r17, 0x01 - bne- MPCall_21_0x68 + bne MPCall_21_0x68 addi r8, r8, 0x20 bl DequeueTimer @@ -979,7 +979,7 @@ MPCreateCriticalRegion li r8, 0x24 bl PoolAlloc mr. r31, r8 - beq+ ScrambleMPCall + beq ScrambleMPCall InitList r31, CriticalRegion.kSignature, scratch=r16 _Lock PSA.SchLock, scratch1=r16, scratch2=r17 @@ -1034,19 +1034,19 @@ MPEnterCriticalRegion bl LookupID cmpwi r9, CriticalRegion.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 mfsprg r17, 0 lwz r18, 0x0014(r31) lwz r30, -0x0008(r17) cmpwi r18, 0x00 lwz r16, 0x0018(r31) - beq- MPCall_27_0x64 + beq MPCall_27_0x64 lwz r17, 0x001c(r31) cmpw r16, r30 cmpw cr1, r17, r5 - bne- MPCall_27_0x78 - bne- cr1, MPCall_27_0x78 + bne MPCall_27_0x78 + bne cr1, MPCall_27_0x78 addi r18, r18, 0x01 stw r18, 0x0014(r31) @@ -1069,20 +1069,20 @@ MPCall_27_0x78 bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallTaskAborted + bne ReleaseAndReturnMPCallTaskAborted lwz r8, 0x001c(r31) ; r8 = id bl LookupID cmpwi r9, Process.kIDClass - bne+ ReleaseAndReturnMPCallTaskAborted + bne ReleaseAndReturnMPCallTaskAborted cmpwi r4, 0x00 ;special case: blue may not block lwz r16, Task.Flags(r30) - beq+ ReleaseAndTimeoutMPCall + beq ReleaseAndTimeoutMPCall rlwinm. r16, r16, 0, Task.kFlagBlue, Task.kFlagBlue - beq- @bot_blue + beq @bot_blue stw r3, PSA.BlueSpinningOn(r1) b ReleaseAndReturnMPCallBlueBlocking @bot_blue @@ -1099,7 +1099,7 @@ MPCall_27_0xb4 addi r18, r18, 0x01 stw r18, 0x0020(r31) cmpw r4, r16 - beq- MPCall_27_0x138 + beq MPCall_27_0x138 addi r29, r30, 0x20 li r8, 0x02 stw r30, 0x0018(r29) @@ -1149,21 +1149,21 @@ MPQueryCriticalRegion bl LookupID cmpwi r9, CriticalRegion.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 mfsprg r17, 0 lwz r18, 0x0014(r31) cmpwi r18, 0x00 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall lwz r30, -0x0008(r17) lwz r16, 0x0018(r31) lwz r17, 0x001c(r31) cmpw r16, r30 cmpw cr1, r17, r4 - bne+ ReleaseAndTimeoutMPCall - bne+ cr1, ReleaseAndTimeoutMPCall + bne ReleaseAndTimeoutMPCall + bne cr1, ReleaseAndTimeoutMPCall ; r1 = kdp b ReleaseAndReturnZeroFromMPCall @@ -1190,7 +1190,7 @@ MPExitCriticalRegion bl LookupID cmpwi r9, CriticalRegion.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 mfsprg r17, 0 lwz r16, 0x0018(r31) @@ -1199,14 +1199,14 @@ MPExitCriticalRegion lwz r17, 0x001c(r31) cmpw r16, r30 cmpw cr1, r17, r4 - bne+ ReleaseAndReturnMPCallOOM - bne+ cr1, ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM + bne cr1, ReleaseAndReturnMPCallOOM addi r18, r18, -0x01 cmpwi r18, 0x00 stw r18, 0x0014(r31) ; r1 = kdp - bne+ ReleaseAndReturnZeroFromMPCall + bne ReleaseAndReturnZeroFromMPCall stw r18, 0x0018(r31) stw r18, 0x001c(r31) mr r8, r3 @@ -1215,11 +1215,11 @@ MPExitCriticalRegion cmpw r16, r31 ; r1 = kdp - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall addi r8, r16, -0x08 lbz r17, 0x0037(r8) cmpwi r17, 0x01 - bne- MPCall_28_0x94 + bne MPCall_28_0x94 addi r8, r8, 0x20 bl DequeueTimer @@ -1266,7 +1266,7 @@ MPDeleteCriticalRegion cmpwi r9, CriticalRegion.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r3 bl UnblockBlueIfCouldBePolling @@ -1275,13 +1275,13 @@ MPCall_26_0x34 lwz r16, 0x0008(r31) cmpw r16, r30 addi r8, r16, -0x08 - beq- MPCall_26_0x98 + beq MPCall_26_0x98 lwz r17, 0x0088(r8) li r18, kMPDeletedErr stw r18, 0x011c(r17) lbz r17, 0x0037(r8) cmpwi r17, 0x01 - bne- MPCall_26_0x68 + bne MPCall_26_0x68 addi r8, r8, 0x20 bl DequeueTimer @@ -1366,7 +1366,7 @@ MPCreateEvent li r8, EventGroup.Size bl PoolAllocClear mr. r31, r8 - beq+ ScrambleMPCall + beq ScrambleMPCall InitList r8, EventGroup.kSignature, scratch=r16 @@ -1418,7 +1418,7 @@ MPDeleteEvent bl LookupID cmpwi r9, EventGroup.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r3 bl UnblockBlueIfCouldBePolling @@ -1428,13 +1428,13 @@ MPDeleteEvent_0x34 lwz r16, 0x0008(r31) cmpw r16, r30 addi r8, r16, -0x08 - beq- MPDeleteEvent_0x98 + beq MPDeleteEvent_0x98 lwz r17, 0x0088(r8) li r18, kMPDeletedErr stw r18, 0x011c(r17) lbz r17, 0x0037(r8) cmpwi r17, 0x01 - bne- MPDeleteEvent_0x68 + bne MPDeleteEvent_0x68 addi r8, r8, 0x20 bl DequeueTimer @@ -1478,7 +1478,7 @@ MPSetEvent bl LookupID cmpwi r9, EventGroup.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r4 bl SetEvent @@ -1512,7 +1512,7 @@ SetEvent lwz r16, EventGroup.LLL + LLL.Next(r31) cmpw r16, r31 subi r8, r16, Task.QueueMember - beq- @no_task_waiting + beq @no_task_waiting ; CASE 1: task needs unblocking @@ -1526,7 +1526,7 @@ SetEvent ; Cancel timeout lbz r17, Task.Timer + Timer.Byte3(r8) cmpwi r17, 1 - bne- @timer_not_armed + bne @timer_not_armed addi r8, r8, Task.Timer bl DequeueTimer @timer_not_armed @@ -1555,7 +1555,7 @@ SetEvent ; CASE 2: no task waiting. - beq- @return + beq @return ; CASE 3: SOFTWARE INTERRUPT @@ -1566,8 +1566,8 @@ SetEvent lwz r19, ContextBlock.SWIEventGroupID(r17) cmpwi cr1, r18, 0 cmpwi r19, 0 - bne- cr1, @do_not_save_swi_event_id - bne- @return + bne cr1, @do_not_save_swi_event_id + bne @return lwz r8, EventGroup.LLL + LLL.Freeform(r31) ; contains my ID stw r8, ContextBlock.SWIEventGroupID(r17) @@ -1580,7 +1580,7 @@ SetEvent add r18, r18, r9 lwzx r19, r16, r18 cmpwi r19, 0 - bne- @return + bne @return ; Set! lwz r8, EventGroup.LLL + LLL.Freeform(r31) ; my ID @@ -1592,16 +1592,16 @@ SetEvent @loop lwzx r8, r19, r18 cmpwi r8, 0 - bne- @exit_loop + bne @exit_loop subf. r19, r9, r19 - bgt+ @loop + bgt @loop bl panic @exit_loop ; Can I interrupt the current interrupt? cmplw r16, r19 srwi r16, r16, 2 - blt- @return + blt @return stw r16, ContextBlock.SWIEventGroupID(r17) @common_case @@ -1621,13 +1621,13 @@ SetEvent cmpwi r19, 0 addi r16, r26, Task.QueueMember - bne- @task_already_running + bne @task_already_running ; De-fang the blocking timeout RemoveFromList r16, scratch1=r17, scratch2=r18 lbz r17, Task.Timer + Timer.Byte3(r26) cmpwi r17, 1 - bne- @timer_not_armed_2 + bne @timer_not_armed_2 addi r8, r26, Task.Timer bl DequeueTimer @timer_not_armed_2 @@ -1674,12 +1674,12 @@ MPWaitForEvent ; Check that the Event Group ID in r3 is valid. bl LookupID cmpwi r9, EventGroup.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, 0x0010(r31) cmpwi r16, 0 - beq- MPWaitForEvent_field_10_was_zero + beq MPWaitForEvent_field_10_was_zero mr r4, r16 @@ -1690,19 +1690,19 @@ MPWaitForEvent lwz r17, KDP.PA_ECB(r1) rlwinm. r18, r16, 0, 27, 27 rlwinm r16, r16, 2, 26, 29 - beq+ ReleaseAndReturnZeroFromMPCall + beq ReleaseAndReturnZeroFromMPCall lwz r18, 0x00c8(r17) lwz r9, 0x0634(r1) cmpwi r18, 0x00 add r18, r18, r9 - bne- MPWaitForEvent_0x84 + bne MPWaitForEvent_0x84 lwz r18, 0x00d0(r17) cmpw r18, r3 li r18, 0x00 ; r1 = kdp - bne+ ReleaseAndReturnZeroFromMPCall + bne ReleaseAndReturnZeroFromMPCall stw r18, 0x00d0(r17) ; r1 = kdp @@ -1714,7 +1714,7 @@ MPWaitForEvent_0x84 li r19, 0x00 ; r1 = kdp - bne+ ReleaseAndReturnZeroFromMPCall + bne ReleaseAndReturnZeroFromMPCall stwx r19, r16, r18 li r19, 0x1c li r9, 0x04 @@ -1722,9 +1722,9 @@ MPWaitForEvent_0x84 MPWaitForEvent_0xa0 lwzx r8, r19, r18 cmpwi r8, 0x00 - bne- MPWaitForEvent_0xb4 + bne MPWaitForEvent_0xb4 subf. r19, r9, r19 - bgt+ MPWaitForEvent_0xa0 + bgt MPWaitForEvent_0xa0 MPWaitForEvent_0xb4 srwi r19, r19, 2 @@ -1737,12 +1737,12 @@ MPWaitForEvent_field_10_was_zero mfsprg r30, 0 cmpwi r5, 0 lwz r19, EWA.PA_CurTask(r30) - beq+ ReleaseAndTimeoutMPCall + beq ReleaseAndTimeoutMPCall ;special case: blue may not block lwz r16, Task.Flags(r19) rlwinm. r16, r16, 0, Task.kFlagBlue, Task.kFlagBlue - beq- @bot_blue + beq @bot_blue stw r3, PSA.BlueSpinningOn(r1) b ReleaseAndReturnMPCallBlueBlocking @bot_blue @@ -1766,7 +1766,7 @@ MPWaitForEvent_field_10_was_zero addi r30, r19, Task.Timer cmpw r5, r16 li r16, 2 - beq- @wait_forever ; never trigger max-wait timers + beq @wait_forever ; never trigger max-wait timers stb r16, Timer.Kind(r30) stw r19, Timer.ParentTaskPtr(r30) @@ -1817,12 +1817,12 @@ MPQueryEvent ; r8 = id bl LookupID cmpwi r9, EventGroup.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, 0x0010(r31) cmpwi r16, 0x00 - beq+ ReleaseAndTimeoutMPCall + beq ReleaseAndTimeoutMPCall ; r1 = kdp b ReleaseAndReturnZeroFromMPCall @@ -1850,7 +1850,7 @@ MPSetSWIEvent mr r8, r3 bl LookupID cmpwi r9, EventGroup.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 li r17, 1 @@ -1860,8 +1860,8 @@ MPSetSWIEvent lwz r16, EventGroup.SWI(r31) - beq- @use_1 - bgt- cr1, @use_1 + beq @use_1 + bgt cr1, @use_1 mr r17, r4 @use_1 @@ -1912,7 +1912,7 @@ NKCreateTimer ; OUTSIDE REFERER ; r8 = ptr mr. r31, r8 - beq+ ScrambleMPCall + beq ScrambleMPCall _Lock PSA.SchLock, scratch1=r16, scratch2=r17 @@ -1923,7 +1923,7 @@ NKCreateTimer ; OUTSIDE REFERER ; r9 = kind bl MakeID cmpwi r8, 0x00 - bne- NKCreateTimer_0x48 + bne NKCreateTimer_0x48 mr r8, r31 bl PoolFree b ReleaseAndScrambleMPCall @@ -1972,12 +1972,12 @@ NKDeleteTimer ; OUTSIDE REFERER cmpwi r9, Timer.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r3 bl DeleteID lwz r16, 0x0008(r31) cmpwi r16, 0x00 - beq- NKDeleteTimer_0x48 + beq NKDeleteTimer_0x48 mr r8, r31 bl DequeueTimer @@ -1985,7 +1985,7 @@ NKDeleteTimer_0x48 _AssertAndRelease PSA.SchLock, scratch=r16 lwz r8, 0x001c(r31) cmpwi r8, 0x00 - bnel- PoolFree + bnel PoolFree mr r8, r31 bl PoolFree b ReturnZeroFromMPCall @@ -2013,20 +2013,20 @@ NKSetTimerNotify bl LookupID cmpwi r9, Timer.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lbz r16, Timer.Kind(r31) cmpwi r16, 3 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r4 bl LookupID cmpwi r9, Semaphore.kIDClass cmpwi cr2, r9, Queue.kIDClass - beq- @SEMAPHORE + beq @SEMAPHORE cmpwi r9, EventGroup.kIDClass - beq- cr2, @QUEUE - bne+ ReleaseAndReturnMPCallInvalidIDErr + beq cr2, @QUEUE + bne ReleaseAndReturnMPCallInvalidIDErr @EVENTGROUP stw r4, Timer.EventGroupID(r31) @@ -2076,18 +2076,18 @@ MPArmTimer bl LookupID cmpwi r9, Timer.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lbz r16, Timer.Kind(r31) cmpwi r16, Timer.kKind3 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr ; Disarm if armed lwz r16, Timer.QueueLLL + LLL.Freeform(r31) cmpwi r16, 0 mr r8, r31 - beq- @no_disarm + beq @no_disarm bl DequeueTimer @no_disarm @@ -2098,21 +2098,21 @@ MPArmTimer lwz r8, Timer.MessageQueueID(r31) cmpwi r9, 0 cmpwi cr1, r8, 0 - bne- @already_got_note - beq- cr1, @no_queue + bne @already_got_note + beq cr1, @no_queue bl LookupID cmpwi r9, Queue.kIDClass - bne- @no_queue + bne @no_queue lwz r9, Queue.ReserveCount(r8) li r8, Message.Size cmpwi r9, 0 - bne- @already_got_notr + bne @already_got_notr bl PoolAllocClear mr. r30, r8 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall lisori r8, 'note' stw r8, Message.LLL + LLL.Signature(r30) @@ -2127,7 +2127,7 @@ MPArmTimer lwz r16, ContextBlock.r6(r6) rlwinm. r9, r16, 0, kMPTimeIsDurationMask mr r8, r4 - beq- @not_duration + beq @not_duration bl TimebaseTicksPerPeriod mr r4, r8 mr r5, r9 @@ -2136,7 +2136,7 @@ MPArmTimer lwz r16, ContextBlock.r6(r6) rlwinm. r8, r16, 0, kMPTimeIsDeltaMask mfxer r17 - beq- @not_delta + beq @not_delta lwz r19, Timer.Time + 4(r31) lwz r18, Timer.Time(r31) addc r5, r5, r19 @@ -2152,7 +2152,7 @@ MPArmTimer lwz r16, ContextBlock.r6(r6) rlwinm. r16, r16, 0, kMPPreserveTimerIDMask li r17, 0 - beq- @no_preserve + beq @no_preserve li r17, 1 @no_preserve stb r17, Timer.KeepAfterFiring(r31) @@ -2187,11 +2187,11 @@ MPCancelTimer bl LookupID cmpwi r9, Timer.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lbz r16, Timer.Byte3(r31) cmpwi r16, 1 - bne- @say_no_time_remained + bne @say_no_time_remained lwz r4, Timer.Time(r31) lwz r5, Timer.Time + 4(r31) @@ -2210,7 +2210,7 @@ MPCancelTimer lwz r16, Timer.QueueLLL + LLL.Freeform(r31) cmpwi r16, 0 mr r8, r31 - beq- @not_queued + beq @not_queued bl DequeueTimer @not_queued @@ -2250,7 +2250,7 @@ MPCreateNotification li r8, Notification.Size bl PoolAllocClear mr. r31, r8 - beq+ ScrambleMPCall + beq ScrambleMPCall lisori r16, Notification.kSignature stw r16, Notification.Signature(r31) @@ -2300,7 +2300,7 @@ MPDeleteNotification cmpwi r9, Notification.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r31 bl PoolFree mr r8, r3 @@ -2328,7 +2328,7 @@ MPCauseNotification bl LookupID cmpwi r9, Notification.kIDClass mr r30, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr bl CauseNotification @@ -2356,11 +2356,11 @@ CauseNotification lwz r17, 0x0024(r30) cmplwi r16, 0x00 cmplwi cr1, r17, 0x00 - bne- @0x28 - bne- cr1, @0x28 + bne @0x28 + bne cr1, @0x28 lwz r18, 0x001c(r30) cmplwi r18, 0x00 - beq- @fail_insufficient_resources + beq @fail_insufficient_resources @0x28 @@ -2368,21 +2368,21 @@ CauseNotification lwz r8, Notification.QueueID(r30) cmplwi r8, 0 - beq- @NO_QUEUE + beq @NO_QUEUE bl LookupID cmpwi r9, Queue.kIDClass mr r31, r8 - bne- @fail_invalid_id + bne @fail_invalid_id lwz r16, Queue.ReserveCount(r31) cmpwi r16, 0 lwz r17, Queue.ReservePtr(r31) - beq- @no_notr + beq @no_notr ;use notr mr. r8, r17 lwz r17, Message.LLL + LLL.Next(r17) - beq- @fail_insufficient_resources + beq @fail_insufficient_resources stw r17, Queue.ReservePtr(r31) b @queue_common @@ -2390,7 +2390,7 @@ CauseNotification li r8, Message.Size bl PoolAlloc cmpwi r8, 0 - beq- @fail_unknown_err + beq @fail_unknown_err @queue_common lwz r16, Notification.MsgWord1(r30) @@ -2407,11 +2407,11 @@ CauseNotification lwz r8, Notification.SemaphoreID(r30) cmplwi r8, 0 - beq- @NO_SEMAPHORE + beq @NO_SEMAPHORE bl LookupID cmpwi r9, Semaphore.kIDClass mr r31, r8 - bne- @fail_invalid_id + bne @fail_invalid_id bl SignalSemaphore @NO_SEMAPHORE @@ -2421,11 +2421,11 @@ CauseNotification lwz r8, Notification.EventGroupID(r30) cmplwi r8, 0 - beq- @NO_EVENT_GROUP + beq @NO_EVENT_GROUP bl LookupID cmpwi r9, EventGroup.kIDClass mr r31, r8 - bne- @fail_invalid_id + bne @fail_invalid_id lwz r8, Notification.EventFlags(r30) bl SetEvent @@ -2475,7 +2475,7 @@ MPModifyNotification cmpwi r9, Notification.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r4 ; r8 = id @@ -2483,10 +2483,10 @@ MPModifyNotification cmpwi r9, Semaphore.kIDClass cmpwi cr2, r9, 0x04 - beq- MPCall_66_0x74 + beq MPCall_66_0x74 cmpwi r9, 0x09 - beq- cr2, MPCall_66_0x58 - bne+ ReleaseAndReturnMPCallInvalidIDErr + beq cr2, MPCall_66_0x58 + bne ReleaseAndReturnMPCallInvalidIDErr stw r4, 0x001c(r31) stw r5, 0x0020(r31) @@ -2533,11 +2533,11 @@ MPCall_128 ; OUTSIDE REFERER cmpwi r9, Notification.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr cmpwi r4, 0x04 cmpwi cr1, r4, 0x09 - beq- MPCall_128_0x40 - beq- cr1, MPCall_128_0x58 + beq MPCall_128_0x40 + beq cr1, MPCall_128_0x58 b ReleaseAndReturnParamErrFromMPCall MPCall_128_0x40 @@ -2585,7 +2585,7 @@ UnblockBlueIfCouldBePolling lwz r9, PSA.BlueSpinningOn(r1) lwz r19, PSA.PA_BlueTask(r1) cmpw r8, r9 - bnelr- + bnelr li r9, -1 mflr r24 @@ -2595,13 +2595,13 @@ UnblockBlueIfCouldBePolling cmpwi r17, 0 addi r16, r19, Task.QueueMember - bne- major_0x0dce8_0x70 + bne major_0x0dce8_0x70 RemoveFromList r16, scratch1=r17, scratch2=r18 lbz r17, Task.Timer + Timer.Byte3(r19) cmpwi r17, 1 - bne- major_0x0dce8_0x60 + bne major_0x0dce8_0x60 addi r8, r19, Task.Timer bl DequeueTimer lwz r19, PSA.PA_BlueTask(r1) @@ -2645,28 +2645,28 @@ MPCall_120 cmpwi r9, Semaphore.kIDClass cmpwi cr1, r9, Queue.kIDClass - beq- @SEMAPHORE - beq- cr1, @QUEUE + beq @SEMAPHORE + beq cr1, @QUEUE cmpwi r9, EventGroup.kIDClass cmpwi cr1, r9, CriticalRegion.kIDClass - beq- @EVENT_GROUP - beq- cr1, @CRITICAL_REGION + beq @EVENT_GROUP + beq cr1, @CRITICAL_REGION cmpwi r9, Notification.kIDClass cmpwi cr1, r9, AddressSpace.kIDClass - beq- @NOTIFICATION - beq- cr1, @ADDRESS_SPACE + beq @NOTIFICATION + beq cr1, @ADDRESS_SPACE b ReleaseAndReturnParamErrFromMPCall @NOTIFICATION lisori r8, Notification.kFirstID cmpw r8, r4 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall cmplwi r5, 0 - bne- @notification_not_0 + bne @notification_not_0 ; r5 == 0 lisori r16, Notification.kFirstID @@ -2685,7 +2685,7 @@ MPCall_120 @notification_not_0 cmplwi r5, 16 - bne- @notification_not_16 + bne @notification_not_16 ; r5 == 16 lwz r16, 0x0010(r31) @@ -2704,7 +2704,7 @@ MPCall_120 @notification_not_16 cmplwi r5, 32 - bne- @notification_not_32 + bne @notification_not_32 ; r5 == 32 lwz r16, 0x0020(r31) @@ -2718,7 +2718,7 @@ MPCall_120 @notification_not_32 cmpwi r5, 40 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall ; r5 == 40 li r16, 0x00 @@ -2730,9 +2730,9 @@ MPCall_120 @CRITICAL_REGION lisori r8, 0x00060001 cmpw r8, r4 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall cmplwi r5, 0x00 - bne- @154 + bne @154 lis r16, 0x06 ori r16, r16, 0x01 stw r16, ContextBlock.r6(r6) @@ -2750,19 +2750,19 @@ MPCall_120 @154 cmplwi r5, 0x10 - bne- @1a0 + bne @1a0 addi r17, r31, 0x00 lwz r18, 0x0008(r31) li r16, 0x00 cmpw r17, r18 - beq- @174 + beq @174 lwz r16, -0x0008(r18) @174 stw r16, ContextBlock.r6(r6) lwz r16, 0x0018(r31) cmpwi r16, 0x00 - beq- @188 + beq @188 lwz r16, 0x0000(r16) @188 @@ -2777,7 +2777,7 @@ MPCall_120 @1a0 cmpwi r5, 0x1c - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall li r16, 0x00 stw r16, ContextBlock.r10(r6) @@ -2788,9 +2788,9 @@ MPCall_120 lis r8, 0x09 ori r8, r8, 0x01 cmpw r8, r4 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall cmplwi r5, 0x00 - bne- @1fc + bne @1fc lis r16, 0x09 ori r16, r16, 0x01 stw r16, ContextBlock.r6(r6) @@ -2808,12 +2808,12 @@ MPCall_120 @1fc cmplwi r5, 0x10 - bne- @234 + bne @234 addi r17, r31, 0x00 lwz r18, 0x0008(r31) li r16, 0x00 cmpw r17, r18 - beq- @21c + beq @21c lwz r16, -0x0008(r18) @21c @@ -2828,7 +2828,7 @@ MPCall_120 @234 cmpwi r5, 0x18 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall li r16, 0x00 stw r16, ContextBlock.r10(r6) @@ -2839,9 +2839,9 @@ MPCall_120 lis r8, 0x04 ori r8, r8, 0x01 cmpw r8, r4 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall cmplwi r5, 0x00 - bne- @290 + bne @290 lis r16, 0x04 ori r16, r16, 0x01 stw r16, ContextBlock.r6(r6) @@ -2859,12 +2859,12 @@ MPCall_120 @290 cmplwi r5, 0x10 - bne- @2ec + bne @2ec addi r17, r31, 0x00 lwz r18, 0x0008(r31) li r16, 0x00 cmpw r17, r18 - beq- @2b0 + beq @2b0 lwz r16, -0x0008(r18) @2b0 @@ -2877,7 +2877,7 @@ MPCall_120 addi r17, r31, 0x10 li r16, 0x00 cmpw r17, r18 - beq- @2dc + beq @2dc lwz r16, 0x0010(r18) @2dc @@ -2890,13 +2890,13 @@ MPCall_120 @2ec cmplwi r5, 0x20 - bne- @328 + bne @328 lwz r18, 0x0018(r31) addi r17, r31, 0x10 li r16, 0x00 cmpw r17, r18 li r17, 0x00 - beq- @314 + beq @314 lwz r16, 0x0014(r18) lwz r17, 0x0018(r18) @@ -2911,7 +2911,7 @@ MPCall_120 @328 cmpwi r5, 0x28 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall li r16, 0x00 stw r16, ContextBlock.r10(r6) @@ -2922,9 +2922,9 @@ MPCall_120 lis r8, 0x05 ori r8, r8, 0x01 cmpw r8, r4 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall cmplwi r5, 0x00 - bne- @384 + bne @384 lis r16, 0x05 ori r16, r16, 0x01 stw r16, ContextBlock.r6(r6) @@ -2942,12 +2942,12 @@ MPCall_120 @384 cmplwi r5, 0x10 - bne- @3c4 + bne @3c4 addi r17, r31, 0x00 lwz r18, 0x0008(r31) li r16, 0x00 cmpw r17, r18 - beq- @3a4 + beq @3a4 lwz r16, -0x0008(r18) @3a4 @@ -2964,7 +2964,7 @@ MPCall_120 @3c4 cmpwi r5, 0x1c - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall li r16, 0x00 stw r16, ContextBlock.r10(r6) @@ -2974,9 +2974,9 @@ MPCall_120 @ADDRESS_SPACE lisori r8, 0x00080001 cmpw r8, r4 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall cmplwi r5, 0x00 - bne- @420 + bne @420 lisori r16, 0x00080001 stw r16, ContextBlock.r6(r6) lwz r16, 0x0074(r31) @@ -2993,7 +2993,7 @@ MPCall_120 @420 cmplwi r5, 0x10 - bne- @454 + bne @454 lwz r16, 0x0030(r31) stw r16, ContextBlock.r6(r6) lwz r16, 0x0034(r31) @@ -3010,7 +3010,7 @@ MPCall_120 @454 cmplwi r5, 0x20 - bne- @488 + bne @488 lwz r16, 0x0040(r31) stw r16, ContextBlock.r6(r6) lwz r16, 0x0044(r31) @@ -3027,7 +3027,7 @@ MPCall_120 @488 cmplwi r5, 0x30 - bne- @4bc + bne @4bc lwz r16, 0x0050(r31) stw r16, ContextBlock.r6(r6) lwz r16, 0x0054(r31) @@ -3044,7 +3044,7 @@ MPCall_120 @4bc cmplwi r5, 0x40 - bne- @4f0 + bne @4f0 lwz r16, 0x0060(r31) stw r16, ContextBlock.r6(r6) lwz r16, 0x0064(r31) @@ -3061,7 +3061,7 @@ MPCall_120 @4f0 cmpwi r5, 0x50 - bne+ ReleaseAndReturnParamErrFromMPCall + bne ReleaseAndReturnParamErrFromMPCall li r16, 0x00 stw r16, ContextBlock.r10(r6) diff --git a/NanoKernel/NKTasks.s b/NanoKernel/NKTasks.s index acd3772..d8cca32 100644 --- a/NanoKernel/NKTasks.s +++ b/NanoKernel/NKTasks.s @@ -15,7 +15,7 @@ Local_Panic set * MPCall_7 ; OUTSIDE REFERER rlwinm. r8, r5, 0, 31, 28 - bne+ ReturnMPCallOOM + bne ReturnMPCallOOM _Lock PSA.SchLock, scratch1=r16, scratch2=r17 @@ -23,18 +23,18 @@ MPCall_7 ; OUTSIDE REFERER bl LookupID cmpwi r9, Process.kIDClass mr r30, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, Process.Flags(r30) rlwinm. r17, r16, 0, 30, 30 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM ; ARG CPUFlags r7, Process *r8 bl CreateTask ; RET Task *r8 mr. r31, r8 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall mfsprg r15, 0 @@ -66,12 +66,12 @@ MPCall_7 ; OUTSIDE REFERER lwz r16, Task.Flags(r28) rlwinm. r8, r5, 0, 30, 30 - beq- @noflag + beq @noflag oris r16, r16, 0x40 ; Task.kFlag9 @noflag rlwinm. r8, r5, 0, 29, 29 - beq- @noflag2 + beq @noflag2 oris r16, r16, 0x02 ; Task.kFlag14 @noflag2 @@ -97,13 +97,13 @@ CreateTask li r8, 0x400 ;Task.Size bl PoolAllocClear mr. r28, r8 - beq- @fail_oom + beq @fail_oom ; Allocate an opaque ID for it li r9, Task.kIDClass bl MakeID cmpwi r8, 0 - beq- @fail_no_id + beq @fail_no_id ; ID and sign it stw r8, Task.ID(r28) @@ -123,7 +123,7 @@ CreateTask bl PoolAllocClear cmpwi r8, 0 stw r8, Task.NotificationPtr(r28) - beq- @fail_note_oom + beq @fail_note_oom lisori r9, 'note' stw r9, 4(r8) @@ -148,7 +148,7 @@ CreateTask li r9, Semaphore.kIDClass bl MakeID cmpwi r8, 0 - beq- @fail_semq_no_id + beq @fail_semq_no_id stw r8, Task.Semaphore + Semaphore.BlockedTasks + LLL.Freeform(r28) @@ -157,15 +157,15 @@ CreateTask ; Conditionally, that is rlwinm. r8, r7, 0, PSA.AVFeatureBit, PSA.AVFeatureBit - beq- @non_altivec_task + beq @non_altivec_task ; Allocate and check li r8, 0x214 ;VectorSaveArea.Size ; room for v registers plus 20 bytes bl PoolAllocClear andi. r9, r8, 16-1 ; Sanity check: aligned to size of vector register? cmpwi cr1, r8, 0 - bne+ Local_Panic - beq- cr1, @fail_altivec_oom + bne Local_Panic + beq cr1, @fail_altivec_oom ; Point to it (from inside and outside the ECB-like area) stw r8, Task.VectorSaveArea(r28) @@ -179,7 +179,7 @@ CreateTask subi r16, r16, 1 stwu r17, 4(r8) cmpwi r16, 0 - bgt+ @vectorarea_copyloop + bgt @vectorarea_copyloop @non_altivec_task @@ -317,20 +317,20 @@ MPCall_8 ; OUTSIDE REFERER cmpwi r9, Task.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lbz r16, 0x0018(r31) cmpwi r16, 0x00 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r8, 0x0060(r31) ; r8 = id bl LookupID cmpwi r9, Process.kIDClass - bne+ Local_Panic + bne Local_Panic lwz r16, 0x0008(r8) rlwinm. r17, r16, 0, 30, 30 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r30, 0x0088(r31) stw r4, 0x0074(r31) stw r5, 0x011c(r30) @@ -371,18 +371,18 @@ MPCall_9 ; OUTSIDE REFERER mr r31, r8 cmpwi r9, 0x02 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, 0x0064(r31) lbz r17, 0x0018(r31) rlwinm. r18, r16, 0, 30, 30 cmpwi cr1, r17, 0x00 - bne+ ReleaseAndReturnMPCallOOM - beq- cr1, MPCall_9_0xb4 + bne ReleaseAndReturnMPCallOOM + beq cr1, MPCall_9_0xb4 mfsprg r15, 0 lhz r18, 0x001a(r31) lhz r17, EWA.CPUIndex(r15) cmpw r18, r17 - beq- MPCall_9_0xe0 + beq MPCall_9_0xe0 ori r16, r16, 0x400 stw r16, 0x0064(r31) li r17, 0x01 @@ -427,7 +427,7 @@ MPCall_9_0xfc InsertAsPrev r17, r16, scratch=r18 lbz r8, 0x0037(r31) cmpwi r8, 0x01 - bne- MPCall_9_0x130 + bne MPCall_9_0x130 addi r8, r31, 0x20 bl DequeueTimer @@ -441,7 +441,7 @@ MPCall_9_0x130 li r18, 0x00 lwz r17, 0x009c(r31) stw r18, 0x009c(r31) - bne- MPCall_9_0x15c + bne MPCall_9_0x15c mr r31, r8 mr r8, r17 bl EnqueueMessage ; Message *r8, Queue *r31 @@ -466,14 +466,14 @@ MPCall_10 ; OUTSIDE REFERER bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lbz r16, 0x0018(r31) cmpwi r16, 0x00 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r16, 0x0064(r31) rlwinm. r16, r16, 0, 30, 30 - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM mr r8, r31 bl TasksFuncThatIsNotAMPCall @@ -493,13 +493,13 @@ TasksFuncThatIsNotAMPCall bl DeleteID lwz r8, 0x009c(r26) cmpwi r8, 0x00 - beq- @_0x98 + beq @_0x98 bl PoolFree @_0x98 lwz r8, 0x008c(r26) cmpwi r8, 0x00 - beq- @_0xa8 + beq @_0xa8 bl PoolFree @_0xa8 @@ -529,13 +529,13 @@ MPCall_11 ; OUTSIDE REFERER lwz r17, PSA.PA_BlueTask(r1) lwz r18, -0x0008(r16) lwz r19, 0x0000(r17) - bne- MPCall_11_0x1c + bne MPCall_11_0x1c lwz r3, 0x0000(r18) MPCall_11_0x1c cmpw r3, r19 li r3, 0x01 - beq+ CommonMPCallReturnPath + beq CommonMPCallReturnPath li r3, 0x00 b CommonMPCallReturnPath @@ -557,8 +557,8 @@ MPCall_12 ; OUTSIDE REFERER MPCall_14 ; OUTSIDE REFERER cmpwi r4, 0x01 cmpwi cr1, r4, 10000 - blt+ ReturnMPCallInvalidIDErr - bgt+ cr1, ReturnMPCallInvalidIDErr + blt ReturnMPCallInvalidIDErr + bgt cr1, ReturnMPCallInvalidIDErr _Lock PSA.SchLock, scratch1=r16, scratch2=r17 @@ -568,11 +568,11 @@ MPCall_14 ; OUTSIDE REFERER bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lbz r16, 0x0018(r31) cmpwi r16, 0x01 - bne- MPCall_14_0x70 + bne MPCall_14_0x70 lwz r16, 0x0008(r31) lwz r17, 0x001c(r31) lwz r18, 0x0014(r16) @@ -580,7 +580,7 @@ MPCall_14 ; OUTSIDE REFERER add r18, r17, r18 cmpwi r17, 0x00 stw r18, 0x0014(r16) - beq- MPCall_14_0x70 + beq MPCall_14_0x70 mr r8, r31 bl FlagSchEval @@ -611,7 +611,7 @@ MPSetExceptionHandler mr r8, r3 bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 @@ -620,8 +620,8 @@ MPSetExceptionHandler cmpwi r9, 0 cmpwi cr1, r9, Queue.kIDClass - beq- @isnil - bne+ cr1, ReleaseAndReturnMPCallInvalidIDErr + beq @isnil + bne cr1, ReleaseAndReturnMPCallInvalidIDErr @isnil mr r30, r8 @@ -648,7 +648,7 @@ MPThrowException mr r8, r3 bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 ; This is gold! @@ -677,7 +677,7 @@ MPThrowException KCThrowException_0x70 lhz r19, EWA.CPUIndex(r15) cmpw r19, r18 - bne- KCThrowException_0xb8 + bne KCThrowException_0xb8 ori r16, r16, 0x200 stw r4, 0x00f8(r31) stw r16, 0x0064(r31) @@ -716,7 +716,7 @@ MPCall_58 ; OUTSIDE REFERER bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r29, Task.Flags(r31) @@ -735,7 +735,7 @@ MPCall_58_0x44 li r8, 0x1c bl PoolAlloc cmpwi r8, 0x00 - beq+ ReleaseAndScrambleMPCall + beq ReleaseAndScrambleMPCall li r3, 0x00 b MPCall_58_0x114 @@ -744,11 +744,11 @@ MPCall_58_0x68 rlwinm. r8, r29, 0, 18, 18 andc r29, r29, r17 li r17, 0x00 - bne- cr7, MPCall_58_0x80 + bne cr7, MPCall_58_0x80 ori r17, r17, 0x400 MPCall_58_0x80 - ble- cr7, MPCall_58_0x88 + ble cr7, MPCall_58_0x88 ori r17, r17, 0x200 MPCall_58_0x88 @@ -761,8 +761,8 @@ MPCall_58_0x88 andc r29, r29, r19 cmpw cr1, r17, r18 stw r29, 0x0064(r31) - bne- MPCall_58_0xb4 - bne- cr1, MPCall_58_0xe0 + bne MPCall_58_0xb4 + bne cr1, MPCall_58_0xe0 MPCall_58_0xb4 addi r16, r31, 0x08 @@ -800,7 +800,7 @@ MPCall_58_0x114 mr r30, r8 ori r29, r29, 0x800 - beq- MPCall_58_0x184 + beq MPCall_58_0x184 MPCall_58_0x13c bc BO_IF, 19, MPCall_58_0x158 @@ -812,11 +812,11 @@ MPCall_58_0x13c mr r30, r8 ori r29, r29, 0x1000 - beq- MPCall_58_0x184 + beq MPCall_58_0x184 MPCall_58_0x158 mr. r8, r28 - bnel- PoolFree + bnel PoolFree addi r16, r31, 0x08 RemoveFromList r16, scratch1=r17, scratch2=r18 b MPCall_9_0x98 @@ -824,10 +824,10 @@ MPCall_58_0x158 MPCall_58_0x184 mr. r8, r28 stw r29, 0x0064(r31) - bne- MPCall_58_0x1a4 + bne MPCall_58_0x1a4 lwz r8, 0x0028(r30) cmpwi r8, 0x00 - beq+ MPCall_58_0x114 + beq MPCall_58_0x114 lwz r17, 0x0008(r8) stw r17, 0x0028(r30) @@ -873,13 +873,13 @@ MPCall_59 ; OUTSIDE REFERER _Lock PSA.SchLock, scratch1=r16, scratch2=r17 mr. r8, r3 - beq- MPCall_59_0x30 + beq MPCall_59_0x30 ; r8 = id bl LookupID cmpwi r9, Queue.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 MPCall_59_0x30 @@ -902,10 +902,10 @@ MPCall_60 ; OUTSIDE REFERER bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 cmpwi r4, 0x05 - beq- MPCall_60_0x288 + beq MPCall_60_0x288 lwz r16, Task.Flags(r31) mtcr r16 @@ -919,27 +919,27 @@ MPCall_60 ; OUTSIDE REFERER MPCall_60_0x4c lbz r16, 0x0018(r31) cmpwi r16, 0x00 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM cmpwi r4, 0x00 cmpwi cr1, r4, 0x01 - beq- MPCall_60_0xf8 - beq- cr1, MPCall_60_0x10c + beq MPCall_60_0xf8 + beq cr1, MPCall_60_0x10c cmpwi r4, 0x02 cmpwi cr1, r4, 0x03 - beq- MPCall_60_0x150 - beq- cr1, MPCall_60_0x1c0 + beq MPCall_60_0x150 + beq cr1, MPCall_60_0x1c0 cmpwi r4, 0x04 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r16, 0x0088(r31) li r17, 0x00 cmplwi r5, 0x00 cmplwi cr1, r5, 0x04 - beq- MPCall_60_0xac - beq- cr1, MPCall_60_0xc0 + beq MPCall_60_0xac + beq cr1, MPCall_60_0xc0 cmplwi r5, 0x08 cmplwi cr1, r5, 0x0c - beq- MPCall_60_0xc8 - beq- cr1, MPCall_60_0xd0 + beq MPCall_60_0xc8 + beq cr1, MPCall_60_0xd0 b ReleaseAndReturnMPCallOOM MPCall_60_0xac @@ -962,10 +962,10 @@ MPCall_60_0xd0 lwz r18, 0x0064(r16) rlwinm. r8, r17, 0, 27, 27 li r17, 0x02 - beq- MPCall_60_0x36c + beq MPCall_60_0x36c rlwinm. r8, r18, 0, 1, 1 li r17, 0x01 - bne- MPCall_60_0x36c + bne MPCall_60_0x36c li r17, 0x00 b MPCall_60_0x36c @@ -980,14 +980,14 @@ MPCall_60_0x10c lwz r16, 0x0088(r31) cmplwi r5, 0x100 cmplwi cr1, r5, 0xf8 - beq- MPCall_60_0x144 + beq MPCall_60_0x144 andi. r17, r5, 0x07 addi r16, r16, 0x1fc MPCall_60_0x124 add r16, r16, r5 - bgt+ cr1, ReleaseAndReturnMPCallOOM - bne+ ReleaseAndReturnMPCallOOM + bgt cr1, ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwzu r17, 0x0004(r16) lwzu r18, 0x0004(r16) lwzu r19, 0x0004(r16) @@ -1003,19 +1003,19 @@ MPCall_60_0x150 lwz r16, 0x0088(r31) rlwinm. r8, r7, 0, 12, 12 lwz r16, 0x00d8(r16) - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM cmplwi cr3, r16, 0x00 cmplwi r5, 0x200 cmplwi cr2, r5, 0x210 cmplwi cr1, r5, 0x1f0 - beql+ cr3, Local_Panic - beq- MPCall_60_0x1a4 - beq- cr2, MPCall_60_0x1b8 + beql cr3, Local_Panic + beq MPCall_60_0x1a4 + beq cr2, MPCall_60_0x1b8 andi. r8, r5, 0x0f add r16, r16, r5 subi r16, r16, 4 - bgt+ cr1, ReleaseAndReturnMPCallOOM - bne+ ReleaseAndReturnMPCallOOM + bgt cr1, ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwzu r17, 0x0004(r16) lwzu r18, 0x0004(r16) lwzu r19, 0x0004(r16) @@ -1038,24 +1038,24 @@ MPCall_60_0x1c0 li r17, 0x00 cmplwi r5, 0x00 cmplwi cr1, r5, 0x08 - beq- MPCall_60_0x21c - beq- cr1, MPCall_60_0x228 + beq MPCall_60_0x21c + beq cr1, MPCall_60_0x228 cmplwi r5, 0x10 cmplwi cr1, r5, 0x30 - beq- MPCall_60_0x234 - beq- cr1, MPCall_60_0x240 + beq MPCall_60_0x234 + beq cr1, MPCall_60_0x240 cmplwi r5, 0x1c cmplwi cr1, r5, 0x20 - beq- MPCall_60_0x24c - beq- cr1, MPCall_60_0x254 + beq MPCall_60_0x24c + beq cr1, MPCall_60_0x254 cmplwi r5, 0x24 cmplwi cr1, r5, 0x28 - beq- MPCall_60_0x25c - beq- cr1, MPCall_60_0x264 + beq MPCall_60_0x25c + beq cr1, MPCall_60_0x264 cmplwi r5, 0x2c cmplwi cr1, r5, 0x18 - beq- MPCall_60_0x278 - beq- cr1, MPCall_60_0x280 + beq MPCall_60_0x278 + beq cr1, MPCall_60_0x280 b ReleaseAndReturnMPCallOOM MPCall_60_0x21c @@ -1108,18 +1108,18 @@ MPCall_60_0x280 MPCall_60_0x288 cmplwi cr1, r5, 0x04 cmplwi r5, 0x14 - beq- cr1, MPCall_60_0x2c4 - beq- MPCall_60_0x2e4 + beq cr1, MPCall_60_0x2c4 + beq MPCall_60_0x2e4 cmplwi cr1, r5, 0x20 cmplwi r5, 0x30 - beq- cr1, MPCall_60_0x2f4 - beq- MPCall_60_0x308 + beq cr1, MPCall_60_0x2f4 + beq MPCall_60_0x308 cmpwi cr1, r5, 0x40 cmplwi r5, 0x3c - beq- cr1, MPCall_60_0x320 - beq- MPCall_60_0x318 + beq cr1, MPCall_60_0x320 + beq MPCall_60_0x318 cmpwi cr1, r5, 0x50 - beq- cr1, MPCall_60_0x34c + beq cr1, MPCall_60_0x34c b ReleaseAndReturnMPCallOOM MPCall_60_0x2c4 @@ -1164,7 +1164,7 @@ MPCall_60_0x320 lwz r19, 0x0094(r31) lwz r20, 0x0090(r31) lwz r18, 0x0000(r18) - bne- MPCall_60_0x3a8 + bne MPCall_60_0x3a8 lwz r17, 0x0000(r16) b MPCall_60_0x3a8 @@ -1174,7 +1174,7 @@ MPCall_60_0x34c lwz r19, -0x0008(r18) cmpw r19, r31 lwz r17, 0x0004(r18) - beq- MPCall_60_0x36c + beq MPCall_60_0x36c lwz r17, 0x010c(r20) b MPCall_60_0x36c @@ -1230,7 +1230,7 @@ MPCall_61 ; OUTSIDE REFERER bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r31, r8 lwz r16, Task.Flags(r31) @@ -1245,19 +1245,19 @@ MPCall_61 ; OUTSIDE REFERER MPCall_61_0x44 lbz r16, 0x0018(r31) cmpwi r16, 0x00 - bne+ ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM lwz r17, 0x0134(r6) lwz r18, 0x013c(r6) lwz r19, 0x0144(r6) lwz r20, 0x014c(r6) cmpwi r4, 0x00 cmpwi cr1, r4, 0x01 - beq- MPCall_61_0x84 - beq- cr1, MPCall_61_0x98 + beq MPCall_61_0x84 + beq cr1, MPCall_61_0x98 cmpwi r4, 0x02 cmpwi cr1, r4, 0x03 - beq- MPCall_61_0xe8 - beq- cr1, MPCall_61_0x170 + beq MPCall_61_0xe8 + beq cr1, MPCall_61_0x170 b ReleaseAndReturnMPCallOOM MPCall_61_0x84 @@ -1271,14 +1271,14 @@ MPCall_61_0x98 lwz r16, 0x0088(r31) cmplwi r5, 0x100 cmplwi cr1, r5, 0xf8 - beq- MPCall_61_0xd8 + beq MPCall_61_0xd8 andi. r8, r5, 0x07 addi r16, r16, 0x1fc MPCall_61_0xb0 add r16, r16, r5 - bgt+ cr1, ReleaseAndReturnMPCallOOM - bne+ ReleaseAndReturnMPCallOOM + bgt cr1, ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM li r21, 0x10 stwu r17, 0x0004(r16) stwu r18, 0x0004(r16) @@ -1301,19 +1301,19 @@ MPCall_61_0xe8 lwz r16, 0x0088(r31) rlwinm. r8, r7, 0, 12, 12 lwz r16, 0x00d8(r16) - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM cmplwi cr3, r16, 0x00 cmplwi r5, 0x200 cmplwi cr2, r5, 0x210 cmplwi cr1, r5, 0x1f0 - beql+ cr3, Local_Panic - beq- MPCall_61_0x144 - beq- cr2, MPCall_61_0x160 + beql cr3, Local_Panic + beq MPCall_61_0x144 + beq cr2, MPCall_61_0x160 andi. r8, r5, 0x0f add r16, r16, r5 subi r16, r16, 4 - bgt+ cr1, ReleaseAndReturnMPCallOOM - bne+ ReleaseAndReturnMPCallOOM + bgt cr1, ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM li r21, 0x10 stwu r17, 0x0004(r16) stwu r18, 0x0004(r16) @@ -1347,18 +1347,18 @@ MPCall_61_0x170 lwz r16, 0x0088(r31) cmplwi r5, 0x00 cmplwi cr1, r5, 0x08 - beq- MPCall_61_0x1b0 - beq- cr1, MPCall_61_0x1c4 + beq MPCall_61_0x1b0 + beq cr1, MPCall_61_0x1c4 cmplwi r5, 0x10 - beq- MPCall_61_0x1d8 + beq MPCall_61_0x1d8 cmplwi r5, 0x1c cmplwi cr1, r5, 0x20 - beq- MPCall_61_0x1ec - beq- cr1, MPCall_61_0x1fc + beq MPCall_61_0x1ec + beq cr1, MPCall_61_0x1fc cmplwi r5, 0x24 cmplwi cr1, r5, 0x18 - beq- MPCall_61_0x218 - beq- cr1, MPCall_61_0x228 + beq MPCall_61_0x218 + beq cr1, MPCall_61_0x228 b ReleaseAndReturnMPCallOOM MPCall_61_0x1b0 @@ -1437,7 +1437,7 @@ MPCall_63 ; OUTSIDE REFERER bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr stw r4, 0x00ec(r8) ; r1 = kdp @@ -1458,7 +1458,7 @@ MPCall_114 ; OUTSIDE REFERER cmpwi r9, Task.kIDClass mr r31, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr mr r8, r4 ; r8 = id @@ -1466,17 +1466,17 @@ MPCall_114 ; OUTSIDE REFERER cmpwi r9, CPU.kIDClass mr r30, r8 - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr lwz r16, 0x0064(r31) lwz r17, 0x00e8(r31) rlwinm. r8, r16, 0, 30, 30 cmplw cr1, r17, r5 lwz r18, 0x0018(r30) - bne+ ReleaseAndReturnMPCallOOM - bne+ cr1, ReleaseAndReturnMPCallOOM + bne ReleaseAndReturnMPCallOOM + bne cr1, ReleaseAndReturnMPCallOOM rlwinm. r8, r18, 0, 28, 28 cmplwi cr1, r17, 0x04 - beq+ ReleaseAndReturnMPCallOOM + beq ReleaseAndReturnMPCallOOM lwz r16, 0x0064(r31) lhz r17, CPU.EWA + EWA.CPUIndex(r30) ori r16, r16, 0x40 @@ -1484,7 +1484,7 @@ MPCall_114 ; OUTSIDE REFERER sth r17, 0x001a(r31) rlwinm. r8, r16, 0, 26, 26 mr r8, r31 - bne- MPCall_114_0x90 + bne MPCall_114_0x90 bl SchTaskUnrdy bl SchRdyTaskNow @@ -1508,7 +1508,7 @@ KCSetTaskType mr r8, r3 bl LookupID cmpwi r9, Task.kIDClass - bne+ ReleaseAndReturnMPCallInvalidIDErr + bne ReleaseAndReturnMPCallInvalidIDErr stw r4, Task.Name(r8) diff --git a/NanoKernel/NKThud.s b/NanoKernel/NKThud.s index 031cae1..8c6c7c3 100644 --- a/NanoKernel/NKThud.s +++ b/NanoKernel/NKThud.s @@ -33,7 +33,7 @@ panic_common mfspr r0, pvr rlwinm. r0, r0, 0, 0, 14 - bne- @no_mq + bne @no_mq dialect POWER mfmq r0 dialect PowerPC @@ -58,7 +58,7 @@ panic_common mfpvr r0 rlwinm. r0, r0, 0, 0, 14 - bne- @not_601 + bne @not_601 @rtcloop dialect POWER @@ -67,7 +67,7 @@ panic_common mfrtcu r3 dialect PowerPC cmpw r0, r3 - bne+ @rtcloop + bne @rtcloop stw r0, KDP.ThudSavedTBU(r1) stw r2, KDP.ThudSavedTB(r1) @@ -79,7 +79,7 @@ panic_common mftb r2 mftbu r3 cmpw r0, r3 - bne+ @tbloop + bne @tbloop stw r0, KDP.ThudSavedTBU(r1) stw r2, KDP.ThudSavedTB(r1) @end_if_601 @@ -172,7 +172,7 @@ panic_common lwz r0, 0x08fc(r1) stfd f31, 0x08fc(r1) stw r0, 0x08fc(r1) - bne- cr1, @0x260 + bne cr1, @0x260 if &TYPE('NKDebugShim') != 'UNDEFINED' b @go_here_to_use_saved_debug_command @@ -190,7 +190,7 @@ panic_common ; gets kdp from print!!! cmpwi r8, -0x01 - bne- @0x260 + bne @0x260 b @0x23c @0x260 @@ -212,13 +212,13 @@ panic_common @input_busywait bl getchar cmpwi r8, -1 - beq+ @input_busywait + beq @input_busywait mr r16, r8 cmpwi r16, 8 ; backspace cmpwi cr1, r17, 0 - bne- @not_backspace - ble+ cr1, @input_busywait + bne @not_backspace + ble cr1, @input_busywait ; Backspace, wipe position, then backspace again! @@ -236,7 +236,7 @@ panic_common ; If cmpwi cr2, r17, 95 addi r18, r1, -0x960 ; prepare to copy the line! - blt- cr2, @short_line + blt cr2, @short_line _log '^b' b @input_busywait @@ -249,7 +249,7 @@ panic_common cmpwi r16, 13 stbx r16, r17, r18 - bne+ @0x30c + bne @0x30c li r16, 0x00 stbx r16, r17, r18 _log '^n' @@ -268,7 +268,7 @@ panic_common ; r16 = char cmpwi r16, 0x00 - beq+ @prompt + beq @prompt bl @load_commands mflr r16 bl @load_tbl @@ -280,7 +280,7 @@ panic_common ; cr0 = found ; r17 = ptr to lut entry - bne- @bad_command + bne @bad_command bl @load_tbl mflr r16 lwz r17, 0x0000(r17) @@ -339,9 +339,9 @@ panic_common ; r16 = char cmpwi r16, 0x00 - beq- @missing_physical_addr + beq @missing_physical_addr bl major_0x187b0 - bne- @bad_length_1 + bne @bad_length_1 mr r30, r16 li r31, 0x10 @@ -351,9 +351,9 @@ panic_common ; r16 = char cmpwi r16, 0x00 - beq- @0x5e0 + beq @0x5e0 bl major_0x187b0 - bne- @bad_length_1 + bne @bad_length_1 mr r31, r16 @0x5e0 @@ -381,9 +381,9 @@ panic_common ; r16 = char cmpwi r16, 0x00 - beq- @missing_logical_addr + beq @missing_logical_addr bl major_0x187b0 - bne- @bad_length_2 + bne @bad_length_2 mr r30, r16 li r31, 0x10 @@ -393,9 +393,9 @@ panic_common ; r16 = char cmpwi r16, 0x00 - beq- @0x6b0 + beq @0x6b0 bl major_0x187b0 - bne- @bad_length_2 + bne @bad_length_2 mr r31, r16 @0x6b0 @@ -422,9 +422,9 @@ panic_common cmpwi r16, 0x00 lwz r31, 0x0904(r1) - beq- @0x748 + beq @0x748 bl major_0x187b0 - bne- @bad_resume_address + bne @bad_resume_address stw r16, 0x0904(r1) @0x748 @@ -454,7 +454,7 @@ panic_common ; r16 = char cmpwi r16, 0x00 - beq- @missing_opaque_id + beq @missing_opaque_id bl @load_id_args mflr r16 li r17, 0x00 @@ -465,7 +465,7 @@ panic_common ; cr0 = found ; r17 = ptr to lut entry - bne- @0x884 + bne @0x884 li r29, 0x00 li r30, 0x00 srwi r31, r17, 2 @@ -475,24 +475,24 @@ panic_common mr r9, r31 bl GetNextIDOfClass mr. r30, r8 - beq- @0x868 + beq @0x868 mr r8, r8 bl Printw addi r29, r29, 0x01 andi. r29, r29, 0x07 - bne+ @0x82c + bne @0x82c _log '^n' b @0x82c @0x868 cmpwi r29, 0x00 - beq+ @prompt + beq @prompt _log '^n' b @prompt @0x884 bl major_0x187b0 - bne- @bad_opaque_id + bne @bad_opaque_id mr r30, r16 mr r8, r16 @@ -511,7 +511,7 @@ panic_common add r8, r17, r18 bl PrintS cmpwi r9, 0x00 - beq- @0x978 + beq @0x978 _log ' at ' mr r8, r31 bl Printw @@ -684,12 +684,12 @@ panic_common lwz r17, 0x07b4(r1) rlwinm r17, r17, 16, 16, 27 cmpwi r17, 0x6800 - bne- major_0x18040_0x100 + bne major_0x18040_0x100 lwz r17, 0x071c(r1) srwi r17, r17, 16 andi. r17, r17, 0xffa0 cmpwi r17, 0x2a0 - bne- major_0x18040_0x64 + bne major_0x18040_0x64 _log 'Caused by emulator termination request^n' b major_0x18040_0x9c @@ -702,8 +702,8 @@ major_0x18040_0x9c subf r17, r18, r17 cmpwi r17, 0x100 cmpwi cr1, r17, -0x100 - bgt- major_0x18040_0x100 - blt- cr1, major_0x18040_0x100 + bgt major_0x18040_0x100 + blt cr1, major_0x18040_0x100 _log 'Looks like interrupt stack overflow by os or application^n' major_0x18040_0x100 @@ -723,8 +723,8 @@ print_xpt_info ; OUTSIDE REFERER bl Printw subf. r21, r18, r20 cmplw cr1, r20, r19 - blt- print_xpt_info_0x84 - bge- cr1, print_xpt_info_0x84 + blt print_xpt_info_0x84 + bge cr1, print_xpt_info_0x84 _log '( NK+' mr r8, r21 bl Printw @@ -739,8 +739,8 @@ print_xpt_info_0x84 mfspr r8, srr0 subf. r21, r18, r8 cmplw cr1, r8, r19 - blt- print_xpt_info_0xf8 - bge- cr1, print_xpt_info_0xf8 + blt print_xpt_info_0xf8 + bge cr1, print_xpt_info_0xf8 _log '( NK+' mr r8, r21 bl Printw @@ -821,7 +821,7 @@ print_segment_registers_0x28 mfsrin r8, r18 addis r18, r18, 0x1000 bl Printw - bdnz+ print_segment_registers_0x28 + bdnz print_segment_registers_0x28 _log '^n sr8-sr15 ' li r17, 0x08 mtctr r17 @@ -830,7 +830,7 @@ print_segment_registers_0x5c mfsrin r8, r18 addis r18, r18, 0x1000 bl Printw - bdnz+ print_segment_registers_0x5c + bdnz print_segment_registers_0x5c _log '^n' mtlr r16 blr @@ -847,7 +847,7 @@ print_gprs ; OUTSIDE REFERER print_gprs_0x28 lwzu r8, 0x0004(r17) bl Printw - bdnz+ print_gprs_0x28 + bdnz print_gprs_0x28 _log '^n r8-r15 ' li r18, 0x08 mtctr r18 @@ -855,7 +855,7 @@ print_gprs_0x28 print_gprs_0x58 lwzu r8, 0x0004(r17) bl Printw - bdnz+ print_gprs_0x58 + bdnz print_gprs_0x58 _log '^n r16-r23 ' li r18, 0x08 mtctr r18 @@ -863,7 +863,7 @@ print_gprs_0x58 print_gprs_0x88 lwzu r8, 0x0004(r17) bl Printw - bdnz+ print_gprs_0x88 + bdnz print_gprs_0x88 _log '^n r24-r31 ' li r18, 0x08 mtctr r18 @@ -871,7 +871,7 @@ print_gprs_0x88 print_gprs_0xb8 lwzu r8, 0x0004(r17) bl Printw - bdnz+ print_gprs_0xb8 + bdnz print_gprs_0xb8 _log '^n' mtlr r16 blr @@ -902,24 +902,24 @@ print_memory_0x8 print_memory_0x60 lbzu r8, 0x0001(r16) cmpwi r8, 0xff - beq- print_memory_0x74 + beq print_memory_0x74 cmpwi r8, 0x20 - bgt- print_memory_0x78 + bgt print_memory_0x78 print_memory_0x74 li r8, 0x20 print_memory_0x78 bl Printc - bdnz+ print_memory_0x60 + bdnz print_memory_0x60 _log '*^n' addi r16, r16, 0x01 addi r17, r17, -0x01 bl getchar cmpwi r8, -0x01 - bne- print_memory_0xb0 + bne print_memory_0xb0 cmpwi r17, 0x00 - bne+ print_memory_0x8 + bne print_memory_0x8 print_memory_0xb0 _log '^n' @@ -941,8 +941,8 @@ print_memory_logical_0x8 print_memory_logical_0x24 mr r27, r16 bl PagingFunc1 - beq- print_memory_logical_0x5c - blt- print_memory_logical_0x48 + beq print_memory_logical_0x5c + blt print_memory_logical_0x48 _log '..' b print_memory_logical_0x6c @@ -960,13 +960,13 @@ print_memory_logical_0x6c addi r16, r16, 0x01 addi r19, r19, -0x01 andi. r8, r19, 0x03 - bne- print_memory_logical_0x84 + bne print_memory_logical_0x84 li r8, 0x20 bl Printc print_memory_logical_0x84 cmpwi r19, 0x00 - bgt+ print_memory_logical_0x24 + bgt print_memory_logical_0x24 _log ' *' li r8, 0x10 addi r16, r16, -0x10 @@ -976,14 +976,14 @@ print_memory_logical_0xac mr r27, r16 bl PagingFunc1 li r8, 0x20 - bne- print_memory_logical_0xdc + bne print_memory_logical_0xdc bl PagingFunc4 rlwimi r31, r27, 0, 20, 31 lbz r8, 0x0000(r31) cmpwi r8, 0xff - beq- print_memory_logical_0xd8 + beq print_memory_logical_0xd8 cmpwi r8, 0x20 - bgt- print_memory_logical_0xdc + bgt print_memory_logical_0xdc print_memory_logical_0xd8 li r8, 0x20 @@ -991,14 +991,14 @@ print_memory_logical_0xd8 print_memory_logical_0xdc bl Printc addi r16, r16, 0x01 - bdnz+ print_memory_logical_0xac + bdnz print_memory_logical_0xac _log '*^n' addi r17, r17, -0x01 bl getchar cmpwi r8, -0x01 - bne- print_memory_logical_0x114 + bne print_memory_logical_0x114 cmpwi r17, 0x00 - bne+ print_memory_logical_0x8 + bne print_memory_logical_0x8 print_memory_logical_0x114 _log '^n' @@ -1023,15 +1023,15 @@ cmd_lookup_0xc lbzu r20, 0x0001(r15) cmpwi r21, 0xff cmpwi cr1, r21, 0x00 - beq- cmd_lookup_0x44 - beq- cr1, cmd_lookup_0x50 + beq cmd_lookup_0x44 + beq cr1, cmd_lookup_0x50 cmpw r20, r21 - beq+ cmd_lookup_0xc + beq cmd_lookup_0xc cmd_lookup_0x2c lbzu r21, 0x0001(r16) cmpwi r21, 0x00 - bne+ cmd_lookup_0x2c + bne cmd_lookup_0x2c cmd_lookup_0x38 addi r17, r17, 0x04 @@ -1045,9 +1045,9 @@ cmd_lookup_0x44 cmd_lookup_0x50 cmpwi r20, 0x20 - beqlr- + beqlr cmpwi r20, 0x00 - beqlr- + beqlr b cmd_lookup_0x38 @@ -1063,7 +1063,7 @@ next_cmd_word ; OUTSIDE REFERER next_cmd_word_0x4 lbzu r16, 0x0001(r15) cmpwi r16, 0x20 - beq+ next_cmd_word_0x4 + beq next_cmd_word_0x4 blr @@ -1076,8 +1076,8 @@ major_0x187b0_0x8 lbzu r17, 0x0001(r15) cmplwi r17, 0x30 cmplwi cr1, r17, 0x39 - blt- major_0x187b0_0x28 - bgt- cr1, major_0x187b0_0x28 + blt major_0x187b0_0x28 + bgt cr1, major_0x187b0_0x28 slwi r16, r16, 4 rlwimi r16, r17, 0, 28, 31 b major_0x187b0_0x8 @@ -1085,8 +1085,8 @@ major_0x187b0_0x8 major_0x187b0_0x28 cmplwi r17, 0x61 cmplwi cr1, r17, 0x66 - blt- major_0x187b0_0x48 - bgt- cr1, major_0x187b0_0x48 + blt major_0x187b0_0x48 + bgt cr1, major_0x187b0_0x48 addi r17, r17, -0x57 slwi r16, r16, 4 rlwimi r16, r17, 0, 28, 31 @@ -1095,8 +1095,8 @@ major_0x187b0_0x28 major_0x187b0_0x48 cmplwi r17, 0x41 cmplwi cr1, r17, 0x46 - blt- major_0x187b0_0x68 - bgt- cr1, major_0x187b0_0x68 + blt major_0x187b0_0x68 + bgt cr1, major_0x187b0_0x68 addi r17, r17, -0x37 slwi r16, r16, 4 rlwimi r16, r17, 0, 28, 31 @@ -1104,7 +1104,7 @@ major_0x187b0_0x48 major_0x187b0_0x68 cmpwi r17, 0x00 - beqlr- + beqlr cmpwi r17, 0x20 blr @@ -1199,7 +1199,7 @@ prereturn ; OUTSIDE REFERER mfpvr r0 rlwinm. r0, r0, 0, 0, 14 - bne- @not_601 + bne @not_601 lwz r0, 0x0784(r1) mtspr mq, r0 @not_601 diff --git a/NanoKernel/NKTimers.s b/NanoKernel/NKTimers.s index 780e399..ed1818a 100644 --- a/NanoKernel/NKTimers.s +++ b/NanoKernel/NKTimers.s @@ -23,7 +23,7 @@ InitTMRQs ; OUTSIDE REFERER stw r8, 0x003c(r9) mfspr r8, pvr rlwinm. r8, r8, 0, 0, 14 - beq- InitTMRQs_0x7c + beq InitTMRQs_0x7c mflr r30 li r8, 0x40 @@ -33,7 +33,7 @@ InitTMRQs ; OUTSIDE REFERER ; r8 = ptr mr. r31, r8 - beq+ Local_Panic + beq Local_Panic stw r31, -0x0434(r1) li r9, 0x07 stb r9, 0x0014(r31) @@ -44,7 +44,7 @@ InitTMRQs ; OUTSIDE REFERER InitTMRQs_0x7c mfspr r8, pvr rlwinm. r8, r8, 0, 0, 14 - beq- InitTMRQs_0xb4 + beq InitTMRQs_0xb4 mflr r30 li r8, 0x40 @@ -54,7 +54,7 @@ InitTMRQs_0x7c ; r8 = ptr mr. r31, r8 - beq+ Local_Panic + beq Local_Panic stw r31, -0x0364(r1) li r9, 0x08 stb r9, 0x0014(r31) @@ -70,11 +70,11 @@ InitTMRQs_0xb4 lwz r30, KDP.PA_ConfigInfo(r1) lhz r31, NKConfigurationInfo.Debug(r30) cmplwi r31, NKConfigurationInfo.DebugThreshold - blt- @nodebug + blt @nodebug lwz r31, NKConfigurationInfo.DebugFlags(r30) rlwinm. r8, r31, 0, NKConfigurationInfo.NanodbgrFlagBit, NKConfigurationInfo.NanodbgrFlagBit - beq- @nodebug + beq @nodebug lwz r8, KDP.NanoKernelInfo + NKNanoKernelInfo.ConfigFlags(r1) _bset r8, r8, NKNanoKernelInfo.NanodbgrFlagBit @@ -85,7 +85,7 @@ InitTMRQs_0xb4 li r8, Timer.Size bl PoolAllocClear ; one of those weird queue structures mr. r31, r8 - beq+ Local_Panic + beq Local_Panic li r9, Timer.kKind6 stb r9, Timer.Kind(r31) @@ -128,7 +128,7 @@ TimerDispatch ; OUTSIDE REFERER TimerDispatch_0x30 ; OUTSIDE REFERER mfspr r8, pvr rlwinm. r8, r8, 0, 0, 14 - beq- @is_601 + beq @is_601 ;not 601 @gettime_loop_non_601 @@ -171,7 +171,7 @@ TimerDispatch_0x30 ; OUTSIDE REFERER addi r30, r18, EWA.Base cmpwi r19, 1 lwz r16, EWA.GlobalTime - EWA.Base(r30) - bne- timer_earlier_than_sometime + bne timer_earlier_than_sometime lwz r17, EWA.GlobalTime + 4 - EWA.Base(r30) _b_if_time_gt r16, r8, timer_earlier_than_sometime @@ -196,7 +196,7 @@ timer_earlier_than_sometime llabel r20, TimerTable li r21, 0x00 add r20, r20, r19 - bgel+ Local_Panic + bgel Local_Panic stb r21, 0x0017(r30) lwz r20, 0x0000(r20) add r20, r20, r19 @@ -210,13 +210,13 @@ TimerDispatch_0x144 lbz r19, 0x0016(r30) cmpwi r19, 0x01 lwz r8, 0x0000(r30) - beq+ TimerDispatch_0x30 + beq TimerDispatch_0x30 bl DeleteID mr r8, r30 bl PoolFree lwz r8, 0x001c(r30) cmpwi r8, 0x00 - beq- TimerDispatch_0x180 + beq TimerDispatch_0x180 bl PoolFree li r8, 0x00 stw r8, 0x001c(r30) @@ -288,7 +288,7 @@ SetTimesliceFromCurTimeAndTripTime ; r16/r17 = soonest(last timer, global PSA time if available) - bne- global_time_invalid + bne global_time_invalid lwz r18, EWA.GlobalTime(r19) lwz r19, EWA.GlobalTime+4(r19) @@ -304,10 +304,10 @@ global_time_invalid subfe. r16, r8, r16 mtxer r20 - blt- @that_time_has_passed ; hi bit of r16 = 1 - bne- @that_time_is_in_future ; + blt @that_time_has_passed ; hi bit of r16 = 1 + bne @that_time_is_in_future ; cmplw r16, r21 ; typo? should be r17??? - bgt- @that_time_is_in_future ; will never be taken... + bgt @that_time_is_in_future ; will never be taken... ; When the times are roughly equal? mtspr dec, r17 @@ -344,7 +344,7 @@ TimerFire1 ; OUTSIDE REFERER lwz r19, 0x0088(r8) cmpwi r17, 0x00 stw r16, 0x011c(r19) - bne- TimerFire1_0x64 + bne TimerFire1_0x64 addi r16, r8, 0x08 RemoveFromList r16, scratch1=r17, scratch2=r19 li r17, 0x01 @@ -363,7 +363,7 @@ TimerFire1_0x64 ; TimerFire2 TimerFire2 ; OUTSIDE REFERER - bne+ TimerDispatch_0x144 + bne TimerDispatch_0x144 bl Local_Panic lwz r18, 0x0018(r30) stw r16, 0x0080(r18) @@ -373,7 +373,7 @@ TimerFire2 ; OUTSIDE REFERER lbz r17, 0x0018(r8) lwz r18, 0x0088(r8) cmpwi r17, 0x00 - bne- TimerFire3_0x8 + bne TimerFire3_0x8 stw r16, 0x011c(r18) lwz r8, 0x0008(r8) lwz r8, 0x0000(r8) @@ -383,12 +383,12 @@ TimerFire2 ; OUTSIDE REFERER cmpwi r9, Queue.kIDClass cmpwi cr1, r9, 0x05 - beq- TimerFire2_0x8c - beq- cr1, TimerFire2_0x7c + beq TimerFire2_0x8c + beq cr1, TimerFire2_0x7c cmpwi r9, 0x09 cmpwi cr1, r9, 0x06 - beq- TimerFire2_0x6c - bne+ cr1, Local_Panic + beq TimerFire2_0x6c + bne cr1, Local_Panic lwz r16, 0x0020(r8) addi r16, r16, -0x01 stw r16, 0x0020(r8) @@ -441,21 +441,21 @@ TimerFire3_0x8 ; OUTSIDE REFERER cmpwi r9, Queue.kIDClass mr r31, r8 - bne- major_0x13258_0x68 + bne major_0x13258_0x68 lwz r16, 0x0024(r31) lwz r8, 0x001c(r30) cmpwi r16, 0x00 cmpwi cr1, r8, 0x00 - beq- major_0x13258_0x40 + beq major_0x13258_0x40 lwz r17, 0x0028(r31) mr. r8, r17 lwz r17, 0x0008(r17) - beq- major_0x13258_0x68 + beq major_0x13258_0x68 stw r17, 0x0028(r31) b major_0x13258_0x4c major_0x13258_0x40 - beq- cr1, major_0x13258_0x68 + beq cr1, major_0x13258_0x68 li r16, 0x00 stw r16, 0x001c(r30) @@ -476,7 +476,7 @@ major_0x13258_0x68 cmpwi r9, Semaphore.kIDClass mr r31, r8 - bne- major_0x13258_0x80 + bne major_0x13258_0x80 bl SignalSemaphore major_0x13258_0x80 @@ -493,7 +493,7 @@ major_0x13258_0x80 ; TimerFire4 TimerFire4 ; OUTSIDE REFERER - bne- TimerFire4_0xc + bne TimerFire4_0xc lwz r8, 0x0030(r30) bl SetEvent @@ -507,12 +507,12 @@ TimerFire4_0x10 ; OUTSIDE REFERER bl SchTaskUnrdy lbz r17, 0x0019(r29) cmpwi r17, 0x02 - bge- TimerFire4_0x64 + bge TimerFire4_0x64 mr r8, r29 lwz r16, 0x0038(r30) lwz r17, 0x003c(r30) bl clear_cr0_lt - bge- TimerFire4_0x50 + bge TimerFire4_0x50 mr r8, r29 bl SchRdyTaskNow bl CalculateTimeslice @@ -624,7 +624,7 @@ TimerFire7 ; OUTSIDE REFERER lwz r18, -0x0438(r1) lwz r19, 0x0f88(r1) subf. r19, r18, r19 - ble- TimerFire8_0x1c + ble TimerFire8_0x1c srwi r19, r19, 11 mfxer r20 @@ -669,7 +669,7 @@ TimerFire8_0x1c ; OUTSIDE REFERER mfxer r20 cmpwi cr1, r19, 0x00 srawi r8, r19, 31 - beq- cr1, TimerFire6_0x4 + beq cr1, TimerFire6_0x4 major_0x13544_0x14 mftbu r16 @@ -683,7 +683,7 @@ major_0x13544_0x14 adde r18, r16, r8 mttbu r18 mttb r19 - bgt- cr1, major_0x13544_0x64 + bgt cr1, major_0x13544_0x64 major_0x13544_0x44 mftbu r18 @@ -693,7 +693,7 @@ major_0x13544_0x44 bne- major_0x13544_0x44 subfc r19, r17, r19 subfe. r18, r16, r18 - blt+ major_0x13544_0x44 + blt major_0x13544_0x44 major_0x13544_0x64 lwz r18, -0x0368(r1) @@ -710,7 +710,7 @@ TimerFire6 ; OUTSIDE REFERER TimerFire6_0x4 ; OUTSIDE REFERER mtxer r20 - beq+ cr1, TimerDispatch_0x144 + beq cr1, TimerDispatch_0x144 mr r8, r30 bl EnqueueTimer b TimerDispatch_0x144 @@ -735,7 +735,7 @@ TimerFire6_0x4 ; OUTSIDE REFERER bl EnqueueTimer bl getchar cmpwi r8, -0x01 - beq+ TimerDispatch_0x144 + beq TimerDispatch_0x144 bl panic_non_interactive b TimerDispatch_0x144 @@ -759,9 +759,9 @@ EnqueueTimer ; OUTSIDE REFERER ; First try to insert at head of global TMRQ cmpw r16, r18 cmplw cr1, r17, r19 - bgt- @insert_further_ahead - blt- @insert_at_tail - bge- cr1, @insert_further_ahead + bgt @insert_further_ahead + blt @insert_at_tail + bge cr1, @insert_further_ahead @insert_at_tail addi r20, r1, PSA.TimerQueue + TimerQueueStruct.LLL @@ -790,9 +790,9 @@ EnqueueTimer ; OUTSIDE REFERER lwz r19, Timer.Time+4(r20) cmpw r16, r18 cmplw cr1, r17, r19 - bgt- @insert_after_this_one - blt- @next - bge- cr1, @insert_after_this_one + bgt @insert_after_this_one + blt @next + bge cr1, @insert_after_this_one @next lwz r20, LLL.Prev(r20) @@ -826,7 +826,7 @@ DequeueTimer lwz r16, Timer.QueueLLL + LLL.FreeForm(r8) cmpwi r16, 0 lwz r18, PSA.TimerQueue + TimerQueueStruct.LLL + LLL.Next(r1) - beq+ Local_Panic + beq Local_Panic RemoveFromList r8, scratch1=r16, scratch2=r17 @@ -834,7 +834,7 @@ DequeueTimer cmpw r18, r8 stb r16, Timer.Byte3(r8) - beq+ SetTimeslice + beq SetTimeslice blr @@ -880,7 +880,7 @@ GetTime mfpvr r8 rlwinm. r8, r8, 0, 0, 14 - beq- @is_601 + beq @is_601 @retry_timebase: mftbu r8 diff --git a/NanoKernel/NKTranslation.s b/NanoKernel/NKTranslation.s index 91647d3..abb1e50 100644 --- a/NanoKernel/NKTranslation.s +++ b/NanoKernel/NKTranslation.s @@ -2141,14 +2141,14 @@ ProbePerfMonitor ; OUTSIDE REFERER TestSPR r19, r18, r19, SIA or. r17, r17, r19 - bne- @dont_set_bit_31 + bne @dont_set_bit_31 _bset r23, r23, 31 @dont_set_bit_31 ; ONLY test for bits 28-30 if bit 31 was just set... mr. r23, r23 - beq- @stop_testing_perf_monitor + beq @stop_testing_perf_monitor ; SET BIT 30 if all the 750 perf monitor registers work @@ -2158,7 +2158,7 @@ ProbePerfMonitor ; OUTSIDE REFERER TestSPR r19, r18, r19, PMC4 or. r17, r17, r19 - bne- @dont_set_bit_30 + bne @dont_set_bit_30 _bset r23, r23, 30 @dont_set_bit_30 @@ -2167,7 +2167,7 @@ ProbePerfMonitor ; OUTSIDE REFERER li r18, 0xaaa0 TestSPR. r17, r18, r19, SDA - beq- @dont_set_bit_29 + beq @dont_set_bit_29 _bset r23, r23, 29 @dont_set_bit_29 @@ -2181,7 +2181,7 @@ ProbePerfMonitor ; OUTSIDE REFERER or. r17, r17, r19 - bne- @dont_set_bit_28 + bne @dont_set_bit_28 _bset r23, r23, 28 @dont_set_bit_28 @@ -2204,7 +2204,7 @@ ProbePerfMonitor ; OUTSIDE REFERER ; SET BIT 18 if any perf monitor features present - beq- * + 8 + beq * + 8 _bset r23, r23, 18 @@ -2225,7 +2225,7 @@ ProbePerfMonitor ; OUTSIDE REFERER cmpw cr1, r20, r19 addi r23, r23, 0x02 xor. r24, r24, r24 - bge- cr1, ProbePerfMonitor_0x180 + bge cr1, ProbePerfMonitor_0x180 addi r23, r23, -0x01 ProbePerfMonitor_0x160 @@ -2235,15 +2235,15 @@ ProbePerfMonitor_0x160 cmplw cr2, r20, r19 rlwinm. r24, r24, 1, 0, 30 slwi r21, r21, 1 - blt- cr1, ProbePerfMonitor_0x180 - blt- cr2, ProbePerfMonitor_0x188 + blt cr1, ProbePerfMonitor_0x180 + blt cr2, ProbePerfMonitor_0x188 ProbePerfMonitor_0x180 subf r20, r19, r20 ori r24, r24, 0x01 ProbePerfMonitor_0x188 - bge+ ProbePerfMonitor_0x160 + bge ProbePerfMonitor_0x160 stw r24, 0x05bc(r1) stb r23, 0x05b8(r1) li r21, 0x20 @@ -2309,11 +2309,11 @@ FDPEmulateInstruction mfsprg r1, 0 rlwinm r17, r27, 13, 25, 29 rlwinm r18, r27, 18, 25, 29 - beq- cr6, FDP_1214_0x2b4 + beq cr6, FDP_1214_0x2b4 mtcrf 0x3f, r21 rlwinm r19, r27, 23, 25, 29 - beq- FDP_1bd0 - bne- cr1, FDP_1324 + beq FDP_1bd0 + bne cr1, FDP_1324 rlwinm r21, r27, 2, 24, 28 add r21, r21, r25 lwz r20, 0x1374(r21) @@ -2322,25 +2322,25 @@ FDPEmulateInstruction rotlw. r20, r20, r23 add r21, r21, r25 mtlr r21 - bltlr- + bltlr FDP_1324 - ble- cr1, FDP_1338 + ble cr1, FDP_1338 lis r20, 0x5556 ori r20, r20, 0x5500 rotlw. r20, r20, r23 - blt- FDP_1c18 + blt FDP_1c18 FDP_1338 mtcrf 0x70, r11 li r8, 0x04 - ble- cr3, FDP_1354 + ble cr3, FDP_1354 FDP_1344 mtcrf 0x0f, r11 li r8, 0x04 - ble- cr4, FDP_1354 + ble cr4, FDP_1354 li r8, 0x05 FDP_1354 @@ -2424,12 +2424,12 @@ FDP_14b0 FDP_1214_0x2b4 mtcrf 0x3f, r21 - bns+ cr2, FDP_1338 + bns cr2, FDP_1338 lwzx r18, r1, r18 extsh r19, r27 cmpw cr1, r19, r18 subf r21, r21, r21 - blt+ cr1, FDP_1484 + blt cr1, FDP_1484 subf r21, r18, r19 b FDP_1484 @@ -3061,7 +3061,7 @@ FDP_1b50 FDP_1b54 - bns+ cr7, FDP_0da0 + bns cr7, FDP_0da0 mfcr r23 rlwimi r13, r23, 0, 0, 3 b FDP_0da0 @@ -3104,7 +3104,7 @@ FDP_1bbc FDP_1bd0 - bns+ cr2, FDP_1338 + bns cr2, FDP_1338 lwzx r17, r1, r17 rlwinm r20, r27, 26, 27, 31 lwzx r19, r1, r19 @@ -3128,7 +3128,7 @@ FDP_1c08 FDP_1c18 - ble+ cr3, FDP_1338 + ble cr3, FDP_1338 b major_0x03324 bgt cr6, FDP_1C18 bge cr4, FDP_1338 @@ -3267,9 +3267,9 @@ FDP_1c40 ; OUTSIDE REFERER rlwinm r17, r27, 15, 23, 27 rlwinm r18, r27, 20, 23, 27 rlwinm r19, r27, 25, 23, 27 - blt- FDP_1c40_0x398 - beq- cr2, FDP_1c40_0x43c - bgt- cr1, FDP_1c40_0x278 + blt FDP_1c40_0x398 + beq cr2, FDP_1c40_0x43c + bgt cr1, FDP_1c40_0x278 lvx v3, r24, r19 vspltisw v31, 0x00 vspltisw v29, 0x01 @@ -3384,7 +3384,7 @@ FDP_1c40_0x278 mfsprg r1, 0 mtspr srr0, r10 mtspr srr1, r11 - bne+ FDP_0E30 + bne FDP_0E30 mtlr r12 b FDP_0DC8 @@ -3395,7 +3395,7 @@ FDP_1c40_0x398 mtmsr r15 isync rlwinm. r8, r11, 0, 18, 18 - beq- FDP_1c40_0x3cc + beq FDP_1c40_0x3cc stfd f0, 0x0200(r6) mffs f0 stfd f1, 0x0208(r6) @@ -3415,22 +3415,22 @@ FDP_1c40_0x3e0 addic. r8, r8, -0x01 lfsx f1, r24, r19 lfsx f2, r24, r22 - bne- cr6, FDP_1c40_0x408 + bne cr6, FDP_1c40_0x408 fnmsubs f3, f0, f2, f1 stfsx f3, r24, r17 addi r24, r24, 0x04 - bge+ FDP_1c40_0x3e0 + bge FDP_1c40_0x3e0 b FDP_1c40_0x418 FDP_1c40_0x408 fmadds f3, f0, f2, f1 stfsx f3, r24, r17 addi r24, r24, 0x04 - bge+ FDP_1c40_0x3e0 + bge FDP_1c40_0x3e0 FDP_1c40_0x418 addi r24, r24, -0x10 - beq+ cr7, FDP_1c40_0x278 + beq cr7, FDP_1c40_0x278 lfd f0, 0x00e0(r6) mtfsf 0xff, f0 lfd f0, 0x0200(r6) @@ -3445,7 +3445,7 @@ FDP_1c40_0x43c mtmsr r15 isync rlwinm. r8, r11, 0, 18, 18 - beq- FDP_1c40_0x468 + beq FDP_1c40_0x468 stfd f0, 0x0200(r6) mffs f0 stfd f1, 0x0208(r6) @@ -3463,22 +3463,22 @@ FDP_1c40_0x47c lfsx f0, r24, r18 addic. r8, r8, -0x01 lfsx f1, r24, r19 - bne- cr6, FDP_1c40_0x4a0 + bne cr6, FDP_1c40_0x4a0 fsubs f3, f0, f1 stfsx f3, r24, r17 addi r24, r24, 0x04 - bge+ FDP_1c40_0x47c + bge FDP_1c40_0x47c b FDP_1c40_0x4b0 FDP_1c40_0x4a0 fadds f3, f0, f1 stfsx f3, r24, r17 addi r24, r24, 0x04 - bge+ FDP_1c40_0x47c + bge FDP_1c40_0x47c FDP_1c40_0x4b0 addi r24, r24, -0x10 - beq+ cr7, FDP_1c40_0x278 + beq cr7, FDP_1c40_0x278 lfd f0, 0x00e0(r6) mtfsf 0xff, f0 lfd f0, 0x0200(r6) diff --git a/NanoKernel/NKVMCalls.s b/NanoKernel/NKVMCalls.s index 2d37181..1fd5afc 100644 --- a/NanoKernel/NKVMCalls.s +++ b/NanoKernel/NKVMCalls.s @@ -60,14 +60,14 @@ kcVMDispatch ; OUTSIDE REFERER mfpvr r9 srwi r9, r9, 16 cmpwi cr2, r9, 0x0009 - beq- @other_pvr_test + beq @other_pvr_test cmpwi cr2, r9, 0x000a @other_pvr_test lwz r7, KDP.NanoKernelInfo + NKNanoKernelInfo.VMDispatchCountTblPtr(r1) rlwinm r8, r3, 2, 20, 29 cmplwi r7, 0 - beq- @no_count + beq @no_count lwzx r9, r7, r8 addi r9, r9, 1 stwx r9, r7, r8 @@ -88,7 +88,7 @@ VMDispatchTableEnd rlwimi r7, r3, 2, 23, 29 llabel r8, VMDispatchMainTable - bne- cr1, @noalt + bne cr1, @noalt llabel r8, VMDispatchAltTable @noalt @@ -96,7 +96,7 @@ VMDispatchTableEnd lwz r9, KDP.PrimaryAddrRangePages(r1) add r8, r8, r7 mtlr r8 - bltlr- + bltlr @@ -184,7 +184,7 @@ VMFinalInit ; OUTSIDE REFERER cmpwi r31, 0 add r30, r30, r31 ; r30 = TopOfFreePages - PA_NanoKernelCode + OtherFreeThing - beq- @skip + beq @skip li r8, 0 stw r8, KDP.OtherFreeThing(r1) @@ -205,15 +205,15 @@ VMFinalInit ; OUTSIDE REFERER srwi r4, r31, 12 lwz r9, KDP.PrimaryAddrRangePages(r1) bl GetPARPageInfo - bge- cr4, @skip - bltl- cr5, RemovePageFromTLB - bgel- cr5, VMSecondLastExportedFunc + bge cr4, @skip + bltl cr5, RemovePageFromTLB + bgel cr5, VMSecondLastExportedFunc ori r16, r16, 0x400 rlwimi r9, r29, 0, 0, 19 bl RemovePTEFromHTAB addi r31, r31, 0x1000 cmplw r31, r30 - ble+ @loop + ble @loop @skip mfsprg r8, 0 @@ -237,7 +237,7 @@ VMInit ; OUTSIDE REFERER lwz r7, KDP.FlatPageListPtr(r1) ; check that zero seg isn't empty lwz r8, KDP.FlatPageListSegPtrs + 0(r1) cmpw r7, r8 - bne+ VMReturn1 + bne VMReturn1 stw r4, KDP.PrimaryAddrRangePages(r1) ; resize PAR @@ -257,37 +257,37 @@ VMInit_BigLoop cmpwi cr1, r3, 0x00 andi. r3, r8, 0xc00 cmpwi r3, 0xc00 - bne- VMInit_0x110 - bnel+ cr1, Local_Panic + bne VMInit_0x110 + bnel cr1, Local_Panic rlwinm r15, r8, 22, 0, 29 addi r3, r1, 0x6c0 rlwimi r3, r5, 2, 28, 29 stw r15, 0x0000(r3) slwi r3, r5, 16 cmpw r3, r4 - bnel+ Local_Panic + bnel Local_Panic VMInit_0xa8 lwz r16, 0x0000(r15) addi r7, r7, -0x01 andi. r3, r16, 0x01 - beql+ Local_Panic + beql Local_Panic andi. r3, r16, 0x800 - beq- VMInit_0x100 + beq VMInit_0x100 lwz r14, KDP.HTABORG(r1) rlwinm r3, r16, 23, 9, 28 lwzux r8, r14, r3 lwz r9, 0x0004(r14) andis. r3, r8, 0x8000 - beql+ Local_Panic + beql Local_Panic andi. r3, r9, 0x03 cmpwi r3, 0x00 - beql+ Local_Panic + beql Local_Panic rlwinm r3, r16, 17, 22, 31 rlwimi r3, r8, 10, 16, 21 rlwimi r3, r8, 21, 12, 15 cmpw r3, r4 - bnel+ Local_Panic + bnel Local_Panic bl RemovePageFromTLB bl RemovePTEFromHTAB @@ -295,7 +295,7 @@ VMInit_0x100 cmpwi r7, 0x00 addi r15, r15, 0x04 addi r4, r4, 0x01 - bne+ VMInit_0xa8 + bne VMInit_0xa8 VMInit_0x110 lwz r7, KDP.VMMaxVirtualPages(r1) @@ -303,25 +303,25 @@ VMInit_0x110 addi r7, r7, -0x01 srwi r7, r7, 16 cmpw r5, r7 - ble+ VMInit_BigLoop + ble VMInit_BigLoop lwz r7, KDP.TotalPhysicalPages(r1) cmpw r4, r7 - bnel+ Local_Panic + bnel Local_Panic lwz r5, KDP.FlatPageListPtr(r1) lwz r4, KDP.PrimaryAddrRangePages(r1) andi. r7, r5, 0xfff li r3, 0x02 - bne- VMInit_Fail + bne VMInit_Fail lwz r7, KDP.VMMaxVirtualPages(r1) cmplw r7, r4 li r3, 0x03 - blt- VMInit_Fail + blt VMInit_Fail addi r7, r4, 0x3ff srwi r6, r7, 10 @@ -331,12 +331,12 @@ VMInit_0x110 cmplw r8, r9 li r3, 0x04 - bgt- VMInit_Fail + bgt VMInit_Fail cmplw r4, r9 li r3, 0x05 - blt- VMInit_Fail + blt VMInit_Fail srwi r7, r5, 12 bl major_0x09c9c @@ -352,7 +352,7 @@ VMInit_0x110 cmpw r9, r6 li r3, 0x06 - bne- VMInit_Fail + bne VMInit_Fail stw r4, KDP.PrimaryAddrRangePages(r1) lwz r8, -0x0020(r1) @@ -365,7 +365,7 @@ VMInit_0x1d4 subi r7, r7, 4 cmpwi r7, 0x00 stwx r8, r15, r7 - bne+ VMInit_0x1d4 + bne VMInit_0x1d4 lwz r7, KDP.TotalPhysicalPages(r1) slwi r6, r7, 2 @@ -376,7 +376,7 @@ VMInit_0x1ec cmpwi r6, 0x00 ori r16, r9, 0x21 stwx r16, r15, r6 - bne+ VMInit_0x1ec + bne VMInit_0x1ec lwz r15, KDP.FlatPageListPtr(r1) srwi r7, r5, 10 add r15, r15, r7 @@ -385,13 +385,13 @@ VMInit_0x1ec VMInit_0x218 lwz r16, 0x0000(r15) andi. r7, r16, 0x01 - beql+ Local_Panic + beql Local_Panic ori r16, r16, 0x404 stw r16, 0x0000(r15) addi r5, r5, -0x400 cmpwi r5, 0x00 addi r15, r15, 0x04 - bgt+ VMInit_0x218 + bgt VMInit_0x218 lwz r9, KDP.VMMaxVirtualPages(r1) lwz r6, 0x05e8(r1) addi r9, r9, -0x01 @@ -407,7 +407,7 @@ VMInit_0x250 stw r7, 0x0008(r3) stw r8, 0x000c(r3) addis r9, r9, -0x01 - bgt+ VMInit_0x250 + bgt VMInit_0x250 sth r9, 0x0002(r3) sth r9, 0x000a(r3) lwz r6, 0x05e8(r1) @@ -418,7 +418,7 @@ VMInit_0x288 lwz r8, 0x0000(r6) lis r7, 0x01 rlwinm. r3, r9, 16, 16, 31 - bne- VMInit_0x29c + bne VMInit_0x29c mr r7, r9 VMInit_0x29c @@ -430,7 +430,7 @@ VMInit_0x29c stw r7, 0x0004(r8) addis r15, r15, 0x04 addi r6, r6, 0x08 - bne+ VMInit_0x288 + bne VMInit_0x288 mfsprg r9, 0 @@ -443,7 +443,7 @@ VMInit_0x29c lwz r16, Area.LogicalBase(r8) cmpwi r16, 0 - bne+ Local_Panic ; better be at address 0 + bne Local_Panic ; better be at address 0 li r16, 0 stw r16, Area.FaultCtrArrayPtr(r8) @@ -488,25 +488,25 @@ VMInit_Fail VMExchangePages ; OUTSIDE REFERER bl GetPARPageInfo - bge+ cr4, VMReturnMinus1 - bgt+ cr5, VMReturnMinus1 - bns+ cr7, VMReturnMinus1 - bgt+ cr6, VMReturnMinus1 - bne+ cr6, VMReturnMinus1 - bltl- cr5, RemovePageFromTLB - bltl- cr5, RemovePTEFromHTAB + bge cr4, VMReturnMinus1 + bgt cr5, VMReturnMinus1 + bns cr7, VMReturnMinus1 + bgt cr6, VMReturnMinus1 + bne cr6, VMReturnMinus1 + bltl cr5, RemovePageFromTLB + bltl cr5, RemovePTEFromHTAB mr r6, r15 mr r4, r5 mr r5, r16 lwz r9, KDP.PrimaryAddrRangePages(r1) bl GetPARPageInfo - bge+ cr4, VMReturnMinus1 - bgt+ cr5, VMReturnMinus1 - bns+ cr7, VMReturnMinus1 - bgt+ cr6, VMReturnMinus1 - bne+ cr6, VMReturnMinus1 - bltl- cr5, RemovePageFromTLB - bltl- cr5, RemovePTEFromHTAB + bge cr4, VMReturnMinus1 + bgt cr5, VMReturnMinus1 + bns cr7, VMReturnMinus1 + bgt cr6, VMReturnMinus1 + bne cr6, VMReturnMinus1 + bltl cr5, RemovePageFromTLB + bltl cr5, RemovePTEFromHTAB stw r5, 0x0000(r15) stw r16, 0x0000(r6) rlwinm r4, r5, 0, 0, 19 @@ -520,7 +520,7 @@ VMExchangePages_0x68 lwzx r8, r5, r9 stwx r7, r5, r9 stwx r8, r4, r9 - bne+ VMExchangePages_0x68 + bne VMExchangePages_0x68 b VMReturn @@ -530,7 +530,7 @@ VMExchangePages_0x68 DeclareVMCall 10, VMGetPhysicalPage VMGetPhysicalPage ; OUTSIDE REFERER - bne- cr1, VMGetPhysicalPage_0x30 + bne cr1, VMGetPhysicalPage_0x30 mfsprg r9, 0 lwz r6, -0x0014(r9) @@ -540,8 +540,8 @@ VMGetPhysicalPage ; OUTSIDE REFERER slwi r29, r4, 12 bl major_0x08d88 - blt- VMGetPhysicalPage_0x28 - bns- cr7, major_0x08d88_0xa8 + blt VMGetPhysicalPage_0x28 + bns cr7, major_0x08d88_0xa8 srwi r3, r17, 12 b major_0x08d88_0xb0 @@ -552,7 +552,7 @@ VMGetPhysicalPage_0x28 VMGetPhysicalPage_0x30 bl GetPARPageInfo - bns+ cr7, VMReturnMinus1 + bns cr7, VMReturnMinus1 srwi r3, r9, 12 b VMReturn @@ -563,7 +563,7 @@ VMGetPhysicalPage_0x30 DeclareVMCall 19, getPTEntryGivenPage getPTEntryGivenPage ; OUTSIDE REFERER - bne- cr1, getPTEntryGivenPage_0x50 + bne cr1, getPTEntryGivenPage_0x50 mfsprg r9, 0 lwz r6, -0x0014(r9) @@ -573,11 +573,11 @@ getPTEntryGivenPage ; OUTSIDE REFERER slwi r29, r4, 12 bl major_0x08d88 - blt- getPTEntryGivenPage_0x48 + blt getPTEntryGivenPage_0x48 lwz r3, 0x0000(r30) - beq- getPTEntryGivenPage_0x3c - bns- cr7, getPTEntryGivenPage_0x3c - bge- cr5, getPTEntryGivenPage_0x3c + beq getPTEntryGivenPage_0x3c + bns cr7, getPTEntryGivenPage_0x3c + bge cr5, getPTEntryGivenPage_0x3c bl MPCall_95_0x2e0 bl MPCall_95_0x334 lwz r3, 0x0000(r30) @@ -596,9 +596,9 @@ getPTEntryGivenPage_0x48 getPTEntryGivenPage_0x50 bl GetPARPageInfo mr r3, r16 - bns- cr7, getPTEntryGivenPage_0x74 + bns cr7, getPTEntryGivenPage_0x74 rlwimi r3, r9, 0, 0, 19 - bge- cr5, getPTEntryGivenPage_0x74 + bge cr5, getPTEntryGivenPage_0x74 bl RemovePageFromTLB bl EditPTEOnlyInHTAB mr r3, r16 @@ -625,16 +625,16 @@ major_0x08d88 ; OUTSIDE REFERER lwz r18, 0x0020(r31) cmplw r29, r16 cmplw cr1, r29, r17 - blt- major_0x08d88_0x74 - bgt- cr1, major_0x08d88_0x74 + blt major_0x08d88_0x74 + bgt cr1, major_0x08d88_0x74 rlwinm. r8, r18, 0, 16, 16 lwz r19, 0x0070(r31) - beq- major_0x08d88_0x8c + beq major_0x08d88_0x8c lwz r17, 0x0038(r31) rlwinm r19, r19, 0, 0, 19 cmpwi r17, 0x00 subf r18, r16, r29 - beq- major_0x08d88_0x74 + beq major_0x08d88_0x74 mtlr r27 crclr cr0_lt crset cr0_eq @@ -648,7 +648,7 @@ major_0x08d88_0x74 mtlr r27 srwi r8, r29, 28 cmpwi r8, 0x07 - beq- major_0x08d88_0xa8 + beq major_0x08d88_0xa8 crset cr0_lt blr @@ -679,7 +679,7 @@ major_0x08d88_0xb0 ; OUTSIDE REFERER VMIsInited ; OUTSIDE REFERER bl GetPARPageInfo - bso+ cr7, VMReturn1 + bso cr7, VMReturn1 rlwinm r3, r16, 16, 31, 31 b VMReturn @@ -690,7 +690,7 @@ VMIsInited ; OUTSIDE REFERER DeclareVMCall 3, VMIsResident VMIsResident ; OUTSIDE REFERER - bne- cr1, VMIsResident_0x30 + bne cr1, VMIsResident_0x30 mfsprg r9, 0 lwz r6, -0x0014(r9) @@ -700,7 +700,7 @@ VMIsResident ; OUTSIDE REFERER slwi r29, r4, 12 bl major_0x08d88 - blt- VMIsResident_0x28 + blt VMIsResident_0x28 lwz r16, 0x0000(r30) srwi r3, r16, 31 b major_0x08d88_0xb0 @@ -725,7 +725,7 @@ VMIsUnmodified ; OUTSIDE REFERER bl GetPARPageInfo rlwinm r3, r16, 28, 31, 31 xori r3, r3, 0x01 - bge+ cr5, VMReturn + bge cr5, VMReturn bl RemovePageFromTLB bl EditPTEOnlyInHTAB rlwinm r3, r16, 28, 31, 31 @@ -753,8 +753,8 @@ VMLRU_0x1c mtcrf 0x07, r16 cmpwi r4, 0x00 rlwinm r7, r16, 23, 9, 28 - bns- cr7, VMLRU_0x5c - bge- cr5, VMLRU_0x50 + bns cr7, VMLRU_0x5c + bge cr5, VMLRU_0x50 add r14, r14, r7 lwz r8, 0x0000(r14) bl RemovePageFromTLB @@ -768,7 +768,7 @@ VMLRU_0x50 stw r16, 0x0000(r15) VMLRU_0x5c - bne+ VMLRU_0x1c + bne VMLRU_0x1c b VMReturn @@ -787,8 +787,8 @@ major_0x08f14 ; OUTSIDE REFERER lwz r16, 0x0024(r8) rlwinm. r18, r17, 0, 16, 16 cmplw cr1, r16, r9 - beq+ Local_Panic - bgt+ cr1, Local_Panic + beq Local_Panic + bgt cr1, Local_Panic li r16, -0x01 mtlr r28 stw r16, 0x0038(r8) @@ -803,17 +803,17 @@ major_0x08f14 ; OUTSIDE REFERER DeclareVMCall 17, VMMakePageCacheable VMMakePageCacheable ; OUTSIDE REFERER - bne- cr1, VMMakePageCacheable_0x4 + bne cr1, VMMakePageCacheable_0x4 VMMakePageCacheable_0x4 bl GetPARPageInfo rlwinm r7, r16, 0, 25, 26 cmpwi r7, 0x20 - bns+ cr7, VMReturnMinus1 - beq+ VMReturn - bge- cr4, VMMakePageCacheable_0x40 - bltl- cr5, RemovePageFromTLB - bgel- cr5, VMSecondLastExportedFunc + bns cr7, VMReturnMinus1 + beq VMReturn + bge cr4, VMMakePageCacheable_0x40 + bltl cr5, RemovePageFromTLB + bgel cr5, VMSecondLastExportedFunc rlwinm r16, r16, 0, 27, 24 rlwinm r9, r9, 0, 27, 24 lwz r7, KDP.PageAttributeInit(r1) @@ -825,8 +825,8 @@ VMMakePageCacheable_0x4 VMMakePageCacheable_0x40 rlwinm r7, r4, 16, 28, 31 cmpwi r7, 0x08 - blt+ VMReturnMinus1 - ble+ cr6, VMReturnMinus1 + blt VMReturnMinus1 + ble cr6, VMReturnMinus1 _log 'VMMakePageCacheable for I/O ' mr r8, r4 bl printw @@ -845,18 +845,18 @@ VMMakePageCacheable_0x40 lwz r5, 0x000c(r15) andi. r6, r5, 0xe01 cmpwi r6, 0xa01 - beq- VMMakePageCacheable_0xec + beq VMMakePageCacheable_0xec addi r15, r15, -0x08 lwz r5, 0x0004(r15) lhz r6, 0x0000(r15) andi. r5, r5, 0xc00 lhz r5, 0x0002(r15) - bne+ VMReturnMinus1 + bne VMReturnMinus1 addi r5, r5, 0x01 add r6, r6, r5 xor r6, r6, r4 andi. r6, r6, 0xffff - bne+ VMReturnMinus1 + bne VMReturnMinus1 sth r5, 0x0002(r15) b PageSetCommon @@ -879,16 +879,16 @@ VMMakePageCacheable_0xec DeclareVMCall 24, VMMakePageWriteThrough VMMakePageWriteThrough ; OUTSIDE REFERER - bne- cr1, VMMakePageWriteThrough_0x4 + bne cr1, VMMakePageWriteThrough_0x4 VMMakePageWriteThrough_0x4 bl GetPARPageInfo rlwinm. r7, r16, 0, 25, 26 - bns+ cr7, VMReturnMinus1 - beq+ VMReturn - bge- cr4, VMMakePageWriteThrough_0x3c - bltl- cr5, RemovePageFromTLB - bgel- cr5, VMSecondLastExportedFunc + bns cr7, VMReturnMinus1 + beq VMReturn + bge cr4, VMMakePageWriteThrough_0x3c + bltl cr5, RemovePageFromTLB + bgel cr5, VMSecondLastExportedFunc rlwinm r16, r16, 0, 27, 24 rlwinm r9, r9, 0, 27, 24 lwz r7, KDP.PageAttributeInit(r1) @@ -900,8 +900,8 @@ VMMakePageWriteThrough_0x4 VMMakePageWriteThrough_0x3c rlwinm r7, r4, 16, 28, 31 cmpwi r7, 0x08 - blt+ VMReturnMinus1 - ble+ cr6, VMReturnMinus1 + blt VMReturnMinus1 + ble cr6, VMReturnMinus1 _log 'VMMakePageWriteThrough for I/O ' mr r8, r4 bl printw @@ -920,18 +920,18 @@ VMMakePageWriteThrough_0x3c lwz r5, 0x000c(r15) andi. r6, r5, 0xe01 cmpwi r6, 0xa01 - beq- VMMakePageWriteThrough_0xec + beq VMMakePageWriteThrough_0xec addi r15, r15, -0x08 lwz r5, 0x0004(r15) lhz r6, 0x0000(r15) andi. r5, r5, 0xc00 lhz r5, 0x0002(r15) - bne+ VMReturnMinus1 + bne VMReturnMinus1 addi r5, r5, 0x01 add r6, r6, r5 xor r6, r6, r4 andi. r6, r6, 0xffff - bne+ VMReturnMinus1 + bne VMReturnMinus1 sth r5, 0x0002(r15) b PageSetCommon @@ -972,10 +972,10 @@ PageSetCommon_0x2c cmplw cr2, r15, r8 cmplw cr3, r6, r8 cmplw cr4, r5, r8 - beq- cr1, PageSetCommon_0xc8 - beq- cr2, PageSetCommon_0xc4 - beq- cr3, PageSetCommon_0xc0 - beq- cr4, PageSetCommon_0xbc + beq cr1, PageSetCommon_0xc8 + beq cr2, PageSetCommon_0xc4 + beq cr3, PageSetCommon_0xc0 + beq cr4, PageSetCommon_0xbc lwzu r7, 0x0020(r14) lwz r15, 0x0008(r14) lwz r6, 0x0010(r14) @@ -984,10 +984,10 @@ PageSetCommon_0x2c cmplw cr2, r15, r8 cmplw cr3, r6, r8 cmplw cr4, r5, r8 - beq- cr1, PageSetCommon_0xc8 - beq- cr2, PageSetCommon_0xc4 - beq- cr3, PageSetCommon_0xc0 - beq- cr4, PageSetCommon_0xbc + beq cr1, PageSetCommon_0xc8 + beq cr2, PageSetCommon_0xc4 + beq cr3, PageSetCommon_0xc0 + beq cr4, PageSetCommon_0xbc crnot 2, 2 lwz r15, KDP.PTEGMask(r1) lwz r14, KDP.HTABORG(r1) @@ -998,7 +998,7 @@ PageSetCommon_0x2c slwi r7, r6, 6 and r15, r15, r7 xori r8, r8, 0x40 - bne+ PageSetCommon_0x2c + bne PageSetCommon_0x2c b VMReturn PageSetCommon_0xbc @@ -1024,17 +1024,17 @@ PageSetCommon_0xc8 DeclareVMCall 18, VMMakePageNonCacheable VMMakePageNonCacheable ; OUTSIDE REFERER - bne- cr1, VMMakePageNonCacheable_0x4 + bne cr1, VMMakePageNonCacheable_0x4 VMMakePageNonCacheable_0x4 bl GetPARPageInfo rlwinm r7, r16, 0, 25, 26 cmpwi r7, 0x60 - bns+ cr7, VMReturnMinus1 - beq+ VMReturn - bge- cr4, VMMakePageNonCacheable_0x78 - bltl- cr5, RemovePageFromTLB - bgel- cr5, VMSecondLastExportedFunc + bns cr7, VMReturnMinus1 + beq VMReturn + bge cr4, VMMakePageNonCacheable_0x78 + bltl cr5, RemovePageFromTLB + bgel cr5, VMSecondLastExportedFunc rlwinm r9, r9, 0, 27, 24 lwz r7, KDP.PageAttributeInit(r1) rlwimi r9, r7, 0, 27, 28 @@ -1056,7 +1056,7 @@ VMMakePageNonCacheable_0x50 sync icbi r7, r4 icbi r7, r5 - bne+ VMMakePageNonCacheable_0x50 + bne VMMakePageNonCacheable_0x50 sync isync b VMReturn @@ -1064,8 +1064,8 @@ VMMakePageNonCacheable_0x50 VMMakePageNonCacheable_0x78 rlwinm r7, r4, 16, 28, 31 cmpwi r7, 0x08 - blt+ VMReturnMinus1 - bgt+ cr6, VMReturnMinus1 + blt VMReturnMinus1 + bgt cr6, VMReturnMinus1 _log 'VMMakePageNonCacheable for I/O ' mr r8, r4 bl printw @@ -1084,7 +1084,7 @@ VMMakePageNonCacheable_0x78 lwz r5, 0x0004(r15) srwi r6, r5, 12 cmpw r6, r4 - bne+ VMReturnMinus1 + bne VMReturnMinus1 lis r7, 0x00 lis r8, 0x00 lis r9, 0x00 @@ -1093,7 +1093,7 @@ VMMakePageNonCacheable_0x78 lhz r7, 0x0000(r15) addi r6, r6, 0x01 cmpwi r8, 0x00 - beq- VMMakePageNonCacheable_0x134 + beq VMMakePageNonCacheable_0x134 addi r7, r7, 0x01 addi r8, r8, -0x01 rlwimi r5, r6, 12, 0, 19 @@ -1122,7 +1122,7 @@ VMMakePageNonCacheable_0x134 DeclareVMCall 8, VMMarkBacking VMMarkBacking ; OUTSIDE REFERER - bne- cr1, VMMarkBacking_0x58 + bne cr1, VMMarkBacking_0x58 mfsprg r9, 0 lwz r6, -0x0014(r9) @@ -1132,10 +1132,10 @@ VMMarkBacking ; OUTSIDE REFERER slwi r29, r4, 12 bl major_0x08d88 - blt- VMMarkBacking_0x50 - beq+ major_0x08d88_0xa8 - bns- cr7, VMMarkBacking_0x30 - bge- cr5, VMMarkBacking_0x30 + blt VMMarkBacking_0x50 + beq major_0x08d88_0xa8 + bns cr7, VMMarkBacking_0x30 + bge cr5, VMMarkBacking_0x30 bl MPCall_95_0x2e0 bl MPCall_95_0x348 @@ -1156,10 +1156,10 @@ VMMarkBacking_0x50 VMMarkBacking_0x58 bl GetPARPageInfo - bge+ cr4, VMReturnMinus1 - bgt+ cr5, VMReturnMinus1 - bltl- cr5, RemovePageFromTLB - bltl- cr5, RemovePTEFromHTAB + bge cr4, VMReturnMinus1 + bgt cr5, VMReturnMinus1 + bltl cr5, RemovePageFromTLB + bltl cr5, RemovePTEFromHTAB rlwimi r16, r5, 16, 15, 15 li r7, 0x01 andc r16, r16, r7 @@ -1174,11 +1174,11 @@ VMMarkBacking_0x58 VMMarkCleanUnused ; OUTSIDE REFERER bl GetPARPageInfo - bge+ cr4, VMReturnMinus1 - bns+ cr7, VMReturnMinus1 - bltl- cr5, RemovePageFromTLB - beq- cr2, VMMarkCleanUnused_0x2c - bgel- cr5, VMSecondLastExportedFunc + bge cr4, VMReturnMinus1 + bns cr7, VMReturnMinus1 + bltl cr5, RemovePageFromTLB + beq cr2, VMMarkCleanUnused_0x2c + bgel cr5, VMSecondLastExportedFunc li r7, 0x180 andc r9, r9, r7 ori r16, r16, 0x100 @@ -1186,7 +1186,7 @@ VMMarkCleanUnused ; OUTSIDE REFERER b VMReturn VMMarkCleanUnused_0x2c - bgel- cr5, VMSecondLastExportedFunc + bgel cr5, VMSecondLastExportedFunc ori r16, r16, 0x100 li r7, 0x18 andc r16, r16, r7 @@ -1204,9 +1204,9 @@ VMMarkUndefined ; OUTSIDE REFERER cmplw cr1, r5, r9 add r7, r4, r5 cmplw cr2, r7, r9 - bge+ VMReturnMinus1 - bgt+ cr1, VMReturnMinus1 - bgt+ cr2, VMReturnMinus1 + bge VMReturnMinus1 + bgt cr1, VMReturnMinus1 + bgt cr2, VMReturnMinus1 lwz r15, KDP.FlatPageListPtr(r1) slwi r8, r7, 2 li r7, 0x01 @@ -1215,7 +1215,7 @@ VMMarkUndefined_0x28 subi r8, r8, 4 subf. r5, r7, r5 lwzx r16, r15, r8 - blt+ VMReturn + blt VMReturn rlwimi r16, r6, 7, 24, 24 stwx r16, r15, r8 b VMMarkUndefined_0x28 @@ -1227,7 +1227,7 @@ VMMarkUndefined_0x28 DeclareVMCall 7, VMMarkResident VMMarkResident ; OUTSIDE REFERER - bne- cr1, VMMarkResident_0x58 + bne cr1, VMMarkResident_0x58 mfsprg r9, 0 lwz r6, -0x0014(r9) @@ -1238,10 +1238,10 @@ VMMarkResident ; OUTSIDE REFERER slwi r29, r4, 12 slwi r26, r5, 12 bl major_0x08d88 - blt- VMMarkResident_0x50 - beq+ major_0x08d88_0xa8 - bso+ cr7, major_0x08d88_0xa8 - bltl+ cr5, Local_Panic + blt VMMarkResident_0x50 + beq major_0x08d88_0xa8 + bso cr7, major_0x08d88_0xa8 + bltl cr5, Local_Panic lwz r16, 0x0000(r30) rlwimi r16, r5, 12, 0, 19 ori r16, r16, 0x01 @@ -1259,9 +1259,9 @@ VMMarkResident_0x50 VMMarkResident_0x58 bl GetPARPageInfo - bge+ cr4, VMReturnMinus1 - bso+ cr7, VMReturnMinus1 - bltl+ cr5, Local_Panic + bge cr4, VMReturnMinus1 + bso cr7, VMReturnMinus1 + bltl cr5, Local_Panic rlwimi r16, r5, 12, 0, 19 ori r16, r16, 0x01 stw r16, 0x0000(r15) @@ -1279,15 +1279,15 @@ VMPTest ; OUTSIDE REFERER srwi r4, r4, 12 cmplw r4, r9 li r3, 0x4000 - bge+ VMReturn + bge VMReturn bl GetPARPageInfo li r3, 0x400 - bns+ cr7, VMReturn + bns cr7, VMReturn li r3, 0x00 ori r3, r3, 0x8000 - ble+ cr7, VMReturn + ble cr7, VMReturn cmpwi r6, 0x00 - beq+ VMReturn + beq VMReturn li r3, 0x800 b VMReturn @@ -1298,7 +1298,7 @@ VMPTest ; OUTSIDE REFERER DeclareVMCall 20, setPTEntryGivenPage setPTEntryGivenPage ; OUTSIDE REFERER - bne- cr1, setPTEntryGivenPage_0x64 + bne cr1, setPTEntryGivenPage_0x64 mfsprg r9, 0 lwz r6, -0x0014(r9) @@ -1309,10 +1309,10 @@ setPTEntryGivenPage ; OUTSIDE REFERER mr r26, r4 slwi r29, r5, 12 bl major_0x08d88 - blt- setPTEntryGivenPage_0x5c - beq+ major_0x08d88_0xa8 - bns- cr7, setPTEntryGivenPage_0x34 - bge- cr5, setPTEntryGivenPage_0x34 + blt setPTEntryGivenPage_0x5c + beq major_0x08d88_0xa8 + bns cr7, setPTEntryGivenPage_0x34 + bge cr5, setPTEntryGivenPage_0x34 bl MPCall_95_0x2e0 bl MPCall_95_0x348 @@ -1322,7 +1322,7 @@ setPTEntryGivenPage_0x34 li r3, 0x461 rlwimi r3, r18, 24, 29, 29 and. r3, r3, r8 - bne+ major_0x08d88_0xa8 + bne major_0x08d88_0xa8 andi. r8, r8, 0x11c xor r18, r18, r8 stw r18, 0x0000(r30) @@ -1337,21 +1337,21 @@ setPTEntryGivenPage_0x64 mr r6, r4 mr r4, r5 bl GetPARPageInfo - bge+ cr4, VMReturnMinus1 + bge cr4, VMReturnMinus1 xor r7, r16, r6 li r3, 0x461 rlwimi r3, r16, 24, 29, 29 and. r3, r3, r7 - bne+ VMReturnMinus1 + bne VMReturnMinus1 andi. r7, r7, 0x11c xor r16, r16, r7 stw r16, 0x0000(r15) - bge+ cr5, VMReturn + bge cr5, VMReturn bl RemovePageFromTLB lwz r16, 0x0000(r15) - bne- cr2, setPTEntryGivenPage_0xb4 + bne cr2, setPTEntryGivenPage_0xb4 andi. r7, r16, 0x08 - bne- setPTEntryGivenPage_0xb4 + bne setPTEntryGivenPage_0xb4 bl RemovePTEFromHTAB b VMReturn @@ -1370,21 +1370,21 @@ setPTEntryGivenPage_0xb4 VMShouldClean ; OUTSIDE REFERER bl GetPARPageInfo - bns+ cr7, VMReturn0 - bge+ cr4, VMReturnMinus1 - bltl- cr5, RemovePageFromTLB - blt- cr7, VMShouldClean_0x34 - bns- cr6, VMShouldClean_0x34 + bns cr7, VMReturn0 + bge cr4, VMReturnMinus1 + bltl cr5, RemovePageFromTLB + blt cr7, VMShouldClean_0x34 + bns cr6, VMShouldClean_0x34 xori r16, r16, 0x10 ori r16, r16, 0x100 stw r16, 0x0000(r15) - bge+ cr5, VMReturn1 + bge cr5, VMReturn1 xori r9, r9, 0x80 bl EditPTEOnlyInHTAB b VMReturn1 VMShouldClean_0x34 - bltl- cr5, EditPTEOnlyInHTAB + bltl cr5, EditPTEOnlyInHTAB b VMReturn0 @@ -1400,19 +1400,19 @@ VMAllocateMemory ; OUTSIDE REFERER cmpw cr7, r7, r8 or r7, r4, r6 rlwinm. r7, r7, 0, 0, 11 - ble+ cr6, VMReturnMinus1 + ble cr6, VMReturnMinus1 lwz r9, KDP.PrimaryAddrRangePages(r1) - bne+ cr7, VMReturnMinus1 + bne cr7, VMReturnMinus1 mr r7, r4 - bne+ VMReturnMinus1 + bne VMReturnMinus1 mr r4, r9 slwi r6, r6, 12 lwz r9, -0x0408(r1) crclr cr3_eq cmpwi cr6, r6, 0x00 cmplw cr7, r9, r5 - bne- cr6, VMAllocateMemory_0x6c - blt- cr7, VMAllocateMemory_0x6c + bne cr6, VMAllocateMemory_0x6c + blt cr7, VMAllocateMemory_0x6c lwz r9, -0x040c(r1) subf r4, r5, r9 slwi r4, r4, 2 @@ -1429,31 +1429,31 @@ VMAllocateMemory_0x6c VMAllocateMemory_0x74 addi r4, r4, -0x01 bl GetPARPageInfo - bltl- cr5, RemovePageFromTLB - bltl- cr5, RemovePTEFromHTAB + bltl cr5, RemovePageFromTLB + bltl cr5, RemovePTEFromHTAB lwz r9, KDP.PrimaryAddrRangePages(r1) subf r8, r4, r9 cmplw cr7, r5, r8 and. r8, r16, r6 - bge+ cr7, VMAllocateMemory_0x74 - bne+ VMAllocateMemory_0x74 + bge cr7, VMAllocateMemory_0x74 + bne VMAllocateMemory_0x74 cmpwi cr6, r6, 0x00 - beq- cr6, VMAllocateMemory_0xc0 + beq cr6, VMAllocateMemory_0xc0 slwi r8, r5, 2 lwzx r8, r15, r8 slwi r14, r5, 12 add r14, r14, r16 xor r8, r8, r14 rlwinm. r8, r8, 0, 0, 19 - bne+ VMAllocateMemory_0x74 + bne VMAllocateMemory_0x74 VMAllocateMemory_0xc0 slwi r4, r7, 12 lwz r9, KDP.VMMaxVirtualPages(r1) cmplw cr7, r7, r9 rlwinm. r9, r7, 0, 0, 11 - blt+ cr7, VMReturnMinus1 - bne+ VMReturnMinus1 + blt cr7, VMReturnMinus1 + bne VMReturnMinus1 lwz r14, 0x05e8(r1) rlwinm r9, r7, 19, 25, 28 lwzx r14, r14, r9 @@ -1468,24 +1468,24 @@ VMAllocateMemory_0xf4 lhz r16, 0x0002(r14) subf r8, r8, r9 cmplw cr7, r8, r16 - bgt+ cr7, VMAllocateMemory_0xf0 + bgt cr7, VMAllocateMemory_0xf0 add r8, r8, r5 cmplw cr7, r8, r16 - bgt+ cr7, VMReturnMinus1 + bgt cr7, VMReturnMinus1 lwz r16, 0x0004(r14) slwi r8, r7, 16 andi. r16, r16, 0xe01 cmpwi r16, 0xa01 or r8, r8, r5 addi r5, r5, 0x01 - bne+ VMReturnMinus1 + bne VMReturnMinus1 stw r8, 0x0000(r14) - bnel- cr6, VMAllocateMemory_0x2e8 + bnel cr6, VMAllocateMemory_0x2e8 mr r7, r15 rotlwi r15, r15, 0x0a ori r15, r15, 0xc00 stw r15, 0x0004(r14) - bne- cr3, VMAllocateMemory_0x164 + bne cr3, VMAllocateMemory_0x164 lwz r8, -0x0408(r1) subf r8, r5, r8 stw r8, -0x0408(r1) @@ -1530,7 +1530,7 @@ VMAllocateMemory_0x1a4 ; r8 = ptr mr. r31, r8 - beq+ Local_Panic + beq Local_Panic lwz r17, 0x0004(r30) lhz r16, 0x0002(r30) lis r8, 0x6172 @@ -1566,7 +1566,7 @@ VMAllocateMemory_0x1a4 mr r8, r31 bl createarea cmpwi r9, 0x00 - bne+ Local_Panic + bne Local_Panic mr r31, r8 mfsprg r9, 0 lwz r8, -0x001c(r9) @@ -1574,12 +1574,12 @@ VMAllocateMemory_0x1a4 bl FindAreaAbove lwz r16, 0x0024(r8) cmpwi r16, 0x00 - bne+ Local_Panic + bne Local_Panic lwz r16, KDP.PrimaryAddrRangePages(r1) lwz r17, 0x002c(r8) slwi r16, r16, 12 cmpw r17, r16 - beq- VMAllocateMemory_0x2e0 + beq VMAllocateMemory_0x2e0 stw r16, 0x002c(r8) addi r16, r16, -0x01 stw r16, 0x0028(r8) @@ -1598,7 +1598,7 @@ VMAllocateMemory_0x2e8 slwi r8, r5, 2 subf r7, r8, r7 cmplw r15, r7 - beqlr- + beqlr subi r7, r7, 4 VMAllocateMemory_0x310 @@ -1606,14 +1606,14 @@ VMAllocateMemory_0x310 cmplw r15, r7 stw r9, 0x0000(r15) addi r15, r15, 0x04 - blt+ VMAllocateMemory_0x310 + blt VMAllocateMemory_0x310 VMAllocateMemory_0x324 cmpwi r8, 0x04 subi r8, r8, 4 stwu r16, 0x0004(r7) addi r16, r16, 0x1000 - bgt+ VMAllocateMemory_0x324 + bgt VMAllocateMemory_0x324 blr VMAllocateMemory_0x33c @@ -1625,7 +1625,7 @@ VMAllocateMemory_0x33c VMAllocateMemory_0x34c cmplwi r7, 0xffff lwzu r16, 0x0008(r14) - bne- cr7, VMAllocateMemory_0x360 + bne cr7, VMAllocateMemory_0x360 rotlwi r8, r15, 0x0a ori r8, r8, 0xc00 @@ -1633,7 +1633,7 @@ VMAllocateMemory_0x360 stw r8, 0x0004(r16) addis r15, r15, 0x04 addis r7, r7, -0x01 - bgt+ VMAllocateMemory_0x34c + bgt VMAllocateMemory_0x34c sth r7, 0x0002(r16) blr @@ -1651,7 +1651,7 @@ GetPARPageInfo ; OUTSIDE REFERER cmplw cr4, r4, r9 ;r9 is VMMaxVirtualPages by convention lwz r15, KDP.FlatPageListPtr(r1) slwi r8, r4, 2 - bge- cr4, GetPARPageInfo_0x40 + bge cr4, GetPARPageInfo_0x40 GetPARPageInfo_0x10 lwzux r16, r15, r8 ;get PTE from KDP.FlatPageListPointer @@ -1659,20 +1659,20 @@ GetPARPageInfo_0x10 mtcrf 0x07, r16 ;copy bits 20-31 to cr rlwinm r8, r16, 23, 9, 28;convert page# into an index rlwinm r9, r16, 0, 0, 19;get unshifted page# - bgelr- cr5 ;return if PTE is not in HTAB + bgelr cr5 ;return if PTE is not in HTAB lwzux r8, r14, r8 ;get first word of PTE from HTAB lwz r9, 0x0004(r14);get second word of PTE from HTAB mtcrf 0x80, r8 - bns+ cr7, Local_Panic;panic if the PTE is in the HTAB but isn't mapped to a real page - bltlr- ;return if PTE is valid + bns cr7, Local_Panic;panic if the PTE is in the HTAB but isn't mapped to a real page + bltlr ;return if PTE is valid bl Local_Panic;panic if PTE isn't valid but is in the HTAB GetPARPageInfo_0x40 ;some kind of little-used code path for when VMMaxVirtualPages is invalid? ROM overlay? lwz r9, KDP.VMMaxVirtualPages(r1) cmplw cr4, r4, r9 rlwinm. r9, r4, 0, 0, 11 - blt+ cr4, VMReturnMinus1;return failure if r4