Skip to content

GitLab

Merged
Created by Robert Sprowson@rsprowsonDeveloper

Misc fixes

Compare
and
2 files
+ 53
- 17
‎s‎
Mod‎Hand‎ +44 -10
SysC‎omms‎ +9 -7
s/ModHand
+ 44
- 10
Show all unchanged lines Show 20 lines
ModuleDispatchEntry UnplugInsert
ModuleDispatchEntry ClaimAligned
Module_EnumerateROM_ModulesWithPWP
Module_UnplugInsert
NaffSWI ; Set V and return
ADR R0, ErrorBlock_BadModuleReason
Show 20 lines Show all unchanged lines Show 20 lines
; R2 incarnation number
; Exit: R1, R2 updated to refer to next existing module
; R3 -> module code
; R4 private word contents
; R4 private word contents (for GetNames)
; private word pointer (for EnumerateROM_ModulesWithPWP)
; R5 -> postfix string
Module_GetNames ROUT
Module_EnumerateROM_ModulesWithPWP
WritePSRc SVC_mode, R11 ; interrupts on
MOV R11, R1
MOV R12, R2
Show 20 lines Show all unchanged lines Show 20 lines
BEQ %FT11 ; no more incarnations
SUBS R12, R12, #1
BPL %BT02
LDR R4, [R10, #Incarnation_Workspace]
TEQ R0, #ModHandReason_GetNames
LDREQ R4, [R10, #Incarnation_Workspace]
ADDNE R4, R10, #Incarnation_Workspace
ADD R5, R10, #Incarnation_Postfix
LDR R10, [R10, #Incarnation_Link]
20 CMP R10, #0
Show 20 lines Show all unchanged lines Show 20 lines
]
MakeErrorBlock NoMoreModules
11 CMP r2, #0
LDREQ r4, =&DEADDEAD
MOVEQ r10, #0
BEQ %BT20 ; fudge for modules that go bang in init/die
ADR R0, ErrorBlock_NoMoreIncarnations
11 CMP R2, #0
BNE %FT12
TEQ R0, #ModHandReason_GetNames
LDREQ R4, =&DEADDEAD ; fudge for modules that go bang in init/die
MOVNE R4, #0
MOV R10, #0
B %BT20
12 ADR R0, ErrorBlock_NoMoreIncarnations
[ International
B BumDealInModule_Translate
|
Show 20 lines Show all unchanged lines Show 20 lines
Push "R0, r1, R3, lr"
ADD R3, R3, #31
BIC R3, R3, #31
BICS R3, R3, #31
BMI %FT10 ; shrinks don't move the block
TST R2, #31 ; starts at 32*n
BEQ %FT30 ; => grow an aligned block
10
MOV R0, #HeapReason_ExtendBlock
BL DoRMAHeapOpWithExtension
20
STRVS R0, [stack]
Pull "R0, r1, R3, lr"
B SLVK_TestV
30
LDR R0, [R2, #-4] ; grow may cause move, so always move rather than lose the carefully
SUB R0, R0, #4 ; arranged next block alignment from RMAClaim_ChunkAligned
Push "R0, R2"
ADD R3, R0, R3
BL RMAClaim_Chunk
ADDVS SP, SP, #4*2
BVS %BT20
Pull "R0, R3" ; size, old block
Push "R2" ; new block
40
SUBS R0, R0, #4
LDRPL LR, [R3, R0]
STRPL LR, [R2, R0]
BPL %BT40
MOV R0, #HeapReason_Free
MOV R1, #RMAAddress
MOV R2, R3
SWI XOS_Heap ; free old
Pull "R2" ; return new
B %BT20
;*************************************************************
; New Incarnation
Show 20 lines Show all unchanged lines
s/SysComms
+ 9
- 7
Show all unchanged lines Show 20 lines
ADD r2, r3, r2 ; Display offset = disparm/loadaddr+ptr
10 Swap r2, r3 ; r2 := start, r3 := disp start
CMP r2, r4 ; Is ptr > ext ? VClear
MOVHI r1, r5
BLHI SetErrorOutsideFile
CMP r2, r4 ; Is ptr > ext ?
MOV r1, r5
BLS %FT11
MOVVC r0, #OSArgs_SetPTR
MOVVC r1, r5
SWIVC XOS_Args ; PTR#r1 := start offset
BL SetErrorOutsideFile
BVS UtilityExitCloseR1
11
MOV r0, #OSArgs_SetPTR
SWI XOS_Args ; PTR#r1 := start offset
MOVVC r7, #0
BLVC ReadWindowWidth
BVS UtilityExitCloseR1
SUB r9, r0, #12+1 ; -ExtraFields (address and separators)
MOV r9, r9, LSR #2 ; Two nibbles, one space and one char per byte
MOV r9, r9, LSR #2 ; Two nibbles, one space and one char per byte
Push r10 ; Save format bits
MOV r10, #(1 :SHL: 31) ; Move 1 bit down until not zero
Show 20 lines Show all unchanged lines