Skip to content

GitLab

Commit d58ce177 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Review of Internation switch 

Variously the call to TranslateError was either followed (outside the switch) by an unnecessary SETV, or missing SETV for the non international case.
Added DMA controller HAL device for IOMD.

Version 5.35, 4.79.2.174. Tagged as 'Kernel-5_35-4_79_2_174'
parent 241a5988
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 75 deletions
Makefile
View file @ d58ce177
...@@ -101,7 +101,6 @@ install_rom: ${TARGET} ...@@ -101,7 +101,6 @@ install_rom: ${TARGET}
clean: clean:
${RM} s.TMOSHelp ${RM} s.TMOSHelp
${RM} s.Time+Date
${XWIPE} o.* ${WFLAGS} ${XWIPE} o.* ${WFLAGS}
${RM} ${TARGET} ${RM} ${TARGET}
${XWIPE} aif ${WFLAGS} ${XWIPE} aif ${WFLAGS}
...@@ -143,10 +142,6 @@ ${GPADBG}: ${AIFDBG} ...@@ -143,10 +142,6 @@ ${GPADBG}: ${AIFDBG}
s.TMOSHelp: ${TOKENS} HelpStrs s.TMOSHelp: ${TOKENS} HelpStrs
${TOKENISE} ${TOKENS} HelpStrs $@ ${TOKENISE} ${TOKENS} HelpStrs $@
#s.Time+Date:
# @echo |IGBLS Builddate|JBuilddate SETS "<Sys$Date> <Sys$Year>.<Sys$Time>" |J|IEND { > s.Time+Date }
# settype s.Time+Date FFF
o.GetAll: s.TMOSHelp o.GetAll: s.TMOSHelp
# #
......
VersionASM
View file @ d58ce177
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35" Module_MajorVersion SETS "5.35"
Module_Version SETA 535 Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.173" Module_MinorVersion SETS "4.79.2.174"
Module_Date SETS "14 Oct 2012" Module_Date SETS "28 Oct 2012"
Module_ApplicationDate SETS "14-Oct-12" Module_ApplicationDate SETS "28-Oct-12"
Module_ComponentName SETS "Kernel" Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.173)" Module_FullVersion SETS "5.35 (4.79.2.174)"
Module_HelpVersion SETS "5.35 (14 Oct 2012) 4.79.2.173" Module_HelpVersion SETS "5.35 (28 Oct 2012) 4.79.2.174"
END END
VersionNum
View file @ d58ce177
...@@ -5,19 +5,19 @@ ...@@ -5,19 +5,19 @@
* *
*/ */
#define Module_MajorVersion_CMHG 5.35 #define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.173 #define Module_MinorVersion_CMHG 4.79.2.174
#define Module_Date_CMHG 14 Oct 2012 #define Module_Date_CMHG 28 Oct 2012
#define Module_MajorVersion "5.35" #define Module_MajorVersion "5.35"
#define Module_Version 535 #define Module_Version 535
#define Module_MinorVersion "4.79.2.173" #define Module_MinorVersion "4.79.2.174"
#define Module_Date "14 Oct 2012" #define Module_Date "28 Oct 2012"
#define Module_ApplicationDate "14-Oct-12" #define Module_ApplicationDate "28-Oct-12"
#define Module_ComponentName "Kernel" #define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.173)" #define Module_FullVersion "5.35 (4.79.2.174)"
#define Module_HelpVersion "5.35 (14 Oct 2012) 4.79.2.173" #define Module_HelpVersion "5.35 (28 Oct 2012) 4.79.2.174"
#define Module_LibraryVersionInfo "5:35" #define Module_LibraryVersionInfo "5:35"
hdr/HALDevice
View file @ d58ce177
...@@ -127,11 +127,13 @@ HALDeviceID_DMAC_M5229 # 1 ...@@ -127,11 +127,13 @@ HALDeviceID_DMAC_M5229 # 1
HALDeviceID_DMAC_OMAP3 # 1 HALDeviceID_DMAC_OMAP3 # 1
HALDeviceID_DMAC_OMAP4 # 1 HALDeviceID_DMAC_OMAP4 # 1
HALDeviceID_DMAC_BCM2835 # 1 HALDeviceID_DMAC_BCM2835 # 1
HALDeviceID_DMAC_IOMD21 # 1
^ 0 ^ 0
HALDeviceID_DMAB_M1535 # 1 HALDeviceID_DMAB_M1535 # 1
HALDeviceID_DMAB_OMAP3 # 1 HALDeviceID_DMAB_OMAP3 # 1
HALDeviceID_DMAB_OMAP4 # 1 HALDeviceID_DMAB_OMAP4 # 1
HALDeviceID_DMAB_IOMD21 # 1
^ 0 ^ 0
HALDeviceID_DMAL_M5229 # 1 HALDeviceID_DMAL_M5229 # 1
......
s/ARM600
View file @ d58ce177
...@@ -2134,10 +2134,10 @@ MMUControl_Unknown ...@@ -2134,10 +2134,10 @@ MMUControl_Unknown
ADRL r0, ErrorBlock_HeapBadReason ADRL r0, ErrorBlock_HeapBadReason
[ International [ International
BL TranslateError BL TranslateError
] |
Pull lr
SETV SETV
MOV pc, lr ]
Pull "pc"
MMUControl_ModifyControl ROUT MMUControl_ModifyControl ROUT
......
s/ARMops
View file @ d58ce177
...@@ -2245,7 +2245,11 @@ ARM_PrintProcessorType ...@@ -2245,7 +2245,11 @@ ARM_PrintProcessorType
ADR a2, PNameTable ADR a2, PNameTable
LDHA a1, a2, a1, a3 LDHA a1, a2, a1, a3
ADD a1, a2, a1 ADD a1, a2, a1
[ International
BL Write0_Translated BL Write0_Translated
|
SWI XOS_Write0
]
SWI XOS_NewLine SWI XOS_NewLine
SWI XOS_NewLine SWI XOS_NewLine
Pull "pc" Pull "pc"
......
s/Arthur3
View file @ d58ce177
...@@ -1635,8 +1635,9 @@ statoptservice ...@@ -1635,8 +1635,9 @@ statoptservice
ADR r0, %FT03 ADR r0, %FT03
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
Pull "pc" Pull "pc"
03 03
& ErrorNumber_Syntax & ErrorNumber_Syntax
......
s/ArthurSWIs
View file @ d58ce177
...@@ -126,31 +126,21 @@ ReadUnsigned_Routine Entry "r0-r1, r3-r6, r9" ...@@ -126,31 +126,21 @@ ReadUnsigned_Routine Entry "r0-r1, r3-r6, r9"
80 ADR r2, ErrorBlock_NumbTooBig 80 ADR r2, ErrorBlock_NumbTooBig
[ International
B %FT94
|
B %FT95 B %FT95
]
85 ADR r2, ErrorBlock_BadNumb 85 ADR r2, ErrorBlock_BadNumb
[ International
B %FT94
|
B %FT95 B %FT95
]
90 ADR r2, ErrorBlock_BadBase 90 ADR r2, ErrorBlock_BadBase
95
[ International [ International
94
Push "r0,lr" Push "r0,lr"
MOV r0,r2 MOV r0,r2
BL TranslateError BL TranslateError
MOV r2,r0 MOV r2,r0
Pull "r0,lr" Pull "r0,lr"
] ]
95
STR r2, [stack] ; Go set the current error STR r2, [stack] ; Go set the current error
MOV r2, #0 ; Defined to return 0 on error MOV r2, #0 ; Defined to return 0 on error
TST r11, #1 :SHL: 28 TST r11, #1 :SHL: 28
......
s/ChangeDyn
View file @ d58ce177
...@@ -1508,9 +1508,9 @@ UnknownDyn ...@@ -1508,9 +1508,9 @@ UnknownDyn
ADRL r0, ErrorBlock_BadDynamicArea ADRL r0, ErrorBlock_BadDynamicArea
[ International [ International
BL TranslateError BL TranslateError
] |
90
SETV SETV
]
EXIT EXIT
;************************************************************************** ;**************************************************************************
...@@ -2078,8 +2078,9 @@ DynArea_Renumber ALTENTRY ...@@ -2078,8 +2078,9 @@ DynArea_Renumber ALTENTRY
ADRL r0, ErrorBlock_AreaAlreadyExists ADRL r0, ErrorBlock_AreaAlreadyExists
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
EXIT EXIT
;if you think this is worth internationalising, I pity you ;if you think this is worth internationalising, I pity you
...@@ -2289,9 +2290,10 @@ CheckForOverlappingAreas Entry "r0-r5" ...@@ -2289,9 +2290,10 @@ CheckForOverlappingAreas Entry "r0-r5"
ADRL r0, ErrorBlock_OverlappingAreas ADRL r0, ErrorBlock_OverlappingAreas
[ International [ International
BL TranslateError BL TranslateError
|
SETV
] ]
STR r0, [sp] STR r0, [sp]
SETV
EXIT EXIT
; Now, check against DAList ; Now, check against DAList
...@@ -2414,9 +2416,10 @@ AllocateAreaAddress Entry "r0-r2,r4-r7" ...@@ -2414,9 +2416,10 @@ AllocateAreaAddress Entry "r0-r2,r4-r7"
ADRL r0, ErrorBlock_CantAllocateArea ADRL r0, ErrorBlock_CantAllocateArea
[ International [ International
BL TranslateError BL TranslateError
|
SETV
] ]
STR r0, [sp] STR r0, [sp]
SETV
EXIT ; say we can't do it EXIT ; say we can't do it
LTORG LTORG
...@@ -2619,9 +2622,10 @@ AllocateBackingLevel2 Entry "r0-r8,r11" ...@@ -2619,9 +2622,10 @@ AllocateBackingLevel2 Entry "r0-r8,r11"
ADRL r0, ErrorBlock_CantAllocateLevel2 ADRL r0, ErrorBlock_CantAllocateLevel2
[ International [ International
BL TranslateError BL TranslateError
|
SETV
] ]
STR r0, [sp] STR r0, [sp]
SETV
EXIT EXIT
;************************************************************************** ;**************************************************************************
...@@ -3925,8 +3929,9 @@ DoTheGrowPageUnavailable ROUT ...@@ -3925,8 +3929,9 @@ DoTheGrowPageUnavailable ROUT
ADR r0, ErrorBlock_CantGetPhysMem ADR r0, ErrorBlock_CantGetPhysMem
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
EXIT EXIT
MakeErrorBlock CantGetPhysMem MakeErrorBlock CantGetPhysMem
...@@ -4572,9 +4577,10 @@ CheckAppSpace ROUT ...@@ -4572,9 +4577,10 @@ CheckAppSpace ROUT
10 10
[ International [ International
BL TranslateError BL TranslateError
|
SETV
] ]
STR r0, [sp] STR r0, [sp]
SETV
EXIT EXIT
; IF service call claimed Then Error AplWSpaceInUse ; IF service call claimed Then Error AplWSpaceInUse
...@@ -4641,7 +4647,6 @@ CallPreShrink Entry "r0,r3,r4, r12" ...@@ -4641,7 +4647,6 @@ CallPreShrink Entry "r0,r3,r4, r12"
BLEQ TranslateError BLEQ TranslateError
] ]
STR r0, [sp] STR r0, [sp]
SETV
EXIT EXIT
; *********************************************************************************** ; ***********************************************************************************
...@@ -4706,13 +4711,12 @@ CallPreGrow Entry "r0,r4, r12" ...@@ -4706,13 +4711,12 @@ CallPreGrow Entry "r0,r4, r12"
FastCDA_ProfEnd CallPreGrow, r12, r4, lr FastCDA_ProfEnd CallPreGrow, r12, r4, lr
EXIT VC ; if no error then exit EXIT VC ; if no error then exit
TEQ r0, #0 ; if generic error returned TEQ r0, #0 ; if generic error returned (V still set)
ADREQL r0, ErrorBlock_ChDynamNotAllMoved ; then substitute real error message ADREQL r0, ErrorBlock_ChDynamNotAllMoved ; then substitute real error message
[ International [ International
BLEQ TranslateError BLEQ TranslateError
] ]
STR r0, [sp] STR r0, [sp]
SETV
EXIT EXIT
; *********************************************************************************** ; ***********************************************************************************
...@@ -4774,7 +4778,7 @@ CallTestShrink Entry "r0,r4,r5, r12" ...@@ -4774,7 +4778,7 @@ CallTestShrink Entry "r0,r4,r5, r12"
SUBVC lr, r5, #1 SUBVC lr, r5, #1
BICVC r3, r3, lr ; make page multiple BICVC r3, r3, lr ; make page multiple
EXIT VC EXIT VC
TEQ r0, #0 ; if generic error returned TEQ r0, #0 ; if generic error returned (V still set)
ADREQL r0, ErrorBlock_ChDynamNotAllMoved ; then substitute real error message ADREQL r0, ErrorBlock_ChDynamNotAllMoved ; then substitute real error message
[ International [ International
BLEQ TranslateError BLEQ TranslateError
...@@ -4871,8 +4875,9 @@ UnknownHandlerError ...@@ -4871,8 +4875,9 @@ UnknownHandlerError
ADRL r0, ErrorBlock_UnknownAreaHandler ADRL r0, ErrorBlock_UnknownAreaHandler
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
Pull "pc" Pull "pc"
DynAreaHandler_Sprites DynAreaHandler_Sprites
...@@ -5004,9 +5009,10 @@ PreShrink_RAMDisc Entry "r0-r5" ...@@ -5004,9 +5009,10 @@ PreShrink_RAMDisc Entry "r0-r5"
ADR r0, ErrorBlock_RAMFsUnchangeable ADR r0, ErrorBlock_RAMFsUnchangeable
[ International [ International
BL TranslateError BL TranslateError
|
SETV
] ]
STR r0, [sp] STR r0, [sp]
SETV
EXIT EXIT
90 90
......
s/Convrsions
View file @ d58ce177
...@@ -724,17 +724,9 @@ NetToDec ...@@ -724,17 +724,9 @@ NetToDec
SWI XOS_ConvertCardinal1 SWI XOS_ConvertCardinal1
Pull "pc" Pull "pc"
ErrorBlock_BadNetwork MakeInternatErrorBlock BadNetwork,,BadNet
DCD ErrorNumber_BadNetwork
DCB "BadNet" ; The token for the Global message
DCB 0
ALIGN
ErrorBlock_BadStation MakeInternatErrorBlock BadStation,,BadStn
DCD ErrorNumber_BadStation
DCB "BadStn" ; The token for the Global message
DCB 0
ALIGN
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; OS_ConvertStandardDateAndTime ; OS_ConvertStandardDateAndTime
......
s/MoreComms
View file @ d58ce177
...@@ -547,8 +547,7 @@ BuildRMEnsureError ...@@ -547,8 +547,7 @@ BuildRMEnsureError
[ International [ International
LDR r4,[r3, #Module_Title] LDR r4,[r3, #Module_Title]
ADD r4,r4,r3 ADD r4,r4,r3
BL TranslateError_UseR4 BL TranslateError_UseR4 ; => V set
SETV
Pull pc Pull pc
| |
BL GetOscliBuffer BL GetOscliBuffer
......
s/MoreSWIs
View file @ d58ce177
...@@ -582,9 +582,10 @@ RdItem ROUT ...@@ -582,9 +582,10 @@ RdItem ROUT
ADR R0, ErrorBlock_ArgRepeated ADR R0, ErrorBlock_ArgRepeated
[ International [ International
BL TranslateError BL TranslateError
|
SETV
] ]
ADD stack, stack, #4 ; discard PSR ADD stack, stack, #4 ; discard PSR
SETV
Pull "R1, R7, R8, PC" Pull "R1, R7, R8, PC"
34 34
ANDS R12, R12, #SFlag ANDS R12, R12, #SFlag
...@@ -616,8 +617,9 @@ RdItem ROUT ...@@ -616,8 +617,9 @@ RdItem ROUT
ADR R0, ErrorBlock_BadParameters ADR R0, ErrorBlock_BadParameters
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
Pull "R1, R7, R8, PC" Pull "R1, R7, R8, PC"
39 39
; copy arg until <" " ; copy arg until <" "
...@@ -637,8 +639,9 @@ RdItem ROUT ...@@ -637,8 +639,9 @@ RdItem ROUT
ADRL R0, ErrorBlock_BuffOverflow ADRL R0, ErrorBlock_BuffOverflow
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
Pull "R1, R7, R8, PC" Pull "R1, R7, R8, PC"
04 CMP R7, #"""" 04 CMP R7, #""""
...@@ -665,8 +668,9 @@ ohnoitsquotedargumentsagain ...@@ -665,8 +668,9 @@ ohnoitsquotedargumentsagain
08 ADRL R0, ErrorBlock_BadString 08 ADRL R0, ErrorBlock_BadString
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
Pull "R1, R7, R8, PC" Pull "R1, R7, R8, PC"
;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
s/Oscli
View file @ d58ce177
...@@ -264,6 +264,8 @@ VecOsCli ROUT ...@@ -264,6 +264,8 @@ VecOsCli ROUT
ADR R0, ErrorBlock_OscliLongLine ADR R0, ErrorBlock_OscliLongLine
[ International [ International
BL TranslateError BL TranslateError
|
SETV
] ]
RedirectionError RedirectionError
BL ReleaseBuff BL ReleaseBuff
......
s/PMF/osbyte
View file @ d58ce177
...@@ -77,7 +77,7 @@ OsByte ...@@ -77,7 +77,7 @@ OsByte
CLRPSR V_bit, R3 ; clear V flag CLRPSR V_bit, R3 ; clear V flag
Pull R0 Pull R0
ADRNE R0, BadCommandError ; not claimed, R0 -> error ADRNE R0, ErrorBlock_BadCommand ; not claimed, R0 -> error
[ International [ International
BLNE TranslateError BLNE TranslateError
] ]
...@@ -86,7 +86,7 @@ OsByte ...@@ -86,7 +86,7 @@ OsByte
ADD SP,SP,#4 ADD SP,SP,#4
Pull "PC" Pull "PC"
BadCommandError MakeErrorBlock BadCommand MakeErrorBlock BadCommand
GoMyOsbyte GoMyOsbyte
CLRPSR V_bit, R3 CLRPSR V_bit, R3
......
s/SysComms
View file @ d58ce177
...@@ -594,8 +594,9 @@ helpnostack ...@@ -594,8 +594,9 @@ helpnostack
ADRL R0, ErrorBlock_StackFull ADRL R0, ErrorBlock_StackFull
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
Pull "R2-R6, pc" Pull "R2-R6, pc"
CallHelpKeywordCode CallHelpKeywordCode
......
s/VMSAv6
View file @ d58ce177
...@@ -370,10 +370,10 @@ MMUControl_Unknown ...@@ -370,10 +370,10 @@ MMUControl_Unknown
ADRL r0, ErrorBlock_HeapBadReason ADRL r0, ErrorBlock_HeapBadReason
[ International [ International
BL TranslateError BL TranslateError
] |
Pull lr
SETV SETV
MOV pc, lr ]
Pull "pc"
MMUControl_ModifyControl ROUT MMUControl_ModifyControl ROUT
......
s/vdu/vdudriver
View file @ d58ce177
...@@ -1666,8 +1666,9 @@ ValidateModeSelector Entry ...@@ -1666,8 +1666,9 @@ ValidateModeSelector Entry
90 90
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
EXIT EXIT
MakeErrorBlock BadMSFlags MakeErrorBlock BadMSFlags
......
s/vdu/vdugrafh
View file @ d58ce177
...@@ -1180,10 +1180,11 @@ bounce_new_format_masks ROUT ...@@ -1180,10 +1180,11 @@ bounce_new_format_masks ROUT
BL MaskOffset ; returns R0=mask size, EQ if no mask, NE if mask BL MaskOffset ; returns R0=mask size, EQ if no mask, NE if mask
LDMEQFD R13!,{R0,R15} ; out now if no mask LDMEQFD R13!,{R0,R15} ; out now if no mask
ADRL R0, SpriteErr_NoMaskOrPaletteAllowedInThisDepth ADRL R0, SpriteErr_NoMaskOrPaletteAllowedInThisDepth
[ International [ International
BL TranslateError BL TranslateError
] |
SETV SETV
]
STR R0,[R13] STR R0,[R13]
STR R0,[WsPtr, #RetnReg0] STR R0,[WsPtr, #RetnReg0]
LDMFD R13!,{R0,R15} LDMFD R13!,{R0,R15}
......
s/vdu/vdugrafj
View file @ d58ce177
...@@ -1229,11 +1229,12 @@ WritePaletteFromSprite ROUT ...@@ -1229,11 +1229,12 @@ WritePaletteFromSprite ROUT
B %FT40 ;otherwise get on with it B %FT40 ;otherwise get on with it
90 90
ADRL R0,SpriteErr_InvalidSpriteMode ADRL R0,SpriteErr_InvalidSpriteMode
[ International [ International
BL TranslateError BL TranslateError
] |
STR R0, [WsPtr, #RetnReg0]
SETV SETV
]
STR R0, [WsPtr, #RetnReg0]
Pull "R0-R6,PC" Pull "R0-R6,PC"
| |
......
s/vdu/vduswis
View file @ d58ce177
...@@ -887,8 +887,9 @@ FindOKMode ROUT ...@@ -887,8 +887,9 @@ FindOKMode ROUT
ADRL r0, ErrorBlock_ModeNotAvailable ; then return error ADRL r0, ErrorBlock_ModeNotAvailable ; then return error
[ International [ International
BL TranslateError BL TranslateError
] |
SETV ; error exit SETV ; error exit
]
Pull "r2-r4,r10,r11, pc" Pull "r2-r4,r10,r11, pc"
SubstModeTable SubstModeTable
......
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