len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-11 22:25:14 -05:00
Code Issues Projects Releases Packages Wiki Activity

Simplified invariants.

Browse source
This commit is contained in:
Tobias Reinhard 2022-12-08 08:49:59 -05:00
parent 99d46f9e51
commit eef76ea839
2 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tasks.c
View file

@ -965,16 +965,11 @@ static void prvYieldForTask( TCB_t * pxTCB,
// opened predicate `coreLocalInterruptInv_p()` // opened predicate `coreLocalInterruptInv_p()`
[0.5]pointer(&pxCurrentTCBs[coreID_f], ?gCurrentTCB) &*& [0.5]pointer(&pxCurrentTCBs[coreID_f], ?gCurrentTCB) &*&
integer_(&xYieldPendings[coreID_f], sizeof(BaseType_t), true, _) integer_(&xYieldPendings[coreID_f], sizeof(BaseType_t), true, _)
// coreLocalSeg_TCB_p(gCurrentTCB, 0)
// &*&
// read access to current task's stack pointer, etc
// prvSeg_TCB_p(gCurrentTCB, ulFreeBytesOnStack)
&*& &*&
// additional knowledge // additional knowledge
(xTaskScheduled == 0 (xTaskScheduled == 0
? (0 <= uxCurrentPriority &*& uxCurrentPriority <= gTopReadyPriority &*& ? (0 <= uxCurrentPriority &*& uxCurrentPriority <= gTopReadyPriority &*&
gTopReadyPriority < configMAX_PRIORITIES gTopReadyPriority < configMAX_PRIORITIES
// 0 <= uxCurrentPriority &*& uxCurrentPriority < configMAX_PRIORITIES
) : true ) : true
); );
@*/ @*/
@ -1078,10 +1073,6 @@ static void prvYieldForTask( TCB_t * pxTCB,
foreach(gTasks, readOnly_sharedSeg_TCB_IF_not_running_p(gTasks, gStates)) foreach(gTasks, readOnly_sharedSeg_TCB_IF_not_running_p(gTasks, gStates))
&*& &*&
subset(gOwners, gTasks) == true &*& subset(gOwners, gTasks) == true &*&
(uxCurrentPriority == 0
? length(gCells) == configNUM_CORES
: true
) &*&
List_array_p(&pxReadyTasksLists, uxCurrentPriority, gPrefCellLists, List_array_p(&pxReadyTasksLists, uxCurrentPriority, gPrefCellLists,
gPrefOwnerLists) &*& gPrefOwnerLists) &*&
List_array_p(&pxReadyTasksLists + uxCurrentPriority + 1, List_array_p(&pxReadyTasksLists + uxCurrentPriority + 1,

9
verification/verifast/proof/ready_list_predicates.h
View file

@ -15,10 +15,7 @@ predicate readyLists_p(list<list<struct xLIST_ITEM*> > gCellLists,
configMAX_PRIORITIES == length(gCellLists) &*& configMAX_PRIORITIES == length(gCellLists) &*&
List_array_p(&pxReadyTasksLists, configMAX_PRIORITIES, List_array_p(&pxReadyTasksLists, configMAX_PRIORITIES,
gCellLists, gOwnerLists) &*& gCellLists, gOwnerLists) &*&
length(gCellLists) == length(gOwnerLists) &*& length(gCellLists) == length(gOwnerLists);
// List of priority 0 always contains the idle task and the end marker
// nothing else
length( nth(0, gCellLists) ) == configNUM_CORES;
predicate List_array_p(List_t* array, int size, predicate List_array_p(List_t* array, int size,
@ -139,7 +136,6 @@ lemma void closeUnchanged_readyLists(list<list<struct xLIST_ITEM*> > cellLists,
requires requires
configMAX_PRIORITIES == length(cellLists) &*& configMAX_PRIORITIES == length(cellLists) &*&
configMAX_PRIORITIES == length(ownerLists) &*& configMAX_PRIORITIES == length(ownerLists) &*&
length( nth(0, cellLists) ) == configNUM_CORES &*&
List_array_p(&pxReadyTasksLists, ?gIndex, ?gPrefCellLists, ?gPrefOwnerLists) &*& List_array_p(&pxReadyTasksLists, ?gIndex, ?gPrefCellLists, ?gPrefOwnerLists) &*&
gIndex < length(cellLists) &*& gIndex < length(cellLists) &*&
xLIST(&pxReadyTasksLists + gIndex, ?gLen, _, _, ?gCells, ?gVals, ?gOwners) &*& xLIST(&pxReadyTasksLists + gIndex, ?gLen, _, _, ?gCells, ?gVals, ?gOwners) &*&
@ -181,7 +177,6 @@ lemma void closeReordered_readyLists(list<list<struct xLIST_ITEM*> > cellLists,
requires requires
configMAX_PRIORITIES == length(cellLists) &*& configMAX_PRIORITIES == length(cellLists) &*&
configMAX_PRIORITIES == length(ownerLists) &*& configMAX_PRIORITIES == length(ownerLists) &*&
length( nth(0, cellLists) ) == configNUM_CORES &*&
List_array_p(&pxReadyTasksLists, ?gIndex, ?gPrefCellLists, ?gPrefOwnerLists) &*& List_array_p(&pxReadyTasksLists, ?gIndex, ?gPrefCellLists, ?gPrefOwnerLists) &*&
gIndex < length(cellLists) &*& gIndex < length(cellLists) &*&
xLIST(&pxReadyTasksLists + gIndex, ?gLen, _, _, reorderedCells, _, reorderedOwners) &*& xLIST(&pxReadyTasksLists + gIndex, ?gLen, _, _, reorderedCells, _, reorderedOwners) &*&
@ -220,7 +215,6 @@ ensures
assert( nth(0, gPrefCellLists) == nth(0, cellLists) ); assert( nth(0, gPrefCellLists) == nth(0, cellLists) );
} }
assert( length(nth(0, gReorderedCellLists)) == length(nth(0, cellLists)) ); assert( length(nth(0, gReorderedCellLists)) == length(nth(0, cellLists)) );
assert( length(nth(0, gReorderedCellLists)) == configNUM_CORES );
close readyLists_p(gReorderedCellLists, gReorderedOwnerLists); close readyLists_p(gReorderedCellLists, gReorderedOwnerLists);
@ -256,7 +250,6 @@ void VF_reordeReadyList(List_t* pxReadyList, ListItem_t * pxTaskItem)
&*& &*&
length(gCellLists) == configMAX_PRIORITIES &*& length(gCellLists) == configMAX_PRIORITIES &*&
length(gOwnerLists) == configMAX_PRIORITIES &*& length(gOwnerLists) == configMAX_PRIORITIES &*&
length(nth(0, gCellLists)) == configNUM_CORES &*&
0 <= gOffset &*& gOffset < length(gCellLists) 0 <= gOffset &*& gOffset < length(gCellLists)
&*& &*&
// current ready list // current ready list