Commit 1aa4be26 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix HiProcVecs build. Remove old-style PublicWS definitions.

Detail:
  s/ARMops - Added extra LTORG to fix HiProcVecs build error for some platforms
  hdr/PublicWS - Remove the old (non-Legacy_) workspace exports, and add a comment explaining how the newer Legacy_ exports should be used.
Admin:
  HiProcVecs ROMs for various platforms now appear to build OK
  Untested at runtime


Version 5.35, 4.79.2.266. Tagged as 'Kernel-5_35-4_79_2_266'
parent e5bd59a6
...@@ -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.265" Module_MinorVersion SETS "4.79.2.266"
Module_Date SETS "14 Jun 2015" Module_Date SETS "19 Jun 2015"
Module_ApplicationDate SETS "14-Jun-15" Module_ApplicationDate SETS "19-Jun-15"
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.265)" Module_FullVersion SETS "5.35 (4.79.2.266)"
Module_HelpVersion SETS "5.35 (14 Jun 2015) 4.79.2.265" Module_HelpVersion SETS "5.35 (19 Jun 2015) 4.79.2.266"
END END
...@@ -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.265 #define Module_MinorVersion_CMHG 4.79.2.266
#define Module_Date_CMHG 14 Jun 2015 #define Module_Date_CMHG 19 Jun 2015
#define Module_MajorVersion "5.35" #define Module_MajorVersion "5.35"
#define Module_Version 535 #define Module_Version 535
#define Module_MinorVersion "4.79.2.265" #define Module_MinorVersion "4.79.2.266"
#define Module_Date "14 Jun 2015" #define Module_Date "19 Jun 2015"
#define Module_ApplicationDate "14-Jun-15" #define Module_ApplicationDate "19-Jun-15"
#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.265)" #define Module_FullVersion "5.35 (4.79.2.266)"
#define Module_HelpVersion "5.35 (14 Jun 2015) 4.79.2.265" #define Module_HelpVersion "5.35 (19 Jun 2015) 4.79.2.266"
#define Module_LibraryVersionInfo "5:35" #define Module_LibraryVersionInfo "5:35"
...@@ -31,69 +31,14 @@ OldOpt SETA {OPT} ...@@ -31,69 +31,14 @@ OldOpt SETA {OPT}
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; Memory map values: (in address order) ; Memory map values: (in address order)
; These old definitions will be gone soon. ; Legacy kernel locations (ZeroPage-relative)
GBLL OldKernelWorkSpace
[ :DEF: AssemblingArthur ; Note - the addresses defined here are what were used with the RISC OS 5.22-era
OldKernelWorkSpace SETL :LNOT: AssemblingArthur ; kernel and may not match the addresses in use by any newer kernel which your
| ; code may be running on. If you need to peek at these values then make sure
OldKernelWorkSpace SETL {TRUE} ; you look up the address at runtime using OS_ReadSysInfo 6, and only fall back
] ; to these definitions if the OS_ReadSysInfo implementation doesn't recognise
; the item.
[ OldKernelWorkSpace :LAND: {TRUE}
; Kernel locations (ZeroPage-relative)
^ &00000104
ESC_Status # 1
^ &00000105
LatchBSoftCopy # 1
^ &00000107
CannotReset # 1
^ &00000108
IRQsema # 4
^ &00000114
MEMC_CR_SoftCopy # 4
^ &00000300
DebuggerSpace # 8*16
^ &00000AE1 ; RedirectInHandle
RedirectInHandle # 1
^ &00000AE2 ; RedirectOutHandle
RedirectOutHandle # 1
^ &00000FF8
DomainId # 4 ; domain identification
^ &00001000
VduDriverWorkSpace # &3000
; VDU driver locations (VduDriverWorkSpace-relative)
^ &0000047C
ScreenBlankFlag # 1 ; 0 => unblanked, 1 => blanked
^ &0000047D
ScreenBlankDPMSState # 1 ; 0 => just blank video
; 1 => blank to stand-by (hsync off)
; 2 => blank to suspend (vsync off)
; 3 => blank to off (H+V off)
^ &00000480
FgEcfOraEor # 4*16 ; Interleaved zgora & zgeor (from Vdu Driver Workspace)
^ &000004C0
BgEcfOraEor # 4*16 ; Interleaved zgora & zgeor (from Vdu Driver Workspace)
]
; New 'legacy' definitions
; Kernel locations (ZeroPage-relative)
^ &00000104 ^ &00000104
Legacy_ESC_Status # 1 Legacy_ESC_Status # 1
......
...@@ -1565,6 +1565,7 @@ MMU_ChangingUncachedEntries_WB_Crd ROUT ...@@ -1565,6 +1565,7 @@ MMU_ChangingUncachedEntries_WB_Crd ROUT
MCR p15, 0, a1, c8, c7, 0 ;flush ITLB and DTLB MCR p15, 0, a1, c8, c7, 0 ;flush ITLB and DTLB
MOV pc, lr MOV pc, lr
LTORG
; ARMops for XScale, mjs Feb 2001 ; ARMops for XScale, mjs Feb 2001
; ;
......
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