espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-20 22:13:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

- replacing non-universal method of masking word sizes

Browse Source 
git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@123 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
mvandervoord
2011-03-04 19:01:27 +00:00
parent 98c3df2970
commit 3ef64ee047
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/unity.c
View File

@ -28,6 +28,20 @@ const char* UnityStrPointless= " You Asked Me To Compare Nothing, Which Was Poin
const char* UnityStrNullPointerForExpected= " Expected pointer to be NULL"; const char* UnityStrNullPointerForExpected= " Expected pointer to be NULL";
const char* UnityStrNullPointerForActual = " Actual pointer was NULL"; const char* UnityStrNullPointerForActual = " Actual pointer was NULL";
const _U_UINT UnitySizeMask[] =
{
255,
65535,
65535,
4294967295,
4294967295,
4294967295,
4294967295
#ifdef UNITY_SUPPORT_64
,0xFFFFFFFFFFFFFFFF
#endif
};
//----------------------------------------------- //-----------------------------------------------
// Pretty Printers & Test Result Output Handlers // Pretty Printers & Test Result Output Handlers
//----------------------------------------------- //-----------------------------------------------
@ -77,13 +91,12 @@ void UnityPrintNumberByStyle(const _U_SINT number, const UNITY_DISPLAY_STYLE_T s
} }
else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT) else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT)
{ {
UnityPrintNumberUnsigned((_U_UINT)number & ((_U_UINT)1 << ((((int)style & 0x000F) << 3) - 1))); UnityPrintNumberUnsigned( (_U_UINT)number & UnitySizeMask[((_U_UINT)style & (_U_UINT)0x0F) - 1] );
} }
else else
{ {
UnityPrintNumberHex((_U_UINT)number, (style & 0x000F) << 1); UnityPrintNumberHex((_U_UINT)number, (style & 0x000F) << 1);
} }
} }
//----------------------------------------------- //-----------------------------------------------