Commit 5f7b9b37 authored by Jeffrey Lee's avatar Jeffrey Lee Committed by ROOL

Fix OS_DynamicArea 21 handling of MaxCamEntry

OS_DynamicArea 21 was treating MaxCamEntry as if it was the exclusive
upper bound, when really it's the inclusive bound. The consequence of
this was that PMPs were unable to explicitly claim the highest-numbered
RAM page in the system.

Version 6.31. Tagged as 'Kernel-6_31'
parent 2ec9e04e
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "6.30"
Module_Version SETA 630
Module_MajorVersion SETS "6.31"
Module_Version SETA 631
Module_MinorVersion SETS ""
Module_Date SETS "24 Nov 2019"
Module_ApplicationDate SETS "24-Nov-19"
Module_Date SETS "18 Jan 2020"
Module_ApplicationDate SETS "18-Jan-20"
Module_ComponentName SETS "Kernel"
Module_FullVersion SETS "6.30"
Module_HelpVersion SETS "6.30 (24 Nov 2019)"
Module_FullVersion SETS "6.31"
Module_HelpVersion SETS "6.31 (18 Jan 2020)"
END
/* (6.30)
/* (6.31)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 6.30
#define Module_MajorVersion_CMHG 6.31
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Nov 2019
#define Module_Date_CMHG 18 Jan 2020
#define Module_MajorVersion "6.30"
#define Module_Version 630
#define Module_MajorVersion "6.31"
#define Module_Version 631
#define Module_MinorVersion ""
#define Module_Date "24 Nov 2019"
#define Module_Date "18 Jan 2020"
#define Module_ApplicationDate "24-Nov-19"
#define Module_ApplicationDate "18-Jan-20"
#define Module_ComponentName "Kernel"
#define Module_FullVersion "6.30"
#define Module_HelpVersion "6.30 (24 Nov 2019)"
#define Module_LibraryVersionInfo "6:30"
#define Module_FullVersion "6.31"
#define Module_HelpVersion "6.31 (18 Jan 2020)"
#define Module_LibraryVersionInfo "6:31"
......@@ -2461,9 +2461,9 @@ DynArea_PMP_PhysOp ROUT
CMP r4, r9
BHS %FT92
; Check for silly phys page index
CMP r5, #-3
CMPLS r11, r5
BLS %FT92
CMP r5, #-2
CMPLO r11, r5
BLO %FT92
; Look up the page that's currently in the PMP
LDR r0, [r8, r4, LSL #2]
TEQ r0, r5
......@@ -2519,9 +2519,9 @@ DynArea_PMP_PhysOp ROUT
CMP r4, r9
BHS %FT93
; Check for silly phys page index
CMP r5, #-3
CMPLS r11, r5
BLS %FT93
CMP r5, #-2
CMPLO r11, r5
BLO %FT93
42
AND r6, r6, #DynAreaFlags_PMPPhysOpAccessMask
; Look up the page that's currently in the PMP
......
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