From bda7fbcc2f7e14aedfbfa7c776ad5fe3058ab00d Mon Sep 17 00:00:00 2001 From: vanjeff Date: Thu, 20 Jul 2006 02:48:06 +0000 Subject: [PATCH] 1.Added EFIAPI for some assembly functions declare 2.Modified some functions header git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1052 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Library/BaseLib/BaseLibInternals.h | 31 ++++++++-------- MdePkg/Library/BaseLib/Ebc/SwitchStack.c | 1 + .../Library/BaseLib/Ia32/DivS64x64Remainder.c | 2 +- .../BaseLib/Ia32/InternalSwitchStack.c | 1 + MdePkg/Library/BaseLib/LinkedList.c | 35 +++++++++---------- MdePkg/Library/BaseLib/Math64.c | 34 ++++++++++-------- 6 files changed, 56 insertions(+), 48 deletions(-) diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h b/MdePkg/Library/BaseLib/BaseLibInternals.h index 3a4ff07f06..e9caef3e58 100644 --- a/MdePkg/Library/BaseLib/BaseLibInternals.h +++ b/MdePkg/Library/BaseLib/BaseLibInternals.h @@ -22,7 +22,7 @@ // /** - Worker functons that shifts a 64-bit integer left between 0 and 63 bits. The low bits + Shifts a 64-bit integer left between 0 and 63 bits. The low bits are filled with zeros. The shifted value is returned. This function shifts the 64-bit value Operand to the left by Count bits. The @@ -42,7 +42,7 @@ InternalMathLShiftU64 ( ); /** - Worker functon that shifts a 64-bit integer right between 0 and 63 bits. This high bits + Shifts a 64-bit integer right between 0 and 63 bits. This high bits are filled with zeros. The shifted value is returned. This function shifts the 64-bit value Operand to the right by Count bits. The @@ -62,7 +62,7 @@ InternalMathRShiftU64 ( ); /** - Worker function that shifts a 64-bit integer right between 0 and 63 bits. The high bits + Shifts a 64-bit integer right between 0 and 63 bits. The high bits are filled with original integer's bit 63. The shifted value is returned. This function shifts the 64-bit value Operand to the right by Count bits. The @@ -82,7 +82,7 @@ InternalMathARShiftU64 ( ); /** - Worker function that rotates a 64-bit integer left between 0 and 63 bits, filling + Rotates a 64-bit integer left between 0 and 63 bits, filling the low bits with the high bits that were rotated. This function rotates the 64-bit value Operand to the left by Count bits. The @@ -103,7 +103,7 @@ InternalMathLRotU64 ( ); /** - Worker function that rotates a 64-bit integer right between 0 and 63 bits, filling + Rotates a 64-bit integer right between 0 and 63 bits, filling the high bits with the high low bits that were rotated. This function rotates the 64-bit value Operand to the right by Count bits. @@ -124,7 +124,7 @@ InternalMathRRotU64 ( ); /** - Worker function that switches the endianess of a 64-bit integer. + Switches the endianess of a 64-bit integer. This function swaps the bytes in a 64-bit unsigned value to switch the value from little endian to big endian or vice versa. The byte swapped value is @@ -142,7 +142,7 @@ InternalMathSwapBytes64 ( ); /** - Worker function that multiples a 64-bit unsigned integer by a 32-bit unsigned integer + Multiples a 64-bit unsigned integer by a 32-bit unsigned integer and generates a 64-bit unsigned result. This function multiples the 64-bit unsigned value Multiplicand by the 32-bit @@ -163,7 +163,7 @@ InternalMathMultU64x32 ( ); /** - Worker function that multiples a 64-bit unsigned integer by a 64-bit unsigned integer + Multiples a 64-bit unsigned integer by a 64-bit unsigned integer and generates a 64-bit unsigned result. This function multiples the 64-bit unsigned value Multiplicand by the 64-bit @@ -184,9 +184,9 @@ InternalMathMultU64x64 ( ); /** - Worker function that divides a 64-bit unsigned integer by a 32-bit unsigned integer and + Divides a 64-bit unsigned integer by a 32-bit unsigned integer and generates a 64-bit unsigned result. - + This function divides the 64-bit unsigned value Dividend by the 32-bit unsigned value Divisor and generates a 64-bit unsigned quotient. This function returns the 64-bit unsigned quotient. @@ -205,7 +205,7 @@ InternalMathDivU64x32 ( ); /** - Worker function that divides a 64-bit unsigned integer by a 32-bit unsigned integer and + Divides a 64-bit unsigned integer by a 32-bit unsigned integer and generates a 32-bit unsigned remainder. This function divides the 64-bit unsigned value Dividend by the 32-bit @@ -226,7 +226,7 @@ InternalMathModU64x32 ( ); /** - Worker function that divides a 64-bit unsigned integer by a 32-bit unsigned integer and + Divides a 64-bit unsigned integer by a 32-bit unsigned integer and generates a 64-bit unsigned result and an optional 32-bit unsigned remainder. This function divides the 64-bit unsigned value Dividend by the 32-bit @@ -251,7 +251,7 @@ InternalMathDivRemU64x32 ( ); /** - Worker function that divides a 64-bit unsigned integer by a 64-bit unsigned integer and + Divides a 64-bit unsigned integer by a 64-bit unsigned integer and generates a 64-bit unsigned result and an optional 64-bit unsigned remainder. This function divides the 64-bit unsigned value Dividend by the 64-bit @@ -276,7 +276,7 @@ InternalMathDivRemU64x64 ( ); /** - Worker function that divides a 64-bit signed integer by a 64-bit signed integer and + Divides a 64-bit signed integer by a 64-bit signed integer and generates a 64-bit signed result and a optional 64-bit signed remainder. This function divides the 64-bit unsigned value Dividend by the 64-bit @@ -297,7 +297,7 @@ InternalMathDivRemS64x64 ( IN INT64 Dividend, IN INT64 Divisor, OUT INT64 *Remainder OPTIONAL - ); + ); /** Transfers control to a function starting with a new stack. @@ -317,6 +317,7 @@ InternalMathDivRemS64x64 ( **/ VOID +EFIAPI InternalSwitchStack ( IN SWITCH_STACK_ENTRY_POINT EntryPoint, IN VOID *Context1, diff --git a/MdePkg/Library/BaseLib/Ebc/SwitchStack.c b/MdePkg/Library/BaseLib/Ebc/SwitchStack.c index 0a5464b2f9..8fadd4f384 100644 --- a/MdePkg/Library/BaseLib/Ebc/SwitchStack.c +++ b/MdePkg/Library/BaseLib/Ebc/SwitchStack.c @@ -35,6 +35,7 @@ **/ VOID +EFIAPI InternalSwitchStack ( IN SWITCH_STACK_ENTRY_POINT EntryPoint, IN VOID *Context1, OPTIONAL diff --git a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c index a5183429c1..1dfac5d317 100644 --- a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c +++ b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c @@ -17,7 +17,7 @@ #include "../BaseLibInternals.h" /** - Worker function that Divides a 64-bit signed integer by a 64-bit signed integer and + Worker function that Divides a 64-bit signed integer by a 64-bit signed integer and generates a 64-bit signed result and a optional 64-bit signed remainder. This function divides the 64-bit unsigned value Dividend by the 64-bit diff --git a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c index 484313ea67..ab8116b4b5 100644 --- a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c +++ b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c @@ -32,6 +32,7 @@ **/ VOID +EFIAPI InternalSwitchStack ( IN SWITCH_STACK_ENTRY_POINT EntryPoint, IN VOID *Context1, diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c index 6c083ef95c..9347a2b579 100644 --- a/MdePkg/Library/BaseLib/LinkedList.c +++ b/MdePkg/Library/BaseLib/LinkedList.c @@ -15,9 +15,9 @@ **/ /** - Worker function that locates the Node in the List + Worker function that locates the Node in the List - By searching the List, finds the location of the Node in List. At the same time, + By searching the List, finds the location of the Node in List. At the same time, verifies the validity of this list. If List is NULL, then ASSERT(). @@ -25,18 +25,17 @@ If List->backLink is NULL, then ASSERT(). If Node is NULL, then ASSERT(); If PcdMaximumLinkedListLenth is not zero, and prior to insertion the number - of nodes in ListHead, including the ListHead node, is greater than or + of nodes in ListHead, including the ListHead node, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). @param List A pointer to a node in a linked list. @param Node A pointer to one nod. @retval TRUE Node is in List - @retval FALSE Node isn't in List, or List is invalid + @retval FALSE Node isn't in List, or List is invalid **/ BOOLEAN -EFIAPI IsNodeInList ( IN CONST LIST_ENTRY *List, IN CONST LIST_ENTRY *Node @@ -115,7 +114,7 @@ InitializeListHead ( If Entry is NULL, then ASSERT(). If ListHead was not initialized with InitializeListHead(), then ASSERT(). If PcdMaximumLinkedListLenth is not zero, and prior to insertion the number - of nodes in ListHead, including the ListHead node, is greater than or + of nodes in ListHead, including the ListHead node, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). @param ListHead A pointer to the head node of a doubly linked list. @@ -155,7 +154,7 @@ InsertHeadList ( If Entry is NULL, then ASSERT(). If ListHead was not initialized with InitializeListHead(), then ASSERT(). If PcdMaximumLinkedListLenth is not zero, and prior to insertion the number - of nodes in ListHead, including the ListHead node, is greater than or + of nodes in ListHead, including the ListHead node, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). @param ListHead A pointer to the head node of a doubly linked list. @@ -193,8 +192,8 @@ InsertTailList ( If List is NULL, then ASSERT(). If List was not initialized with InitializeListHead(), then ASSERT(). - If PcdMaximumLinkedListLenth is not zero, and the number of nodes - in List, including the List node, is greater than or equal to + If PcdMaximumLinkedListLenth is not zero, and the number of nodes + in List, including the List node, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). @param List A pointer to the head node of a doubly linked list. @@ -261,8 +260,8 @@ GetNextNode ( If ListHead is NULL, then ASSERT(). If ListHead was not initialized with InitializeListHead(), then ASSERT(). - If PcdMaximumLinkedListLenth is not zero, and the number of nodes - in List, including the List node, is greater than or equal to + If PcdMaximumLinkedListLenth is not zero, and the number of nodes + in List, including the List node, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). @param ListHead A pointer to the head node of a doubly linked list. @@ -295,8 +294,8 @@ IsListEmpty ( If List is NULL, then ASSERT(). If Node is NULL, then ASSERT(). If List was not initialized with InitializeListHead(), then ASSERT(). - If PcdMaximumLinkedListLenth is not zero, and the number of nodes - in List, including the List node, is greater than or equal to + If PcdMaximumLinkedListLenth is not zero, and the number of nodes + in List, including the List node, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). If Node is not a node in List and Node is not equal to List, then ASSERT(). @@ -332,8 +331,8 @@ IsNull ( If List is NULL, then ASSERT(). If Node is NULL, then ASSERT(). If List was not initialized with InitializeListHead(), then ASSERT(). - If PcdMaximumLinkedListLenth is not zero, and the number of nodes - in List, including the List node, is greater than or equal to + If PcdMaximumLinkedListLenth is not zero, and the number of nodes + in List, including the List node, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). If Node is not a node in List, then ASSERT(). @@ -375,7 +374,7 @@ IsNodeAtEnd ( If SecondEntry and FirstEntry are not in the same linked list, then ASSERT(). If PcdMaximumLinkedListLength is not zero, and the number of nodes in the linked list containing the FirstEntry and SecondEntry nodes, including - the FirstEntry and SecondEntry nodes, is greater than or equal to + the FirstEntry and SecondEntry nodes, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). @param FirstEntry A pointer to a node in a linked list. @@ -441,8 +440,8 @@ SwapListEntries ( If Entry is NULL, then ASSERT(). If Entry is the head node of an empty list, then ASSERT(). - If PcdMaximumLinkedListLength is not zero, and the number of nodes in the - linked list containing Entry, including the Entry node, is greater than + If PcdMaximumLinkedListLength is not zero, and the number of nodes in the + linked list containing Entry, including the Entry node, is greater than or equal to PcdMaximumLinkedListLength, then ASSERT(). @param Entry A pointer to a node in a linked list diff --git a/MdePkg/Library/BaseLib/Math64.c b/MdePkg/Library/BaseLib/Math64.c index a8756967be..3312d789ac 100644 --- a/MdePkg/Library/BaseLib/Math64.c +++ b/MdePkg/Library/BaseLib/Math64.c @@ -15,8 +15,10 @@ **/ +#include "BaseLibInternals.h" + /** - Worker functons that shifts a 64-bit integer left between 0 and 63 bits. The low bits + Shifts a 64-bit integer left between 0 and 63 bits. The low bits are filled with zeros. The shifted value is returned. This function shifts the 64-bit value Operand to the left by Count bits. The @@ -29,6 +31,7 @@ **/ UINT64 +EFIAPI InternalMathLShiftU64 ( IN UINT64 Operand, IN UINTN Count @@ -38,7 +41,7 @@ InternalMathLShiftU64 ( } /** - Worker functon that shifts a 64-bit integer right between 0 and 63 bits. This high bits + Shifts a 64-bit integer right between 0 and 63 bits. This high bits are filled with zeros. The shifted value is returned. This function shifts the 64-bit value Operand to the right by Count bits. The @@ -61,7 +64,7 @@ InternalMathRShiftU64 ( } /** - Worker function that shifts a 64-bit integer right between 0 and 63 bits. The high bits + Shifts a 64-bit integer right between 0 and 63 bits. The high bits are filled with original integer's bit 63. The shifted value is returned. This function shifts the 64-bit value Operand to the right by Count bits. The @@ -101,7 +104,7 @@ InternalMathARShiftU64 ( /** - Worker function that rotates a 64-bit integer left between 0 and 63 bits, filling + Rotates a 64-bit integer left between 0 and 63 bits, filling the low bits with the high bits that were rotated. This function rotates the 64-bit value Operand to the left by Count bits. The @@ -125,7 +128,7 @@ InternalMathLRotU64 ( } /** - Worker function that rotates a 64-bit integer right between 0 and 63 bits, filling + Rotates a 64-bit integer right between 0 and 63 bits, filling the high bits with the high low bits that were rotated. This function rotates the 64-bit value Operand to the right by Count bits. @@ -149,7 +152,7 @@ InternalMathRRotU64 ( } /** - Worker function that switches the endianess of a 64-bit integer. + Switches the endianess of a 64-bit integer. This function swaps the bytes in a 64-bit unsigned value to switch the value from little endian to big endian or vice versa. The byte swapped value is @@ -173,7 +176,7 @@ InternalMathSwapBytes64 ( } /** - Worker function that multiples a 64-bit unsigned integer by a 32-bit unsigned integer + Multiples a 64-bit unsigned integer by a 32-bit unsigned integer and generates a 64-bit unsigned result. This function multiples the 64-bit unsigned value Multiplicand by the 32-bit @@ -198,7 +201,7 @@ InternalMathMultU64x32 ( /** - Worker function that multiples a 64-bit unsigned integer by a 64-bit unsigned integer + Multiples a 64-bit unsigned integer by a 64-bit unsigned integer and generates a 64-bit unsigned result. This function multiples the 64-bit unsigned value Multiplicand by the 64-bit @@ -222,9 +225,9 @@ InternalMathMultU64x64 ( } /** - Worker function that divides a 64-bit unsigned integer by a 32-bit unsigned integer and + Divides a 64-bit unsigned integer by a 32-bit unsigned integer and generates a 64-bit unsigned result. - + This function divides the 64-bit unsigned value Dividend by the 32-bit unsigned value Divisor and generates a 64-bit unsigned quotient. This function returns the 64-bit unsigned quotient. @@ -246,7 +249,7 @@ InternalMathDivU64x32 ( } /** - Worker function that divides a 64-bit unsigned integer by a 32-bit unsigned integer + Divides a 64-bit unsigned integer by a 32-bit unsigned integer and generates a 32-bit unsigned remainder. This function divides the 64-bit unsigned value Dividend by the 32-bit @@ -260,6 +263,7 @@ InternalMathDivU64x32 ( **/ UINT32 +EFIAPI InternalMathModU64x32 ( IN UINT64 Dividend, IN UINT32 Divisor @@ -269,7 +273,7 @@ InternalMathModU64x32 ( } /** - Worker function that divides a 64-bit unsigned integer by a 32-bit unsigned integer and + Divides a 64-bit unsigned integer by a 32-bit unsigned integer and generates a 64-bit unsigned result and an optional 32-bit unsigned remainder. This function divides the 64-bit unsigned value Dividend by the 32-bit @@ -286,6 +290,7 @@ InternalMathModU64x32 ( **/ UINT64 +EFIAPI InternalMathDivRemU64x32 ( IN UINT64 Dividend, IN UINT32 Divisor, @@ -299,7 +304,7 @@ InternalMathDivRemU64x32 ( } /** - Worker function that divides a 64-bit unsigned integer by a 64-bit unsigned integer and + Divides a 64-bit unsigned integer by a 64-bit unsigned integer and generates a 64-bit unsigned result and an optional 64-bit unsigned remainder. This function divides the 64-bit unsigned value Dividend by the 64-bit @@ -316,6 +321,7 @@ InternalMathDivRemU64x32 ( **/ UINT64 +EFIAPI InternalMathDivRemU64x64 ( IN UINT64 Dividend, IN UINT64 Divisor, @@ -329,7 +335,7 @@ InternalMathDivRemU64x64 ( } /** - Worker function that divides a 64-bit signed integer by a 64-bit signed integer and + Divides a 64-bit signed integer by a 64-bit signed integer and generates a 64-bit signed result and a optional 64-bit signed remainder. This function divides the 64-bit unsigned value Dividend by the 64-bit -- 2.39.2