Skip to content

GitLab

Commit 3976268c authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Improved the error cacheing. 

  Removed DriversInKernel conditional.
Detail:
  If the territory changes or the resource file changes, the kernel
    will now decache all the cached error blocks so that next time
    they are required, they will be looked up again.
  The error cacheing is now a kernel build option and is always set
    to on.
  Removed one of the 5 error messages to be cached - it never seems
    to happen.  The remaining 4 are more frequent.
Admin:
  Tested in Ursula build.
  Cannot be used with HdrSrc 0.94.  HdrSrc 0.95 and later is required
    (or HdrSrc 0.93 and earlier subject to other kernel requirements)
  Requires MessageTrans 0.42 or later for correct operation when a
    replacement messages file is loaded.

Version 5.32. Tagged as 'Kernel-5_32'
parent efd9b01e
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 236 deletions
VersionASM
View file @ 3976268c
......@@ -8,11 +8,11 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
Module_MajorVersion SETS "5.31"
Module_Version SETA 531
Module_MajorVersion SETS "5.32"
Module_Version SETA 532
Module_MinorVersion SETS ""
Module_Date SETS "15 Aug 2000"
Module_ApplicationDate2 SETS "15-Aug-00"
Module_ApplicationDate4 SETS "15-Aug-2000"
Module_FullVersion SETS "5.31"
Module_Date SETS "17 Aug 2000"
Module_ApplicationDate2 SETS "17-Aug-00"
Module_ApplicationDate4 SETS "17-Aug-2000"
Module_FullVersion SETS "5.32"
END
VersionNum
View file @ 3976268c
/* (5.31)
/* (5.32)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.31
#define Module_MajorVersion_CMHG 5.32
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Aug 2000
#define Module_Date_CMHG 17 Aug 2000
#define Module_MajorVersion "5.31"
#define Module_Version 531
#define Module_MajorVersion "5.32"
#define Module_Version 532
#define Module_MinorVersion ""
#define Module_Date "15 Aug 2000"
#define Module_Date "17 Aug 2000"
#define Module_ApplicationDate2 "15-Aug-00"
#define Module_ApplicationDate4 "15-Aug-2000"
#define Module_ApplicationDate2 "17-Aug-00"
#define Module_ApplicationDate4 "17-Aug-2000"
#define Module_FullVersion "5.31"
#define Module_FullVersion "5.32"
s/Arthur3
View file @ 3976268c
......@@ -1203,10 +1203,8 @@ AlternateLoud
Config_Special MouseType
]
Config_Field Print, 5, 2, PSITCMOS
[ :LNOT: DriversInKernel
Config_Size PrinterBufferSize, 0, 7, PrinterBufferCMOS
PrinterBufferFrig
]
AlternateQuiet
Config_NoParm Quiet, 1, 0, DBTBCMOS, 0
Config_Size RamFsSize, 0, 6, RAMDiscCMOS
......@@ -1514,12 +1512,10 @@ ReadSizeParm ROUT
CMPNE r1, #"K"
Pull "r1, r8", NE
BNE BadConParm
[ :LNOT: DriversInKernel
ADRL r14, PrinterBufferFrig-4
TEQ r8, r14 ; if printer buffer size
TEQEQ r2, #1 ; and 1K
MOVEQ r2, #0 ; then use zero (default)
]
ADRL r14, FontSizeFrig-4 ; point at info word for fontsize
TEQ r8, r14 ; if fontsize
MOVEQ r8, #4*1024 ; then use 4K (lucky it's a pagesize!)
......@@ -1878,12 +1874,10 @@ ExitShow
SUB r9, r9, #10
MOVS r0, r0, LSL r9 ; size in K
BNE %FT35
[ :LNOT: DriversInKernel
ADRL r8, PrinterBufferFrig ; if zero and PrinterBufferSize, then 1K
TEQ r8, r2
MOVEQ r0, #1
BEQ %FT35
]
ADRL r8, ScreenSizeFrig ; if zero and it's ScreenSize, then call OS_ReadSysInfo to find appropriate amount
TEQ r8, r2
BNE %FT35
......@@ -2432,7 +2426,6 @@ Read_Configd_Sync ENTRY
BL ReadMultiField
EXIT
[ :LNOT: DriversInKernel
SetUpPrinterBuffer ENTRY "r1-r3"
MOV r0, #PrinterBufferCMOS
BL Read
......@@ -2451,6 +2444,5 @@ SetUpPrinterBuffer ENTRY "r1-r3"
STR r2, [r0, #PrinterBufferAddr]
STR r3, [r0, #PrinterBufferSize]
EXIT
]
END
s/GetAll
View file @ 3976268c
......@@ -156,12 +156,12 @@ ResetIndirected SETL {TRUE}
GBLL SqueezeMods ; whether squeezed modules are allowed
SqueezeMods SETL {TRUE}
GBLL DriversInKernel ; whether serial/parallel drivers are in the kernel
DriversInKernel SETL {FALSE}
GBLL International ; whether text and error messages come from messaeges file.
International SETL {TRUE}
GBLL CacheCommonErrors ; whether common internationalised errors are cached in sysheap
CacheCommonErrors SETL International :LAND: {TRUE}
GBLL MouseBufferManager ; Whether mouse uses buffer manager
MouseBufferManager SETL {TRUE}
......
s/MsgCode
View file @ 3976268c
......@@ -69,6 +69,7 @@ TranslateError_UseR4
[ CacheCommonErrors
BL CheckCommonErrorCache ; sets R9 to memory address for cached result
MOVNE R1,#0
STRNE R9,[SP]
BNE %FT80
MOV R2,R9 ; 0 - or our cached area!
MOV R3,#256
......@@ -102,7 +103,6 @@ TranslateError_UseR4
CommonErrorAddresses
& ErrorBlock_BadNumb
& ErrorBlock_BuffOverflow
& ErrorBlock_VarNoRoom
& ErrorBlock_ChDynamNotAllMoved
& ErrorBlock_NaffRelease
EndCommonErrorAddresses
......@@ -127,8 +127,10 @@ CheckCommonErrorCache ROUT
EXIT EQ ; not initialised messages yet! Exit R9=0, Z set
LDR r9, [r4, #CachedErrorBlocks]
TEQ r9, #0
; in: R9=cached error blocks memory pointer
BLEQ CommonErrorCacheInit
EXIT EQ
; out: R9=0 and EQ on error; else NE and R9 valid (also case if routine wasn't called)
EXIT EQ ; not initialised cache yet
ADR lr, CommonErrorAddresses
MOV r2, #ECEACount - 1
10
......@@ -141,29 +143,47 @@ CheckCommonErrorCache ROUT
MOVS r9, #0
EXIT
20
; Read the cached error number (0 = we don't have this cached or we have uncached it)
; Update R9 to point to the actual error buffer at the same time.
LDR r1, [r9, r2, LSL #8]!
; Set Z if we don't have that error cached yet, clear it and copy the cached
; block to R0 if we do already have this message
; block to R0 if we do already have this message.
TEQ r1, #0
MOVNE r0, r9
EXIT
CommonErrorCacheInit
Entry "r0-r9"
LDR r3, =ECEACount*256
; On entry, R9 points to the error cache memory, or 0 to indicate we don't have it yet.
; If this routine exits Z clear (NE), it MUST have pointed R9 at the sys heap memory
CommonErrorCacheInit ROUT
Entry "r0-r8"
MOVS r2, r9 ; copy R9 to R2 - only claim memory if it was 0
BNE %FT10
LDR r3, =ECEACount*256 ; size of block required
BL ClaimSysHeapNode
MOVVS r2, #0
MOVS r9, #0 ; set Z for STREQ below and for return
EXIT VS
10
MOV r3, #0
STR r2, [R3, #CachedErrorBlocks]
STREQ r2, [R3, #CachedErrorBlocks]
GBLA CECLoop
CECLoop SETA 0
WHILE CECLoop < ECEACount
STRVC r3, [r2, #CECLoop * 256]
STR r3, [r2, #CECLoop * 256]
CECLoop SETA CECLoop+1
WEND
TEQ r2, #0
MOVS r9, r2 ; set up R9; clear Z
EXIT
; Invoked by the service call handler in the UtilityModule to clear out our cache
; whenever the territory changes or messagetrans says that a messages file was changed.
CacheCommonErrorsReinit
Entry "r9"
MOV r9, #0
LDR r9, [r9, #CachedErrorBlocks]
TEQ r9, #0
BLNE CommonErrorCacheInit
EXIT
]
......
s/PMF/key
View file @ 3976268c
......@@ -1139,19 +1139,7 @@ KeyREMOVECheckRS423 ROUT
Push R14
BL KeyREMOVE
Pull "R14, PC", CS ; pull stacked R14 if CS
; new code inserted here 14/8/87 to try to reenable RTS for RS423 input
[ DriversInKernel
TEQ R1, #1 ; RS423 input ?
Pull PC, NE ; no, then exit
Push "R0,R1,R12" ; preserve char + buffer id + R12
BYTEWS R12
BL RSETX ; reenable RTS if now enough spaces
Pull "R0,R1,R12, PC" ; restore char, buffer id and exit
|
Pull PC
]
; *****************************************************************************
......
s/PMF/osbyte
View file @ 3976268c
......@@ -254,24 +254,6 @@ V2B156
Osbyte02 ROUT
AND R0, R1, #1 ; new buffer id
TEQ R1, #0 ; 0 => disable RXI
[ DriversInKernel
MOVNE R1, #RXEN6850 ; else enable RXI
MOV R2, #(&FF :EOR: RXEN6850) ; AND mask (R1 = EOR mask)
BL ModifyControl6850 ; on exit, R1 = old control reg
LDRB R2, RS423conflag ; R2 = new control reg
Push "R1, R2"
BL RSETX ; try to enable RX interrupts
Pull "R1, R2"
TEQ R1, R2
BEQ %FT10 ; no change in RXI
Push R11 ; now purge data register when going
LDR R11, =ACIA ; from disabled -> enabled; (also
LDRB R1, ACIARxData ; does it for enabled -> disabled, this
; is irrelevant)
Pull R11
10
|
Push "r0"
BNE %FT10 ; [enabling serial]
......@@ -298,18 +280,15 @@ Osbyte02 ROUT
; (may store same value if already open, but who cares?)
20
Pull "r0"
]
LDRB R1, InputStream ; old input stream
STRB R0, InputStream
MyOsbyte
LTORG
[ :LNOT: DriversInKernel
SerialInFilename
= "Serial#Buffer1:", 0
ALIGN
]
; Select output stream
Osbyte03
......@@ -352,17 +331,6 @@ Osbyte06
STRB R2, NoIgnore ; (R2=0) allow chars to be ignored
B V2B156
[ DriversInKernel
; Write RS423 receive rate
Osbyte07
BL DoOsbyte07
MyOsbyte
; Write RS432 transmit rate
Osbyte08
BL DoOsbyte08
MyOsbyte
|
; Write RS423 receive rate
; Write RS432 transmit rate
Osbyte07
......@@ -370,128 +338,6 @@ Osbyte08
SUB r0, r0, #2 ; 7 -> 5; 8 -> 6
SWI XOS_SerialOp
MyOsbyte
]
[ DriversInKernel
; Modified 30-Mar-88 to handle new baud rates
; Format of SerULAreg is as follows:-
; Bit Contents
; 7 TX3 ; *** NEW ***
; 6 RX3 ; *** NEW ***
; 5 RX2
; 4 RX1
; 3 RX0
; 2 TX2
; 1 TX1
; 0 TX0
; FX7/8 RX/TX bits above Baud
; value 3 2 1 0 rate
;
; 1 0 1 1 1 75
; 2 0 0 1 1 150
; 3 0 1 0 1 300
; 4 0 0 0 1 1200
; 5 0 1 1 0 2400
; 6 0 0 1 0 4800
; 7 or 0 0 1 0 0 9600
; 8 0 0 0 0 19200
; 9 1 0 1 1 50
; 10 1 1 0 1 109.92
; 11 1 0 0 1 134.58
; 12 1 1 1 0 600
; 13 1 0 1 0 1800
; 14 1 1 0 0 3600
; 15 1 0 0 0 7200
; 16 1 1 1 1 Undefined
DoOsbyte07 ROUT
Push "R11, R14"
LDRB R2, SerULAreg
CMP R1, #16+1
BCS %FT10 ; invalid
ADR R3, SerBaudTable ; point to silly serproc table
LDRB R3, [R3, R1] ; get entry
BIC R0, R2, #&78 ; clear old bits
ORR R0, R0, R3, LSL #3 ; or in new bits
DoFx7or8
STRB R0, SerULAreg
; first set up the carry flag to indicate whether RX = TX
AND R1, R0, #&07 ; get Tx bits 0-2
TST R0, #&80
ORRNE R1, R1, #&08 ; R1 = Tx bits
EOR R3, R1, R0, LSR #3 ; EOR Rx and Tx bits
AND R3, R3, #15 ; ignore other bits
CMP R3, #1 ; C=1 => different
; now program both RX and TX (start with TX)
ADR R3, TxBaudTable ; (R1 = Tx bits)
LDRB R3, [R3, R1]
MOV R1, R0, LSR #3 ; R1 = RX bits for later
AND R1, R1, #15
PHPSEI ; NB preserves carry
LDR R11, =ACIA
LDRB R0, ACIAControl ; replace old baud bits with new
AND R0, R0, #(ACIASBN :OR: ACIAWL1 :OR: ACIAWL0)
ORR R0, R0, R3 ; external RX clock by default
ORRCC R0, R0, #&10 ; if RX=TX use internal RX clock
STRB R0, ACIAControl
BCC %FT20 ; if RX=TX then we've finished
ADR R3, RxBaudTable ; point to timer latch values table
LDR R3, [R3, R1, LSL #2] ; get entry
MOV R0, #IOC
STRB R3, [R0, #Timer2LL]
MOV R3, R3, LSR #8
STRB R3, [R0, #Timer2LH]
STRB R3, [R0, #Timer2GO]
20
PLP
10
MOV R1, R2 ; R1 = R2 = "old serproc contents"
Pull "R11, PC"
DoOsbyte08
Push "R11, R14"
LDRB R2, SerULAreg
CMP R1, #16+1
BCS %BT10 ; invalid
ADR R3, SerBaudTable ; point to silly serproc table
LDRB R3, [R3, R1] ; get entry
BIC R0, R2, #&87 ; clear old bits
TST R3, #8 ; if bit 3 is set
EORNE R3, R3, #&88 ; then move to bit 7
ORR R0, R0, R3 ; OR in new bits
B DoFx7or8
LTORG
SerBaudTable
= 4, 7, 3, 5, 1, 6, 2, 4, 0 ; silly table for BBC compat
= 11, 13, 9, 14, 10, 12, 8, 15
TxBaudTable ; ordered on values in SerBaudTable
= Baud19200, Baud1200, Baud4800, Baud150
= Baud9600, Baud300, Baud2400, Baud75
= Baud7200, Baud135, Baud1800, Baud50
= Baud3600, Baud110, Baud600, BaudUndef
ALIGN
RxBaudTable ; ordered on values in SerBaudTable
& 2, 51, 12, 416, 6, 207, 25, 832
& 8, 463, 34, 1249, 16, 568, 103, 0
]
; Write First Flash Time
Osbyte09
......@@ -699,16 +545,6 @@ FlushThis
; code inserted here to zero PrinterActive iff you are flushing the printer
; buffer and the print destination is not a stream one
[ DriversInKernel
TEQ R1, #Buff_Print ; is it the printer buffer ?
BNE %FT15 ; no, then skip
LDRB R0, PrinterDrivType ; if printer type 0, 1 or 2
CMP R0, #3
MOVCC R0, #0 ; then mark printer dormant
STRCC R0, PrinterActive
15
]
CMP R1, #Buff_RS423Out ; is it an input buffer ? (not mouse)
BCS %FT20 ; no, then branch
......
s/PMF/oswrch
View file @ 3976268c
......@@ -125,20 +125,6 @@ PrintVdu
B %BT40
RS423Vdu
[ DriversInKernel
PHPSEI
Push "R0,R1,R14" ; I know what I'm doing, honest!
MOV R1, #Buff_RS423Out ; RS423 output buffer id
SETV ; indicate examine buffer
BL REMOVE
BLCS RSBUSY ; buff empty, so reawaken TXIRQ
LDMFD R13, {R0} ; get char back
MOV R1, #Buff_RS423Out ; RS423 output buffer id
BL WRITE ; write to buffer (waiting)
Pull "R0,R1,R14"
PLP ; restore interrupt state (V preserved)
B %BT42 ; carry on with rest
|
Push "r0,r1"
LDRB r1, SerialOutHandle
TEQ r1, #0
......@@ -169,13 +155,10 @@ RS423Vdu
BIC r1, r1, #1 ; clear RS423 output bit
STRB r1, WrchDest ; write back to OS_Byte
B %BT45 ; report error
]
[ :LNOT: DriversInKernel
SerialOutFilename
= "Serial#Buffer2:", 0
ALIGN
]
SpoolVdu ; entered with V=0
TST R1, #&10 ; spooling enabled ?
......
s/Utility
View file @ 3976268c
......@@ -25,11 +25,7 @@ UtilityMod
& StartSuper-UtilityMod
& 0 ; no initialisation
& Util_Die-UtilityMod
[ DriversInKernel
& 0 ; no services ta
|
& Util_Service-UtilityMod ; code to register printer buffer with Buffer manager
]
& UtilModTitle-UtilityMod
& UtilHelpStr-UtilityMod
& UtilHelpTab-UtilityMod
......@@ -42,19 +38,30 @@ UtilityMod
|
& 0
]
[ :LNOT: No32bitCode
& UtilFlags-UtilityMod
]
Module_BaseAddr SETA UtilityMod
[ :LNOT: DriversInKernel
[ ChocolateService
;service table
;
ASSERT Service_BufferStarting < Service_DeviceFSCloseRequest
ASSERT Service_MessageFileClosed < Service_BufferStarting
ASSERT Service_BufferStarting < Service_TerritoryStarted
ASSERT Service_TerritoryStarted < Service_DeviceFSCloseRequest
;
Util_ChocServTab
DCD 0 ;flags word
DCD Util_ChocService-UtilityMod ;offset to handler
[ CacheCommonErrors
DCD Service_MessageFileClosed
]
DCD Service_BufferStarting ;service 1
[ CacheCommonErrors
DCD Service_TerritoryStarted
]
DCD Service_DeviceFSCloseRequest ;service 2
DCD 0 ;terminator
DCD Util_ChocServTab-UtilityMod ;table anchor
......@@ -65,10 +72,19 @@ Util_Service ROUT
]
TEQ r1, #Service_BufferStarting
TEQNE r1, #Service_DeviceFSCloseRequest
[ CacheCommonErrors
TEQNE r1, #Service_TerritoryStarted
TEQNE r1, #Service_MessageFileClosed
]
MOVNE pc, lr
[ ChocolateService
;entry point excluding pre-rejection code
Util_ChocService
]
[ CacheCommonErrors
TEQ r1, #Service_TerritoryStarted
TEQNE r1, #Service_MessageFileClosed
BEQ CacheCommonErrorsReinit
]
TEQ r1, #Service_BufferStarting
BNE %FT10
......@@ -133,7 +149,6 @@ Util_ChocService
MOV r1, #Service_Serviced ; indicate we closed it
Pull "r0,lr,pc" ; restore r0, junk r1, and exit
]
Util_Die ROUT
CMP R10, #0
......@@ -1037,4 +1052,9 @@ getK ROUT
MOVVC R1,R2 ; R1 = answer
Pull "R2-R3,PC"
[ :LNOT: No32bitCode
UtilFlags DCD ModuleFlag_32bit
]
END
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