diff options
| -rw-r--r-- | MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h | 16 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c | 23 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h | 28 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c | 40 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h | 66 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/EbcDxe/EbcExecute.c | 164 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/EbcDxe/EbcExecute.h | 21 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/EbcDxe/EbcInt.c | 48 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/EbcDxe/EbcInt.h | 50 |
11 files changed, 218 insertions, 242 deletions
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h index 5223ae7..f4a3781 100644 --- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h +++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h @@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#ifndef _DISK_IO_H
-#define _DISK_IO_H
+#ifndef _DISK_IO_H_
+#define _DISK_IO_H_
#include <Uefi.h>
#include <Protocol/BlockIo.h>
@@ -69,9 +69,9 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gDiskIoComponentName2; EFI_STATUS
EFIAPI
DiskIoDriverBindingSupported (
- IN EFI_DRIVER_BINDING_PROTOCOL *This,
- IN EFI_HANDLE ControllerHandle,
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,
+ IN EFI_HANDLE ControllerHandle,
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
);
/**
@@ -91,9 +91,9 @@ DiskIoDriverBindingSupported ( EFI_STATUS
EFIAPI
DiskIoDriverBindingStart (
- IN EFI_DRIVER_BINDING_PROTOCOL *This,
- IN EFI_HANDLE ControllerHandle,
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,
+ IN EFI_HANDLE ControllerHandle,
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
);
/**
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c index f208194..ce33050 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c @@ -166,7 +166,7 @@ PartitionInstallElToritoChildHandles ( Check += CheckBuffer[Index];
}
- if (Check & 0xFFFF) {
+ if ((Check & 0xFFFF) != 0) {
DEBUG ((EFI_D_ERROR, "EltCheckBootCatalog: El Torito boot catalog header checksum failed\n"));
continue;
}
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c index ef3c766..6d3abae 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c @@ -79,7 +79,7 @@ PartitionRestoreGptTable ( /**
- Restore Partition Table to its alternate place
+ Restore Partition Table to its alternate place.
(Primary -> Backup or Backup -> Primary)
@param[in] PartHeader Partition table header structure
@@ -97,7 +97,7 @@ PartitionCheckGptEntry ( /**
- Checks the CRC32 value in the table header
+ Checks the CRC32 value in the table header.
@param MaxSize Max Size limit
@param Size The size of the table
@@ -116,7 +116,7 @@ PartitionCheckCrcAltSize ( /**
- Checks the CRC32 value in the table header
+ Checks the CRC32 value in the table header.
@param MaxSize Max Size limit
@param Hdr Table to check
@@ -133,7 +133,7 @@ PartitionCheckCrc ( /**
- Updates the CRC32 value in the table header
+ Updates the CRC32 value in the table header.
@param Size The size of the table
@param Hdr Table to update
@@ -147,7 +147,7 @@ PartitionSetCrcAltSize ( /**
- Updates the CRC32 value in the table header
+ Updates the CRC32 value in the table header.
@param Hdr Table to update
@@ -619,7 +619,7 @@ Done: /**
- Restore Partition Table to its alternate place
+ Restore Partition Table to its alternate place.
(Primary -> Backup or Backup -> Primary)
@param[in] PartHeader Partition table header structure
@@ -681,7 +681,7 @@ PartitionCheckGptEntry ( /**
- Updates the CRC32 value in the table header
+ Updates the CRC32 value in the table header.
@param Hdr Table to update
@@ -696,7 +696,7 @@ PartitionSetCrc ( /**
- Updates the CRC32 value in the table header
+ Updates the CRC32 value in the table header.
@param Size The size of the table
@param Hdr Table to update
@@ -707,7 +707,6 @@ PartitionSetCrcAltSize ( IN UINTN Size,
IN OUT EFI_TABLE_HEADER *Hdr
)
-
{
UINT32 Crc;
@@ -718,7 +717,7 @@ PartitionSetCrcAltSize ( /**
- Checks the CRC32 value in the table header
+ Checks the CRC32 value in the table header.
@param MaxSize Max Size limit
@param Hdr Table to check
@@ -738,7 +737,7 @@ PartitionCheckCrc ( /**
- Checks the CRC32 value in the table header
+ Checks the CRC32 value in the table header.
@param MaxSize Max Size limit
@param Size The size of the table
@@ -768,7 +767,7 @@ PartitionCheckCrcAltSize ( return FALSE;
}
- if (MaxSize && Size > MaxSize) {
+ if ((MaxSize != 0) && (Size > MaxSize)) {
DEBUG ((EFI_D_ERROR, "CheckCrc32: Size > MaxSize\n"));
return FALSE;
}
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c index c95a866..68b389a 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c @@ -93,7 +93,7 @@ PartitionValidMbr ( }
}
//
- // Non of the regions overlapped so MBR is O.K.
+ // None of the regions overlapped so MBR is O.K.
//
return MbrValid;
}
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h index 9d6477c..6dcbd9b 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h @@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#ifndef _PARTITION_H
-#define _PARTITION_H
+#ifndef _PARTITION_H_
+#define _PARTITION_H_
#include <Uefi.h>
#include <Protocol/BlockIo.h>
@@ -150,10 +150,10 @@ PartitionDriverBindingStart ( EFI_STATUS
EFIAPI
PartitionDriverBindingStop (
- IN EFI_DRIVER_BINDING_PROTOCOL *This,
- IN EFI_HANDLE ControllerHandle,
- IN UINTN NumberOfChildren,
- IN EFI_HANDLE *ChildHandleBuffer
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,
+ IN EFI_HANDLE ControllerHandle,
+ IN UINTN NumberOfChildren,
+ IN EFI_HANDLE *ChildHandleBuffer
);
//
@@ -313,12 +313,11 @@ PartitionInstallChildHandle ( IN EFI_BLOCK_IO_PROTOCOL *ParentBlockIo,
IN EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePathNode,
- IN UINT64 Start,
- IN UINT64 End,
+ IN EFI_LBA Start,
+ IN EFI_LBA End,
IN UINT32 BlockSize,
IN BOOLEAN InstallEspGuid
- )
-;
+ );
/**
Install child handles if the Handle supports GPT partition structure.
@@ -341,8 +340,7 @@ PartitionInstallGptChildHandles ( IN EFI_DISK_IO_PROTOCOL *DiskIo,
IN EFI_BLOCK_IO_PROTOCOL *BlockIo,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
- )
-;
+ );
/**
Install child handles if the Handle supports El Torito format.
@@ -366,8 +364,7 @@ PartitionInstallElToritoChildHandles ( IN EFI_DISK_IO_PROTOCOL *DiskIo,
IN EFI_BLOCK_IO_PROTOCOL *BlockIo,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
- )
-;
+ );
/**
Install child handles if the Handle supports MBR format.
@@ -390,8 +387,7 @@ PartitionInstallMbrChildHandles ( IN EFI_DISK_IO_PROTOCOL *DiskIo,
IN EFI_BLOCK_IO_PROTOCOL *BlockIo,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
- )
-;
+ );
typedef
EFI_STATUS
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c index 07bb2f4..67f1db1 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c @@ -122,7 +122,7 @@ InitializeUnicodeCollationEng ( }
}
- for (Index = 0; mOtherChars[Index]; Index++) {
+ for (Index = 0; mOtherChars[Index] != 0; Index++) {
Index2 = mOtherChars[Index];
mEngInfoMap[Index2] |= CHAR_FAT_VALID;
}
@@ -191,8 +191,8 @@ EngStriColl ( IN CHAR16 *Str2
)
{
- while (*Str1) {
- if (ToUpper (*Str1) != ToUpper (*Str2)) {
+ while (*Str1 != 0) {
+ if (TO_UPPER (*Str1) != TO_UPPER (*Str2)) {
break;
}
@@ -200,7 +200,7 @@ EngStriColl ( Str2 += 1;
}
- return ToUpper (*Str1) - ToUpper (*Str2);
+ return TO_UPPER (*Str1) - TO_UPPER (*Str2);
}
@@ -219,8 +219,8 @@ EngStrLwr ( IN OUT CHAR16 *Str
)
{
- while (*Str) {
- *Str = ToLower (*Str);
+ while (*Str != 0) {
+ *Str = TO_LOWER (*Str);
Str += 1;
}
}
@@ -241,8 +241,8 @@ EngStrUpr ( IN OUT CHAR16 *Str
)
{
- while (*Str) {
- *Str = ToUpper (*Str);
+ while (*Str != 0) {
+ *Str = TO_UPPER (*Str);
Str += 1;
}
}
@@ -280,7 +280,7 @@ EngMetaiMatch ( //
// End of pattern. If end of string, TRUE match
//
- if (*String) {
+ if (*String != 0) {
return FALSE;
} else {
return TRUE;
@@ -290,7 +290,7 @@ EngMetaiMatch ( //
// Match zero or more chars
//
- while (*String) {
+ while (*String != 0) {
if (EngMetaiMatch (This, String, Pattern)) {
return TRUE;
}
@@ -304,7 +304,7 @@ EngMetaiMatch ( //
// Match any one char
//
- if (!*String) {
+ if (*String == 0) {
return FALSE;
}
@@ -316,7 +316,7 @@ EngMetaiMatch ( // Match char set
//
CharC = *String;
- if (!CharC) {
+ if (CharC == 0) {
//
// syntax problem
//
@@ -325,7 +325,7 @@ EngMetaiMatch ( Index3 = 0;
CharP = *Pattern++;
- while (CharP) {
+ while (CharP != 0) {
if (CharP == ']') {
return FALSE;
}
@@ -342,7 +342,7 @@ EngMetaiMatch ( return FALSE;
}
- if (ToUpper (CharC) >= ToUpper (Index3) && ToUpper (CharC) <= ToUpper (CharP)) {
+ if (TO_UPPER (CharC) >= TO_UPPER (Index3) && TO_UPPER (CharC) <= TO_UPPER (CharP)) {
//
// if in range, it's a match
//
@@ -351,7 +351,7 @@ EngMetaiMatch ( }
Index3 = CharP;
- if (ToUpper (CharC) == ToUpper (CharP)) {
+ if (TO_UPPER (CharC) == TO_UPPER (CharP)) {
//
// if char matches
//
@@ -363,7 +363,7 @@ EngMetaiMatch ( //
// skip to end of match char set
//
- while (CharP && CharP != ']') {
+ while ((CharP != 0) && (CharP != ']')) {
CharP = *Pattern;
Pattern += 1;
}
@@ -373,7 +373,7 @@ EngMetaiMatch ( default:
CharC = *String;
- if (ToUpper (CharC) != ToUpper (CharP)) {
+ if (TO_UPPER (CharC) != TO_UPPER (CharP)) {
return FALSE;
}
@@ -408,7 +408,7 @@ EngFatToStr ( //
// No DBCS issues, just expand and add null terminate to end of string
//
- while (*Fat && FatSize) {
+ while ((*Fat != 0) && (FatSize != 0)) {
*String = *Fat;
String += 1;
Fat += 1;
@@ -446,7 +446,7 @@ EngStrToFat ( BOOLEAN SpecialCharExist;
SpecialCharExist = FALSE;
- while (*String && FatSize) {
+ while ((*String != 0) && (FatSize != 0)) {
//
// Skip '.' or ' ' when making a fat name
//
@@ -455,7 +455,7 @@ EngStrToFat ( // If this is a valid fat char, move it.
// Otherwise, move a '_' and flag the fact that the name needs an Lfn
//
- if (*String < 0x100 && (mEngInfoMap[*String] & CHAR_FAT_VALID)) {
+ if (*String < 0x100 && ((mEngInfoMap[*String] & CHAR_FAT_VALID) != 0)) {
*Fat = mEngUpperMap[*String];
} else {
*Fat = '_';
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h index 7cab708..85dc593 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#ifndef _UNICODE_COLLATION_ENG_H
-#define _UNICODE_COLLATION_ENG_H
+#ifndef _UNICODE_COLLATION_ENG_H_
+#define _UNICODE_COLLATION_ENG_H_
@@ -32,8 +32,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //
#define CHAR_FAT_VALID 0x01
-#define ToUpper(a) (CHAR16) (a <= 0xFF ? mEngUpperMap[a] : a)
-#define ToLower(a) (CHAR16) (a <= 0xFF ? mEngLowerMap[a] : a)
+#define TO_UPPER(a) (CHAR16) (a <= 0xFF ? mEngUpperMap[a] : a)
+#define TO_LOWER(a) (CHAR16) (a <= 0xFF ? mEngLowerMap[a] : a)
//
// Prototypes
@@ -54,11 +54,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. INTN
EFIAPI
EngStriColl (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *Str1,
- IN CHAR16 *Str2
- )
-;
+ IN EFI_UNICODE_COLLATION_PROTOCOL *This,
+ IN CHAR16 *Str1,
+ IN CHAR16 *Str2
+ );
/**
Performs a case-insensitive comparison of a Null-terminated Unicode
@@ -75,11 +74,10 @@ EngStriColl ( BOOLEAN
EFIAPI
EngMetaiMatch (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *String,
- IN CHAR16 *Pattern
- )
-;
+ IN EFI_UNICODE_COLLATION_PROTOCOL *This,
+ IN CHAR16 *String,
+ IN CHAR16 *Pattern
+ );
/**
Converts all the Unicode characters in a Null-terminated Unicode string to
@@ -92,10 +90,9 @@ EngMetaiMatch ( VOID
EFIAPI
EngStrLwr (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN OUT CHAR16 *Str
- )
-;
+ IN EFI_UNICODE_COLLATION_PROTOCOL *This,
+ IN OUT CHAR16 *Str
+ );
/**
Converts all the Unicode characters in a Null-terminated Unicode string to upper
@@ -108,10 +105,9 @@ EngStrLwr ( VOID
EFIAPI
EngStrUpr (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN OUT CHAR16 *Str
- )
-;
+ IN EFI_UNICODE_COLLATION_PROTOCOL *This,
+ IN OUT CHAR16 *Str
+ );
/**
Converts an 8.3 FAT file name in an OEM character set to a Null-terminated
@@ -128,12 +124,11 @@ EngStrUpr ( VOID
EFIAPI
EngFatToStr (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN UINTN FatSize,
- IN CHAR8 *Fat,
- OUT CHAR16 *String
- )
-;
+ IN EFI_UNICODE_COLLATION_PROTOCOL *This,
+ IN UINTN FatSize,
+ IN CHAR8 *Fat,
+ OUT CHAR16 *String
+ );
/**
Converts a Null-terminated Unicode string to legal characters in a FAT
@@ -153,12 +148,11 @@ EngFatToStr ( BOOLEAN
EFIAPI
EngStrToFat (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *String,
- IN UINTN FatSize,
- OUT CHAR8 *Fat
- )
-;
+ IN EFI_UNICODE_COLLATION_PROTOCOL *This,
+ IN CHAR16 *String,
+ IN UINTN FatSize,
+ OUT CHAR8 *Fat
+ );
/**
The user Entry Point for English module.
@@ -178,7 +172,7 @@ EFIAPI InitializeUnicodeCollationEng (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
- )
-;
+ );
#endif
+
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c index 31ff76d..e4240c9 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c @@ -67,8 +67,8 @@ UINT64 STATIC
INT16
VmReadIndex16 (
- IN VM_CONTEXT *VmPtr,
- IN UINT32 CodeOffset
+ IN VM_CONTEXT *VmPtr,
+ IN UINT32 CodeOffset
);
/**
@@ -84,8 +84,8 @@ VmReadIndex16 ( STATIC
INT32
VmReadIndex32 (
- IN VM_CONTEXT *VmPtr,
- IN UINT32 CodeOffset
+ IN VM_CONTEXT *VmPtr,
+ IN UINT32 CodeOffset
);
/**
@@ -101,8 +101,8 @@ VmReadIndex32 ( STATIC
INT64
VmReadIndex64 (
- IN VM_CONTEXT *VmPtr,
- IN UINT32 CodeOffset
+ IN VM_CONTEXT *VmPtr,
+ IN UINT32 CodeOffset
);
/**
@@ -117,8 +117,8 @@ VmReadIndex64 ( STATIC
UINT8
VmReadMem8 (
- IN VM_CONTEXT *VmPtr,
- IN UINTN Addr
+ IN VM_CONTEXT *VmPtr,
+ IN UINTN Addr
);
/**
@@ -165,8 +165,8 @@ VmReadMem32 ( STATIC
UINT64
VmReadMem64 (
- IN VM_CONTEXT *VmPtr,
- IN UINTN Addr
+ IN VM_CONTEXT *VmPtr,
+ IN UINTN Addr
);
/**
@@ -181,8 +181,8 @@ VmReadMem64 ( STATIC
UINTN
VmReadMemN (
- IN VM_CONTEXT *VmPtr,
- IN UINTN Addr
+ IN VM_CONTEXT *VmPtr,
+ IN UINTN Addr
);
/**
@@ -211,9 +211,9 @@ VmReadMemN ( STATIC
EFI_STATUS
VmWriteMem8 (
- IN VM_CONTEXT *VmPtr,
- IN UINTN Addr,
- IN UINT8 Data
+ IN VM_CONTEXT *VmPtr,
+ IN UINTN Addr,
+ IN UINT8 Data
);
/**
@@ -242,9 +242,9 @@ VmWriteMem8 ( STATIC
EFI_STATUS
VmWriteMem16 (
- IN VM_CONTEXT *VmPtr,
- IN UINTN Addr,
- IN UINT16 Data
+ IN VM_CONTEXT *VmPtr,
+ IN UINTN Addr,
+ IN UINT16 Data
);
/**
@@ -273,9 +273,9 @@ VmWriteMem16 ( STATIC
EFI_STATUS
VmWriteMem32 (
- IN VM_CONTEXT *VmPtr,
- IN UINTN Addr,
- IN UINT32 Data
+ IN VM_CONTEXT *VmPtr,
+ IN UINTN Addr,
+ IN UINT32 Data
);
/**
@@ -441,8 +441,8 @@ VmReadImmed64 ( STATIC
UINTN
ConvertStackAddr (
- IN VM_CONTEXT *VmPtr,
- IN UINTN Addr
+ IN VM_CONTEXT *VmPtr,
+ IN UINTN Addr
);
/**
@@ -792,7 +792,7 @@ ExecutePOP ( STATIC
EFI_STATUS
ExecuteSignedDataManip (
- IN VM_CONTEXT *VmPtr
+ IN VM_CONTEXT *VmPtr
);
/**
@@ -815,7 +815,7 @@ ExecuteSignedDataManip ( STATIC
EFI_STATUS
ExecuteUnsignedDataManip (
- IN VM_CONTEXT *VmPtr
+ IN VM_CONTEXT *VmPtr
);
/**
@@ -923,9 +923,9 @@ ExecuteMOVsnw ( STATIC
UINT64
ExecuteNOT (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -944,9 +944,9 @@ ExecuteNOT ( STATIC
UINT64
ExecuteNEG (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -965,9 +965,9 @@ ExecuteNEG ( STATIC
UINT64
ExecuteADD (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -986,9 +986,9 @@ ExecuteADD ( STATIC
UINT64
ExecuteSUB (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1007,9 +1007,9 @@ ExecuteSUB ( STATIC
UINT64
ExecuteMUL (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1028,9 +1028,9 @@ ExecuteMUL ( STATIC
UINT64
ExecuteMULU (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1049,9 +1049,9 @@ ExecuteMULU ( STATIC
UINT64
ExecuteDIV (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1070,9 +1070,9 @@ ExecuteDIV ( STATIC
UINT64
ExecuteDIVU (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1091,9 +1091,9 @@ ExecuteDIVU ( STATIC
UINT64
ExecuteMOD (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1112,9 +1112,9 @@ ExecuteMOD ( STATIC
UINT64
ExecuteMODU (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1133,9 +1133,9 @@ ExecuteMODU ( STATIC
UINT64
ExecuteAND (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1154,9 +1154,9 @@ ExecuteAND ( STATIC
UINT64
ExecuteOR (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1175,9 +1175,9 @@ ExecuteOR ( STATIC
UINT64
ExecuteXOR (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1196,9 +1196,9 @@ ExecuteXOR ( STATIC
UINT64
ExecuteSHL (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1217,9 +1217,9 @@ ExecuteSHL ( STATIC
UINT64
ExecuteSHR (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1238,9 +1238,9 @@ ExecuteSHR ( STATIC
UINT64
ExecuteASHR (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1259,9 +1259,9 @@ ExecuteASHR ( STATIC
UINT64
ExecuteEXTNDB (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1280,9 +1280,9 @@ ExecuteEXTNDB ( STATIC
UINT64
ExecuteEXTNDW (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
/**
@@ -1301,9 +1301,9 @@ ExecuteEXTNDW ( STATIC
UINT64
ExecuteEXTNDD (
- IN VM_CONTEXT *VmPtr,
- IN UINT64 Op1,
- IN UINT64 Op2
+ IN VM_CONTEXT *VmPtr,
+ IN UINT64 Op1,
+ IN UINT64 Op2
);
//
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h index 13eea0c..551236e 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h @@ -239,8 +239,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. EFI_STATUS
EbcExecute (
IN VM_CONTEXT *VmPtr
- )
-;
+ );
@@ -253,8 +252,7 @@ EbcExecute ( UINT64
GetVmVersion (
VOID
- )
-;
+ );
/**
Writes UINTN data to memory address.
@@ -284,8 +282,7 @@ VmWriteMemN ( IN VM_CONTEXT *VmPtr,
IN UINTN Addr,
IN UINTN Data
- )
-;
+ );
/**
Writes 64-bit data to memory address.
@@ -312,11 +309,10 @@ VmWriteMemN ( **/
EFI_STATUS
VmWriteMem64 (
- IN VM_CONTEXT *VmPtr,
- UINTN Addr,
- IN UINT64 Data
- )
-;
+ IN VM_CONTEXT *VmPtr,
+ IN UINTN Addr,
+ IN UINT64 Data
+ );
//
// Define a protocol for an EBC VM test interface.
@@ -385,7 +381,6 @@ EbcExecuteInstructions ( IN EFI_EBC_VM_TEST_PROTOCOL *This,
IN VM_CONTEXT *VmPtr,
IN OUT UINTN *InstructionCount
- )
-;
+ );
#endif // ifndef _EBC_EXECUTE_H_
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.c b/MdeModulePkg/Universal/EbcDxe/EbcInt.c index f48176e..bb3dddc 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcInt.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.c @@ -52,8 +52,8 @@ STATIC EFI_STATUS
EFIAPI
EbcUnloadImage (
- IN EFI_EBC_PROTOCOL *This,
- IN EFI_HANDLE ImageHandle
+ IN EFI_EBC_PROTOCOL *This,
+ IN EFI_HANDLE ImageHandle
);
/**
@@ -79,10 +79,10 @@ STATIC EFI_STATUS
EFIAPI
EbcCreateThunk (
- IN EFI_EBC_PROTOCOL *This,
- IN EFI_HANDLE ImageHandle,
- IN VOID *EbcEntryPoint,
- OUT VOID **Thunk
+ IN EFI_EBC_PROTOCOL *This,
+ IN EFI_HANDLE ImageHandle,
+ IN VOID *EbcEntryPoint,
+ OUT VOID **Thunk
);
/**
@@ -100,8 +100,8 @@ STATIC EFI_STATUS
EFIAPI
EbcGetVersion (
- IN EFI_EBC_PROTOCOL *This,
- IN OUT UINT64 *Version
+ IN EFI_EBC_PROTOCOL *This,
+ IN OUT UINT64 *Version
);
/**
@@ -187,7 +187,7 @@ EbcDebugPeriodic ( STATIC
EFI_STATUS
InitEbcVmTestProtocol (
- IN EFI_HANDLE *Handle
+ IN EFI_HANDLE *IHandle
);
/**
@@ -216,8 +216,8 @@ STATIC EFI_STATUS
EFIAPI
EbcRegisterICacheFlush (
- IN EFI_EBC_PROTOCOL *This,
- IN EBC_ICACHE_FLUSH Flush
+ IN EFI_EBC_PROTOCOL *This,
+ IN EBC_ICACHE_FLUSH Flush
);
/**
@@ -235,8 +235,8 @@ STATIC EFI_STATUS
EFIAPI
EbcDebugGetMaximumProcessorIndex (
- IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
- OUT UINTN *MaxProcessorIndex
+ IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
+ OUT UINTN *MaxProcessorIndex
);
/**
@@ -264,9 +264,9 @@ STATIC EFI_STATUS
EFIAPI
EbcDebugRegisterPeriodicCallback (
- IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
- IN UINTN ProcessorIndex,
- IN EFI_PERIODIC_CALLBACK PeriodicCallback
+ IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
+ IN UINTN ProcessorIndex,
+ IN EFI_PERIODIC_CALLBACK PeriodicCallback
);
/**
@@ -298,10 +298,10 @@ STATIC EFI_STATUS
EFIAPI
EbcDebugRegisterExceptionCallback (
- IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
- IN UINTN ProcessorIndex,
- IN EFI_EXCEPTION_CALLBACK ExceptionCallback,
- IN EFI_EXCEPTION_TYPE ExceptionType
+ IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
+ IN UINTN ProcessorIndex,
+ IN EFI_EXCEPTION_CALLBACK ExceptionCallback,
+ IN EFI_EXCEPTION_TYPE ExceptionType
);
/**
@@ -324,10 +324,10 @@ STATIC EFI_STATUS
EFIAPI
EbcDebugInvalidateInstructionCache (
- IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
- IN UINTN ProcessorIndex,
- IN VOID *Start,
- IN UINT64 Length
+ IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
+ IN UINTN ProcessorIndex,
+ IN VOID *Start,
+ IN UINT64 Length
);
//
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h index 720ee26..c08ae92 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h +++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h @@ -101,9 +101,8 @@ EbcCreateThunks ( IN EFI_HANDLE ImageHandle,
IN VOID *EbcEntryPoint,
OUT VOID **Thunk,
- IN UINT32 Flags
- )
-;
+ IN UINT32 Flags
+ );
/**
Add a thunk to our list of thunks for a given image handle.
@@ -120,11 +119,10 @@ EbcCreateThunks ( **/
EFI_STATUS
EbcAddImageThunk (
- IN EFI_HANDLE ImageHandle,
- IN VOID *ThunkBuffer,
- IN UINT32 ThunkSize
- )
-;
+ IN EFI_HANDLE ImageHandle,
+ IN VOID *ThunkBuffer,
+ IN UINT32 ThunkSize
+ );
//
// The interpreter calls these when an exception is detected,
@@ -143,11 +141,10 @@ EbcAddImageThunk ( **/
EFI_STATUS
EbcDebugSignalException (
- IN EFI_EXCEPTION_TYPE ExceptionType,
- IN EXCEPTION_FLAGS ExceptionFlags,
- IN VM_CONTEXT *VmPtr
- )
-;
+ IN EFI_EXCEPTION_TYPE ExceptionType,
+ IN EXCEPTION_FLAGS ExceptionFlags,
+ IN VM_CONTEXT *VmPtr
+ );
//
// Define a constant of how often to call the debugger periodic callback
@@ -161,21 +158,20 @@ EbcDebugSignalException ( //
// External low level functions that are native-processor dependent
//
-/**
+/**
The VM thunk code stuffs an EBC entry point into a processor
register. Since we can't use inline assembly to get it from
the interpreter C code, stuff it into the return value
register and return.
@return The contents of the register in which the entry point is passed.
-
-**/
+
+**/
UINTN
EFIAPI
EbcLLGetEbcEntryPoint (
VOID
- )
-;
+ );
/**
Returns the caller's value of the stack pointer.
@@ -183,15 +179,14 @@ EbcLLGetEbcEntryPoint ( We adjust it by 4 here because when they called us, the return address
is put on the stack, thereby lowering it by 4 bytes.
- @return The current value of the stack pointer for the caller.
+ @return The current value of the stack pointer for the caller.
**/
UINTN
EFIAPI
EbcLLGetStackPointer (
VOID
- )
-;
+ );
/**
This function is called to execute an EBC CALLEX instruction.
@@ -204,7 +199,7 @@ EbcLLGetStackPointer ( @param CallAddr The function address.
@param EbcSp The new EBC stack pointer.
@param FramePtr The frame pointer.
-
+
**/
VOID
EFIAPI
@@ -212,8 +207,7 @@ EbcLLCALLEXNative ( IN UINTN CallAddr,
IN UINTN EbcSp,
IN VOID *FramePtr
- )
-;
+ );
/**
This function is called to execute an EBC CALLEX instruction.
@@ -237,8 +231,7 @@ EbcLLCALLEX ( IN UINTN NewStackPointer,
IN VOID *FramePtr,
IN UINT8 Size
- )
-;
+ );
/**
When EBC calls native, on return the VM has to stuff the return
@@ -246,15 +239,14 @@ EbcLLCALLEX ( in the register, so simply return and the caller should get the
return result properly.
- @return The unmodified value returned by the native code.
+ @return The unmodified value returned by the native code.
**/
INT64
EFIAPI
EbcLLGetReturnValue (
VOID
- )
-;
+ );
/**
Returns the stack index and buffer assosicated with the Handle parameter.
|