Skip to content

GitLab

Commit 9d96c0ab authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Strip out some old build switches 

Detail:
  hdr/Options, s/ArthurSWIs, s/ChangeDyn, s/PMF/KbdDrA1, s/PMF/key, s/vdu/vdugrafa, s/vdu/vdugrafd, s/vdu/vdugrafhal, s/vdu/vdugrafv, s/vdu/vdumodes, s/vdu/vduwrch:
  - Strip out DoingVdu build switch (did nothing)
  - Strip out Japanese16BitSound switch (did nothing)
  - Strip out MakeModeSelectorsForModeNUmbers switch (altered the mode list structures, but there wasn't any code to do anything with the new data)
  - Strip out remaining uses of UseGraphicsV switch (now hardwired to {TRUE})
  - Strip out ShadowROM switch (altered FixedAreasTable to show the shadow mapping, but code to create the mapping is missing)
  - Strip out PollMouse switch (old Archimedes-era debug/development option)
Admin:
  Tested on BB-xM
  Builds to same binary as previous version


Version 5.35, 4.79.2.204. Tagged as 'Kernel-5_35-4_79_2_204'
parent 694750de
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 139 deletions
VersionASM
View file @ 9d96c0ab
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.203"
Module_Date SETS "15 Dec 2013"
Module_ApplicationDate SETS "15-Dec-13"
Module_MinorVersion SETS "4.79.2.204"
Module_Date SETS "17 Dec 2013"
Module_ApplicationDate SETS "17-Dec-13"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.203)"
Module_HelpVersion SETS "5.35 (15 Dec 2013) 4.79.2.203"
Module_FullVersion SETS "5.35 (4.79.2.204)"
Module_HelpVersion SETS "5.35 (17 Dec 2013) 4.79.2.204"
END
VersionNum
View file @ 9d96c0ab
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.203
#define Module_Date_CMHG 15 Dec 2013
#define Module_MinorVersion_CMHG 4.79.2.204
#define Module_Date_CMHG 17 Dec 2013
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.203"
#define Module_Date "15 Dec 2013"
#define Module_MinorVersion "4.79.2.204"
#define Module_Date "17 Dec 2013"
#define Module_ApplicationDate "15-Dec-13"
#define Module_ApplicationDate "17-Dec-13"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.203)"
#define Module_HelpVersion "5.35 (15 Dec 2013) 4.79.2.203"
#define Module_FullVersion "5.35 (4.79.2.204)"
#define Module_HelpVersion "5.35 (17 Dec 2013) 4.79.2.204"
#define Module_LibraryVersionInfo "5:35"
hdr/Options
View file @ 9d96c0ab
......@@ -52,9 +52,6 @@ CacheOff SETL {FALSE}
GBLL ShowWS
ShowWS SETL {TRUE} ; Make KernelWS be verbose
GBLL DoingVdu
DoingVdu SETL {FALSE} ; so can get KeyWS!
GBLL Module
Module SETL {FALSE}
......@@ -108,9 +105,6 @@ RISCPCBurstMode SETL {FALSE}
GBLL DoInitialiseMode
DoInitialiseMode SETL {TRUE} :LAND: Embedded_UI
GBLL Japanese16BitSound
Japanese16BitSound SETL {TRUE} :LAND: STB
GBLL SqueezeMods ; whether squeezed modules are allowed
SqueezeMods SETL {TRUE}
......@@ -153,15 +147,9 @@ LCDSupport SETL {TRUE} :LAND: :LNOT: STB
GBLL ModeSelectors ; whether mode selectors are understood
ModeSelectors SETL {TRUE}
GBLL MakeModeSelectorsForModeNumbers
MakeModeSelectorsForModeNumbers SETL ModeSelectors :LAND: {FALSE} ; not actually needed after all
GBLL IgnoreVRAM ; if true, don't add VRAM to the RAM list (+ don't use for screen)
IgnoreVRAM SETL {FALSE}
GBLL UseGraphicsV ; if true, use GraphicsV, rather than going straight
UseGraphicsV SETL {TRUE} ; to the hardware (or HAL)
GBLL LateAborts ; if true, use late abort mode on ARM600 (compulsory on ARM700)
LateAborts SETL {TRUE}
......@@ -171,14 +159,11 @@ ShrinkableDAs SETL {TRUE}
GBLL DA_Batman ; Holey dynamic areas Batman!
DA_Batman SETL {TRUE} ; concept of sparsely mapped dynamic areas introduced for Ursula
GBLL ShadowROM ; if true, the ROM is mirrored above
ShadowROM SETL {FALSE} ; &FF800000
GBLL Interruptible32bitModes ; if true, limited 32-bit mode code support (interrupt handler does not assume
Interruptible32bitModes SETL {TRUE} ; 26-bit foreground), also allows faster, 32-bit APCS version of FPEmulator
GBLL GSWorkspaceInKernelBuffers ; Move gstrans workspace into the kernel buffers area to fix redirection
GSWorkspaceInKernelBuffers SETL {TRUE} ; and everything else that suffers from the dodgy use of scratch space.
GSWorkspaceInKernelBuffers SETL {TRUE} ; and everything else that suffers from the dodgy use of scratch space.
GBLL EarlierReentrancyInDAShrink
EarlierReentrancyInDAShrink SETL {TRUE} ; fix for RAMFS and new FileCore (causes reentrant DA shrink/remove)
......@@ -339,9 +324,6 @@ AssembleKEYV SETL {TRUE} ; Use KEYV.
GBLL AssemblePointerV
AssemblePointerV SETL {TRUE} ; Use PointerV.
GBLL PollMouse
PollMouse SETL {FALSE} ; Poll mouse.
GBLL ProcessorVectors
ProcessorVectors SETL {TRUE} ; Processor vectors indirected through 0 page.
......
s/ArthurSWIs
View file @ 9d96c0ab
......@@ -641,11 +641,7 @@ defaultvectab
& 0, 0, NaffVector ; TimeCodeV * &27
& 0, 0, NaffVector ; LowPriorityEventV &28
& 0, 0, NaffVector ; &29
[ UseGraphicsV
& 0, ZeroPage+VduDriverWorkSpace, MOSGraphicsV ; GraphicsV * &2a
|
& 0, 0, NaffVector ; GraphicsV * &2a
]
& 0, 0, NaffVector ; UnthreadV * &2b
; the spares
......
s/ChangeDyn
View file @ 9d96c0ab
......@@ -2345,9 +2345,6 @@ FixedAreasTable ; table of fixed areas (
[ No26bitCode
& AbtStack, AbtStackSize
]
[ ShadowROM
& &FF800000, &007FFFFF ; Shadow ROM (length has been bodged to avoid wrap problems)
]
] ; HAL
& -1, 0 ; termination
......
s/PMF/KbdDrA1
View file @ 9d96c0ab
......@@ -25,11 +25,7 @@
; 24-Feb-93 SMC Split from file "key".
; Use generic keyboard/mouse interfaces.
[ PollMouse
K1ack * K1sack
|
K1ack * K1smak
]
MACRO
$lab RXonTXoff $reg, $cond
......
s/PMF/key
View file @ 9d96c0ab
......@@ -688,12 +688,6 @@ CentiSecondTick ROUT
LDR R11, =ZeroPage+KeyWorkSpace
MOV R12, #IOC
[ PollMouse
MOV R0, #K1rqmp
STRB R0, RequestMouse
TXon R0
]
LDR R0, InkeyCounter
SUBS R0, R0, #1 ; decrement
STRCS R0, InkeyCounter ; store back unless was frozen at 0
......
s/vdu/vdugrafa
View file @ 9d96c0ab
......@@ -147,7 +147,7 @@ RectFillA
RectFillB
SortT R0, R2, R11 ; ensure R0 holds the lesser X value
SortT R3, R1, R11 ; ensure R1 holds the higher Y value
[ UseGraphicsV
BL CheckAcceleration
BNE RectFillC
......@@ -184,7 +184,6 @@ RectFillB
; if it didn't claim, we proceed with the pre-clipped coordinates
]
RectFillC
MOV R11, R3 ; place end Y out of harm's way
10
......
s/vdu/vdugrafd
View file @ 9d96c0ab
......@@ -143,7 +143,6 @@ BlockCopyMove ROUT
STR R8, [WsPtr, #CMVertCount] ; no. of vertical lines -1
[ UseGraphicsV
BL CheckAcceleration ; okay to accelerate?
BNE %FT05
......@@ -165,7 +164,6 @@ BlockCopyMove ROUT
ADD R13, R13, #3*4
Pull "R2"
BEQ EraseDest ; then go straight to erase
]
05 LDR R9, [WsPtr, #Log2BPC]
LDR R10, [WsPtr, #XShftFactor]
......
s/vdu/vdugrafhal
View file @ 9d96c0ab
......@@ -23,8 +23,6 @@
; Date 30.8.02
;
ASSERT UseGraphicsV
MACRO
GVHEntry $name
ASSERT . - MOSGraphicsVHAL_Table = GraphicsV_$name * 4
......
s/vdu/vdugrafv
View file @ 9d96c0ab
......@@ -23,8 +23,6 @@
; Date 30.8.02
;
[ UseGraphicsV
MACRO
GVEntry $name
ASSERT . - MOSGraphicsV_Table = GraphicsV_$name * 4
......@@ -73,6 +71,4 @@ CheckAcceleration
TEQEQ R11, #0 ; Must not be redirected
MOV PC, R14
] ; UseGraphicsV
END
s/vdu/vdumodes
View file @ 9d96c0ab
......@@ -1085,50 +1085,6 @@ scrsz SETA $ScreenSize
& $Log2BPC, $Log2BPP, $ECFIndex
& $ScrRCol, $ScrBRow, $PalIndex
ALIGN
[ MakeModeSelectorsForModeNumbers
xres SETA (($XWindLimit+1):SHL:($Log2BPC)):SHR:($Log2BPP)
yres SETA ($YWindLimit)+1
pixdepth SETA $Log2BPP
[ yres < xres/2
yeig SETA 2
|
yeig SETA 1
]
ModeSelector_$label
& 1, xres, yres, pixdepth
& -1 ; frame rate (is this going to be OK?)
[ {FALSE} ; don't need any of this stuff - we're only getting the VIDC stuff via this mechanism
[ ($ModeFlags)<>0
& VduExt_ModeFlags, $ModeFlags
]
[ ($ScrRCol) <> (xres :SHR: 3)-1
& VduExt_ScrRCol, $ScrRCol
]
[ ($ScrBRow) <> (yres :SHR: 3)-1
& VduExt_ScrBRow, $ScrBRow
]
[ ($NColour) <> NColour_$Log2BPP
& VduExt_NColour, $NColour
]
[ ($XEigFactor) <> 1
& VduExt_XEigFactor, $XEigFactor
]
[ ($YEigFactor) <> yeig
& VduExt_YEigFactor, $YEigFactor
]
[ ($LineLength) <> (xres :SHL: pixdepth) :SHR: 3
& VduExt_LineLength, $LineLength
]
[ scrsz <> ((xres * yres) :SHL: pixdepth) :SHR: 3
& VduExt_ScreenSize, scrsz
]
[ ($Log2BPC) <> pixdepth
& VduExt_Log2BPC, $Log2BPC
]
]
& -1 ; terminator
]
MEND
MACRO
......@@ -1244,25 +1200,4 @@ VW_53 VWSTAB 53,M50S*8,320, 319,239,0,2,2,63, 39, 29,3,3,3,5,0
; $XWindLimit $NColour $PalIndex
; $YWindLimit $ScrRCol $ECFIndex
[ MakeModeSelectorsForModeNumbers
ModeSelectorTable
GBLA modecount
GBLS h
GBLS l
modecount SETA 0
ASSERT NumModes <= 100
WHILE modecount < NumModes
[ modecount >= 10
h SETS :CHR:(&30 + modecount/10)
|
h SETS ""
]
l SETS :CHR:(&30 + modecount :MOD: 10)
& ModeSelector_VW_$h$l-ModeSelectorTable
modecount SETA modecount + 1
WEND
! 0, "Mode selector table at ":CC: :STR: ModeSelectorTable
]
END
s/vdu/vduwrch
View file @ 9d96c0ab
......@@ -368,11 +368,8 @@ FastCLS ROUT
BL TTXFastCLS ; else clear teletext map
MOV R0, #0 ; and clear to zero
[ UseGraphicsV
B %FT15
]
10
[ UseGraphicsV
BL CheckAcceleration
BNE %FT15
MOV R11, R13 ; try to do an accelerated
......@@ -403,7 +400,6 @@ FastCLS ROUT
Pull PC, EQ
LDR R0, [WsPtr, #TextBgColour]
15
]
LDR R8, [WsPtr, #ScreenStart]
MOV R1, R0
MOV R2, R0
......@@ -1663,7 +1659,6 @@ GetBoxInfo
MOV R1, R3 ; prepare to address top left
B AddressR0R1
[ UseGraphicsV
;
; TextWindowToGraphics - current text window converted to graphics
;
......@@ -1731,7 +1726,6 @@ TextBoxToGraphics
ADD R1, R1, #1
MOV PC, R14
]
; *****************************************************************************
;
......@@ -1835,11 +1829,9 @@ HardScrollSpriteUp
Push R14
TST R6, #TeletextMode
BNE TTXSoftScrollUp
[ UseGraphicsV
BL TryCopyScreenUp
Pull R14,EQ
BEQ ClearBottomScreenLine
]
BL GetScreenInfo ; get box info for whole 'screen'
LDR R0, [WsPtr, #RowMult]
BL SoftScrollUp2
......@@ -1859,11 +1851,9 @@ SoftScrollUp
TST R6, #TeletextMode
BNE TTXSoftScrollUp
[ UseGraphicsV
BL TryCopyWindowUp
Pull R14, EQ
BEQ ClearBottomLine
]
BL GetWindowInfo
; R2 = address of top left
......@@ -1936,7 +1926,6 @@ ScrollLineUp
MOV PC, R14
[ UseGraphicsV
; *****************************************************************************
;
; TryCopyScreenUp - use GraphicsV to copy screen up
......@@ -2024,7 +2013,6 @@ TryCopyWindowDown
Push R14
ADR R14, TryCopyDownCommon
B TextWindowToGraphics
]
; *****************************************************************************
;
......@@ -2080,11 +2068,9 @@ HardScrollSpriteDown
Push R14
TST R6, #TeletextMode
BNE TTXSoftScrollDown
[ UseGraphicsV
BL TryCopyScreenDown
Pull R14, EQ
BEQ ClearTopLine
]
BL GetScreenInfo ; get box info for whole 'screen'
MOV R0, #0
......@@ -2109,11 +2095,9 @@ SoftScrollDown
TST R6, #TeletextMode
BNE TTXSoftScrollDown
[ UseGraphicsV
BL TryCopyWindowDown
Pull R14, EQ
BEQ ClearTopLine
]
BL GetWindowInfo
; R2 = address of top left
......
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