Date
1 - 2 of 2
[PATCH v6 2/3] CryptoPkg/CryptLib: Add QuickSort function on BaseLib
|
From: IanX Kuo <ianx.kuo@...>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3675 Use QuickSort instead of QuickSortWorker Cc: Ray Ni <ray.ni@...> Cc: Jiewen Yao <jiewen.yao@...> Cc: Jian J Wang <jian.j.wang@...> Cc: Xiaoyu Lu <xiaoyux.lu@...> Cc: Guomin Jiang <guomin.jiang@...> Signed-off-by: IanX Kuo <ianx.kuo@...> --- .../Library/BaseCryptLib/SysCall/CrtWrapper.c | 92 +------------------ 1 file changed, 2 insertions(+), 90 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPk= g/Library/BaseCryptLib/SysCall/CrtWrapper.c index 42235ab96a..b10edaae5b 100644 --- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c @@ -2,7 +2,7 @@ C Run-Time Libraries (CRT) Wrapper Implementation for OpenSSL-based=0D Cryptographic Library.=0D =0D -Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>=0D +Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -22,91 +22,6 @@ int IN VOID *Buffer2=0D );=0D =0D -//=0D -// Duplicated from EDKII BaseSortLib for qsort() wrapper=0D -//=0D -STATIC=0D -VOID=0D -QuickSortWorker (=0D - IN OUT VOID *BufferToSort,=0D - IN CONST UINTN Count,=0D - IN CONST UINTN ElementSize,=0D - IN SORT_COMPARE CompareFunction,=0D - IN VOID *Buffer=0D - )=0D -{=0D - VOID *Pivot;=0D - UINTN LoopCount;=0D - UINTN NextSwapLocation;=0D -=0D - ASSERT(BufferToSort !=3D NULL);=0D - ASSERT(CompareFunction !=3D NULL);=0D - ASSERT(Buffer !=3D NULL);=0D -=0D - if (Count < 2 || ElementSize < 1) {=0D - return;=0D - }=0D -=0D - NextSwapLocation =3D 0;=0D -=0D - //=0D - // Pick a pivot (we choose last element)=0D - //=0D - Pivot =3D ((UINT8 *)BufferToSort + ((Count - 1) * ElementSize));=0D -=0D - //=0D - // Now get the pivot such that all on "left" are below it=0D - // and everything "right" are above it=0D - //=0D - for (LoopCount =3D 0; LoopCount < Count - 1; LoopCount++)=0D - {=0D - //=0D - // If the element is less than the pivot=0D - //=0D - if (CompareFunction ((VOID *)((UINT8 *)BufferToSort + ((LoopCount) * E= lementSize)), Pivot) <=3D 0) {=0D - //=0D - // Swap=0D - //=0D - CopyMem (Buffer, (UINT8 *)BufferToSort + (NextSwapLocation * Element= Size), ElementSize);=0D - CopyMem ((UINT8 *)BufferToSort + (NextSwapLocation * ElementSize), (= UINT8 *)BufferToSort + ((LoopCount) * ElementSize), ElementSize);=0D - CopyMem ((UINT8 *)BufferToSort + ((LoopCount) * ElementSize), Buffer= , ElementSize);=0D -=0D - //=0D - // Increment NextSwapLocation=0D - //=0D - NextSwapLocation++;=0D - }=0D - }=0D - //=0D - // Swap pivot to its final position (NextSwapLocation)=0D - //=0D - CopyMem (Buffer, Pivot, ElementSize);=0D - CopyMem (Pivot, (UINT8 *)BufferToSort + (NextSwapLocation * ElementSize)= , ElementSize);=0D - CopyMem ((UINT8 *)BufferToSort + (NextSwapLocation * ElementSize), Buffe= r, ElementSize);=0D -=0D - //=0D - // Now recurse on 2 partial lists. Neither of these will have the 'pivo= t' element.=0D - // IE list is sorted left half, pivot element, sorted right half...=0D - //=0D - QuickSortWorker (=0D - BufferToSort,=0D - NextSwapLocation,=0D - ElementSize,=0D - CompareFunction,=0D - Buffer=0D - );=0D -=0D - QuickSortWorker (=0D - (UINT8 *)BufferToSort + (NextSwapLocation + 1) * ElementSize,=0D - Count - NextSwapLocation - 1,=0D - ElementSize,=0D - CompareFunction,=0D - Buffer=0D - );=0D -=0D - return;=0D -}=0D -=0D //---------------------------------------------------------=0D // Standard C Run-time Library Interface Wrapper=0D //---------------------------------------------------------=0D @@ -337,10 +252,7 @@ void qsort (void *base, size_t num, size_t width, int = (*compare)(const void *, c Buffer =3D malloc (width);=0D ASSERT (Buffer !=3D NULL);=0D =0D - //=0D - // Re-use PerformQuickSort() function Implementation in EDKII BaseSortLi= b.=0D - //=0D - QuickSortWorker (base, (UINTN)num, (UINTN)width, (SORT_COMPARE)compare, = Buffer);=0D + QuickSort (base, (UINTN)num, (UINTN)width, (BASE_SORT_COMPARE)compare, B= uffer);=0D =0D free (Buffer);=0D return;=0D --=20 2.30.0.windows.1 |
|
|
|
Guomin Jiang
Reviewed-by: Guomin Jiang <guomin.jiang@...>
toggle quoted message
Show quoted text
-----Original Message----- |
|
|