3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-26 18:01:35 +01:00
Code Issues Releases Wiki Activity

Merge pull request #425 from farrrb/fix-ti-c55-sizeof

Browse Source 
TI C55x compatibility patches - removal of sizeof operator from the interfaces
This commit is contained in:
Mark VanderVoord
2019-07-05 15:41:41 -04:00
committed by GitHub
parent 6b2eb52468 2b250055bc
commit bc72eeb211
4 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/unity.c
View File

@@ -1272,8 +1272,10 @@ void UnityAssertNumbersArrayWithin(const UNITY_UINT delta,
{
UNITY_UINT32 elements = num_elements;
unsigned int length = style & 0xF;
unsigned int increment = 0;
RETURN_IF_FAIL_OR_IGNORE;
if (num_elements == 0)
{
UnityPrintPointlessAndBail();
@@ -1299,20 +1301,28 @@ void UnityAssertNumbersArrayWithin(const UNITY_UINT delta,
case 1:
expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)expected;
actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)actual;
increment = sizeof(UNITY_INT8);
break;
case 2:
expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)expected;
actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)actual;
increment = sizeof(UNITY_INT16);
break;
#ifdef UNITY_SUPPORT_64
case 8:
expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT64*)expected;
actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT64*)actual;
increment = sizeof(UNITY_INT64);
break;
#endif
default: /* length 4 bytes */
default: /* default is length 4 bytes */
case 4:
expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)expected;
actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)actual;
increment = sizeof(UNITY_INT32);
length = 4;
break;
}
@@ -1342,7 +1352,7 @@ void UnityAssertNumbersArrayWithin(const UNITY_UINT delta,
if (Unity.CurrentTestFailed)
{
if ((style & UNITY_DISPLAY_RANGE_UINT) && (length < sizeof(expect_val)))
if ((style & UNITY_DISPLAY_RANGE_UINT) && (length < (UNITY_INT_WIDTH / 8)))
{ /* For UINT, remove sign extension (padding 1's) from signed type casts above */
UNITY_INT mask = 1;
mask = (mask << 8 * length) - 1;
@@ -1361,13 +1371,13 @@ void UnityAssertNumbersArrayWithin(const UNITY_UINT delta,
UnityAddMsgIfSpecified(msg);
UNITY_FAIL_AND_BAIL;
}
/* Walk through array by incrementing the pointers */
if (flags == UNITY_ARRAY_TO_ARRAY)
{
expected = (UNITY_INTERNAL_PTR)(length + (const char*)expected);
expected = (UNITY_INTERNAL_PTR)((const char*)expected + increment);
}
actual = (UNITY_INTERNAL_PTR)(length + (const char*)actual);
actual = (UNITY_INTERNAL_PTR)((const char*)actual + increment);
}
}
/*-----------------------------------------------*/