Simplified invariants.

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

View file

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