Commit 110fd564 authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL
Browse files

Minor cleanup

Don't include headers we don't need, add Hdr:HostFS so debug builds work.
Don't pointlessly preserve low registers in finalise handler.
Use Unix style names for LNK.
Typos in docs fixed.
Be consistent about wsptr/WP/wp when referring to the workspace pointer.
parent 00b0f1cc
......@@ -33,7 +33,7 @@ Filter_RegisterPreFilter
Entry:
R0 - Pointer to 0 terminated filter name.
R1 - Addresss of filter.
R1 - Address of filter.
R2 - Value to be passed in R12.
R3 - Task handle of task to which filter is applied.
or 0 for all tasks.
......@@ -66,7 +66,7 @@ Filter_RegisterPostFilter
Entry:
R0 - Pointer to 0 terminated filter name.
R1 - Addresss of filter.
R1 - Address of filter.
R2 - Value to be passed in R12.
R3 - Task handle of task to which filter is applied.
or 0 for all tasks.
......@@ -104,7 +104,7 @@ R12 equal to the value of R2 when this SWI is called.
Entry:
R0 - Pointer to 0 terminated filter name.
R1 - Addresss of filter.
R1 - Address of filter.
R2 - Value to be passed in R12.
R3 - Task handle of task to which filter was applied.
......@@ -120,11 +120,11 @@ R12 equal to the value of R2 when this SWI is called.
Entry:
R0 - Pointer to 0 terminated filter name.
R1 - Addresss of filter.
R1 - Address of filter.
R2 - Value to be passed in R12.
R3 - Task handle of task to which filter was applied.
All must be the same as those passed to RegisterPreFilter
All must be the same as those passed to RegisterPostFilter
Exit:
Registers preserved.
Filter de-registered.
......
......@@ -57,6 +57,7 @@ copy_filter_exit
NOP
Pull "r1"
B copy_filter_exit
LNK s.PostFilter
LNK PostFilter.s
......@@ -39,24 +39,15 @@ Module_BaseAddr
GET Hdr:Macros
GET Hdr:System
GET Hdr:ModHand
GET Hdr:Machine.<Machine>
GET Hdr:APCS.<APCS>
GET Hdr:Services
GET Hdr:VduExt
GET Hdr:FSNumbers
GET Hdr:NewErrors
GET Hdr:Variables
GET Hdr:Proc
GET Hdr:Sprite
GET Hdr:Wimp
GET Hdr:WimpSpace
GET Hdr:Messages
GET Hdr:FilerAct
GET Hdr:MsgTrans
GET Hdr:MsgMenus
GET Hdr:ResourceFS
GET Hdr:ColourTran
GET Hdr:Hourglass
GET Hdr:HostFS
GET Hdr:NdrDebug
GET Hdr:Switcher
......@@ -81,8 +72,6 @@ hostvdu SETL {TRUE} ; True to send debug to tube
debugxx SETL {FALSE} ; General debugging.
debugregister SETL {FALSE} ; Register/de-register
wsptr RN R12
MACRO
$lab Rel $to,$from,$cc ; Turn Abs window handles to Rel
$lab ADD$cc $to,$from,#1
......@@ -131,5 +120,5 @@ f_messagesopen * (1:SHL:0)
max_running_work * (@-wsorigin)
LNK s.ModHead
LNK ModHead.s
......@@ -71,9 +71,9 @@ min_tab3 * 8
; Handle *Filters - List all attached filters with the tasks they are attached to.
Filters_Code
Push "r7-r8,LR"
Debug xx,"*Filters called listing pre_filters"
Debug xx,"*Filters called, listing filters"
LDR wsptr,[R12]
LDR wp,[R12]
ADR r1, prefilter_token
MOV r2, #0
......@@ -549,7 +549,7 @@ Init
STR r2, [r12]
01
MOV r12, r2
MOV wp, r2
; Clear list pointers
......@@ -586,7 +586,7 @@ Init
]
ADR R0,servicecallback
MOV R1,WP ; workspace pointer
MOV R1,wp ; workspace pointer
SWI XOS_AddCallBack ; install the call back to broadcast we are here message
MOVVC R0,#-1
STRVC R0,callbackpending ; and then setup a suitable flag to indicate we have a callback pending
......@@ -637,7 +637,7 @@ Service2
BEQ serviceresourcefsstarting
]
LDR R12, [R12]
LDR wp, [R12]
CMP R12, #0
MOVEQ PC, LR ; Exit if no workspace
......@@ -781,11 +781,11 @@ serviceresourcefsstarting
; RMKill'ing the module - Release filter handlers. Release linked lists of filters.
Die
;
LDR r12, [r12]
LDR wp, [r12]
CMP r12, #0
RETURN EQ
Push "r0-r11,LR"
Push "r7-r11,LR"
ADR r2, pre_filters
BL free_list ; Free list of pre filters
......@@ -833,7 +833,7 @@ Die
LDR R0,callbackpending
CMP R0,#0 ; do we have a callback pending? (clears V)
ADRNE R0,servicecallback ; yes, so remove it before its granted
MOVNE R1,WP ; as we are going to die
MOVNE R1,wp ; as we are going to die
SWINE XOS_RemoveCallBack
MOV R0,#0
......@@ -849,9 +849,9 @@ Die
BL MsgTrans_CloseFile ; Make sure Messages file is closed.
Pull "R0-R11,LR"
Pull "R7-R11,LR"
RETURNVC ; clear V - don't refuse to die
; ----------------------------------------------------------------------------------------------------------------------
LNK s.SWIs
LNK SWIs.s
......@@ -116,4 +116,4 @@ message_file_name
ALIGN
LNK s.PreFilter
LNK PreFilter.s
......@@ -69,6 +69,6 @@ post_icon_filter_exit
B post_icon_filter_exit
LNK s.CopyFilter
LNK CopyFilter.s
......@@ -136,6 +136,6 @@ fakepostrect_handler
]
LNK s.PoIcFilter
LNK PoIcFilter.s
......@@ -88,4 +88,4 @@ post_filter_exit
MOVEQ R0,R7
B %BT01
LNK s.Tail
LNK Tail.s
......@@ -61,6 +61,6 @@ pre_filter_exit
Pull "r1"
B pre_filter_exit
LNK s.RectFilter
LNK RectFilter.s
......@@ -76,6 +76,7 @@ rect_filter_exit
NOP
Pull "r1"
B rect_filter_exit
LNK s.PoRtFilter
LNK PoRtFilter.s
......@@ -16,7 +16,7 @@
Filter_SWIdecode
Push "LR"
LDR wsptr,[R12] ; wsptr --> workspace
LDR wp,[R12] ; wsptr --> workspace
Debug xx,"SWI ",r11
......@@ -1040,4 +1040,4 @@ SWIFilter_DeRegisterPostIconFilter
Pull "r1-r4,LR"
RETURNVS
LNK s.MsgTrans
LNK MsgTrans.s
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment