len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-10-15 09:17:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix CBMC patches. (#471)

Browse source 
* Fix CBMC patches.
This commit is contained in:
Carl Lundin 2020-12-12 21:00:03 -08:00 • committed by GitHub
parent 2e0de9aa70
commit cf39a90d6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
FreeRTOS/Test/CBMC/patches/0005-remove-static-from-prvCopyDataToQueue.patch
View file

@ -1,8 +1,8 @@
diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index edd08b26e..8fa137c9b 100644 index d2e27e55a..4b05e3c01 100644
--- a/FreeRTOS/Source/queue.c --- a/FreeRTOS/Source/queue.c
+++ b/FreeRTOS/Source/queue.c +++ b/FreeRTOS/Source/queue.c
@@ -191,7 +191,7 @@ static BaseType_t prvIsQueueFull( const Queue_t * pxQueue ) PRIVILEGED_FUNCTION; @@ -191,14 +191,14 @@ static BaseType_t prvIsQueueFull( const Queue_t * pxQueue ) PRIVILEGED_FUNCTION;
* Copies an item into the queue, either at the front of the queue or the * Copies an item into the queue, either at the front of the queue or the
* back of the queue. * back of the queue.
*/ */
@ -11,12 +11,11 @@ index edd08b26e..8fa137c9b 100644
const void * pvItemToQueue, const void * pvItemToQueue,
const BaseType_t xPosition ) PRIVILEGED_FUNCTION; const BaseType_t xPosition ) PRIVILEGED_FUNCTION;
@@ -2120,7 +2120,7 @@ void vQueueDelete( QueueHandle_t xQueue ) /*
#endif /* configUSE_MUTEXES */ * Copies an item out of a queue.
/*-----------------------------------------------------------*/ */
-static void prvCopyDataFromQueue( Queue_t * const pxQueue,
+void prvCopyDataFromQueue( Queue_t * const pxQueue,
void * const pvBuffer ) PRIVILEGED_FUNCTION;
-static BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue, #if ( configUSE_QUEUE_SETS == 1 )
+BaseType_t prvCopyDataToQueue( Queue_t * const pxQueue,
const void * pvItemToQueue,
const BaseType_t xPosition )
{

6
FreeRTOS/Test/CBMC/patches/0009-Remove-overflow-asserts-from-xQueueGenericCreate.patch
View file

@ -1,5 +1,5 @@
diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index b01dfd11f..b219b599a 100644 index d2e27e55a..4dd164da6 100644
--- a/FreeRTOS/Source/queue.c --- a/FreeRTOS/Source/queue.c
+++ b/FreeRTOS/Source/queue.c +++ b/FreeRTOS/Source/queue.c
@@ -395,7 +395,7 @@ BaseType_t xQueueGenericReset( QueueHandle_t xQueue, @@ -395,7 +395,7 @@ BaseType_t xQueueGenericReset( QueueHandle_t xQueue,
@ -9,5 +9,5 @@ index b01dfd11f..b219b599a 100644
- configASSERT( ( uxItemSize == 0 ) || ( uxQueueLength == ( xQueueSizeInBytes / uxItemSize ) ) ); - configASSERT( ( uxItemSize == 0 ) || ( uxQueueLength == ( xQueueSizeInBytes / uxItemSize ) ) );
+ /* configASSERT( ( uxItemSize == 0 ) || ( uxQueueLength == ( xQueueSizeInBytes / uxItemSize ) ) ); */ + /* configASSERT( ( uxItemSize == 0 ) || ( uxQueueLength == ( xQueueSizeInBytes / uxItemSize ) ) ); */
/* Check for addition overflow. */ /* Allocate the queue and storage area. Justification for MISRA
configASSERT( ( sizeof( Queue_t ) + xQueueSizeInBytes ) > xQueueSizeInBytes ); * deviation as follows: pvPortMalloc() always ensures returned memory

11
FreeRTOS/Test/CBMC/proofs/Task/TaskResumeAll/Configurations.json
View file

@ -17,8 +17,6 @@
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
# #
@ -30,15 +28,6 @@
"ENTRY": "TaskResumeAll", "ENTRY": "TaskResumeAll",
"DEF": "DEF":
[ [
{ "default":
[
"FREERTOS_MODULE_TEST",
"PENDED_TICKS=1",
"'mtCOVERAGE_TEST_MARKER()=__CPROVER_assert(1, \"Coverage marker\")'",
"configUSE_TRACE_FACILITY=0",
"configGENERATE_RUN_TIME_STATS=0"
]
},
{ "useTickHook1": { "useTickHook1":
[ [
"FREERTOS_MODULE_TEST", "FREERTOS_MODULE_TEST",