PciLib:

For PciRead/WriteBuffer(): A fix to handle boundary cases when Size is 0;
	DevicePathLib:
	For FileDevicePath(): Change to use AppendDevicePath () in place of AppendDevicePathNode(). 
	PrintLib:
	For type %p, according to current MWG, it should ignore flag 0, +, space, l, & L
	Misc:
	Fix a bug in EBC interpreter for Ia32. 


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@796 6f19259b-4bc3-4df7-8a09-765794883524

EdkModulePkg/Universal/Ebc/Dxe/Ia32/Ia32Math.asm

@@ -134,8 +134,8 @@ _RightShiftU64_Calc:
   mov    eax, dword ptr Operand[0]
   mov    edx, dword ptr Operand[4]
   
-  shrd   edx, eax, cl
-  shr    eax, cl
+  shrd   eax, edx, cl
+  shr    edx, cl
   cmp    ecx, 32
   jc     short _RightShiftU64_Done
   

MdePkg/Library/BasePciCf8Lib/PciLib.c

@@ -1299,11 +1299,16 @@ PciCf8ReadBuffer (
 
   ASSERT_INVALID_PCI_ADDRESS (StartAddress, 0);
   ASSERT (((StartAddress & 0xFFF) + Size) <= 0x100);
-  ASSERT ((Buffer != NULL) || (Size == 0));
+
+  if (Size == 0) {
+    return 0;
+  }
+
+  ASSERT (Buffer != NULL);
 
   EndAddress = StartAddress + Size;
 
-  if ((StartAddress < EndAddress) && ((StartAddress & 1) != 0)) {
+  if ((StartAddress & 1) != 0) {
     //
     // Read a byte if StartAddress is byte aligned
     //
@@ -1386,11 +1391,16 @@ PciCf8WriteBuffer (
 
   ASSERT_INVALID_PCI_ADDRESS (StartAddress, 0);
   ASSERT (((StartAddress & 0xFFF) + Size) <= 0x100);
-  ASSERT ((Buffer != NULL) || (Size == 0));
+
+  if (Size == 0) {
+    return 0;
+  }
+
+  ASSERT (Buffer != 0);
 
   EndAddress = StartAddress + Size;
 
-  if ((StartAddress < EndAddress) && ((StartAddress & 1)!= 0)) {
+  if ((StartAddress & 1)!= 0) {
     //
     // Write a byte if StartAddress is byte aligned
     //

MdePkg/Library/BasePciExpressLib/PciLib.c

@@ -1196,11 +1196,16 @@ PciExpressReadBuffer (
 
   ASSERT_INVALID_PCI_ADDRESS (StartAddress);
   ASSERT (((StartAddress & 0xFFF) + Size) <= 0x1000);
-  ASSERT ((Buffer != NULL) || (Size == 0));
+
+  if (Size == 0) {
+    return 0;
+  }
+
+  ASSERT (Buffer != NULL);
 
   EndAddress = StartAddress + Size;
 
-  if ((StartAddress < EndAddress) && ((StartAddress & 1) != 0)) {
+  if ((StartAddress & 1) != 0) {
     //
     // Read a byte if StartAddress is byte aligned
     //
@@ -1282,11 +1287,16 @@ PciExpressWriteBuffer (
 
   ASSERT_INVALID_PCI_ADDRESS (StartAddress);
   ASSERT (((StartAddress & 0xFFF) + Size) <= 0x1000);
-  ASSERT ((Buffer != NULL) || (Size == 0));
+
+  if (Size == 0) {
+    return 0;
+  }
+
+  ASSERT (Buffer != NULL);
 
   EndAddress = StartAddress + Size;
 
-  if ((StartAddress < EndAddress) && ((StartAddress & 1) != 0)) {
+  if ((StartAddress & 1) != 0) {
     //
     // Write a byte if StartAddress is byte aligned
     //

MdePkg/Library/BasePrintLib/PrintLib.c

@@ -236,7 +236,7 @@ BasePrintLibVSPrint (
           Format   -= BytesPerFormatCharacter;
           Precision = 0;
           //
-          // break skiped on purpose.
+          // break skipped on purpose.
           //
         default:
           Done = TRUE;
@@ -256,18 +256,22 @@ BasePrintLibVSPrint (
       //
       switch (FormatCharacter) {
       case 'p':
+        //
+        // Flag space, +, 0, L & l are invalid for type p.
+        //
+        Flags &= ~(PREFIX_BLANK | PREFIX_SIGN | PREFIX_ZERO | LONG_TYPE);
         if (sizeof (VOID *) > 4) {
           Flags |= LONG_TYPE;
         }
       case 'X':
         Flags |= PREFIX_ZERO;
         //
-        // break skiped on purpose
+        // break skipped on purpose
         //
       case 'x':
         Flags |= RADIX_HEX;
         //
-        // break skiped on purpose
+        // break skipped on purpose
         //
       case 'd':
         if ((Flags & LONG_TYPE) == 0) {

MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c

@@ -496,24 +496,26 @@ FileDevicePath (
   UINTN                     Size;
   FILEPATH_DEVICE_PATH      *FilePath;
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
-  EFI_DEVICE_PATH_PROTOCOL  *FileDevicePathNode;
+  EFI_DEVICE_PATH_PROTOCOL  *FileDevicePath;
 
   DevicePath = NULL;
 
   Size = StrSize (FileName);
-  FileDevicePathNode = CreateDeviceNode (
-                         MEDIA_DEVICE_PATH,
-                         MEDIA_FILEPATH_DP,
-                         (UINT16) (Size + SIZE_OF_FILEPATH_DEVICE_PATH)
-                         );
-  if (FileDevicePathNode != NULL) {
-    FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePathNode;
+  FileDevicePath = AllocatePool (Size + SIZE_OF_FILEPATH_DEVICE_PATH + EFI_END_DEVICE_PATH_LENGTH);
+  if (FileDevicePath != NULL) {
+    FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePath;
+    FilePath->Header.Type    = MEDIA_DEVICE_PATH;
+    FilePath->Header.SubType = MEDIA_FILEPATH_DP;
     CopyMem (&FilePath->PathName, FileName, Size);
+    SetDevicePathNodeLength (&FilePath->Header, Size + SIZE_OF_FILEPATH_DEVICE_PATH);
+    SetDevicePathEndNode (NextDevicePathNode (&FilePath->Header));
+
     if (Device != NULL) {
       DevicePath = DevicePathFromHandle (Device);
     }
-    DevicePath = AppendDevicePathNode (DevicePath, FileDevicePathNode);
-    FreePool (FileDevicePathNode);
+
+    DevicePath = AppendDevicePath (DevicePath, FileDevicePath);
+    FreePool (FileDevicePath);
   }
 
   return DevicePath;

MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c

@@ -321,24 +321,26 @@ FileDevicePath (
   UINTN                     Size;
   FILEPATH_DEVICE_PATH      *FilePath;
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
-  EFI_DEVICE_PATH_PROTOCOL  *FileDevicePathNode;
+  EFI_DEVICE_PATH_PROTOCOL  *FileDevicePath;
 
   DevicePath = NULL;
 
   Size = StrSize (FileName);
-  FileDevicePathNode = CreateDeviceNode (
-                         MEDIA_DEVICE_PATH,
-                         MEDIA_FILEPATH_DP,
-                         (UINT16) (Size + SIZE_OF_FILEPATH_DEVICE_PATH)
-                         );
-  if (FileDevicePathNode != NULL) {
-    FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePathNode;
+  FileDevicePath = AllocatePool (Size + SIZE_OF_FILEPATH_DEVICE_PATH + EFI_END_DEVICE_PATH_LENGTH);
+  if (FileDevicePath != NULL) {
+    FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePath;
+    FilePath->Header.Type    = MEDIA_DEVICE_PATH;
+    FilePath->Header.SubType = MEDIA_FILEPATH_DP;
     CopyMem (&FilePath->PathName, FileName, Size);
+    SetDevicePathNodeLength (&FilePath->Header, Size + SIZE_OF_FILEPATH_DEVICE_PATH);
+    SetDevicePathEndNode (NextDevicePathNode (&FilePath->Header));
+
     if (Device != NULL) {
       DevicePath = DevicePathFromHandle (Device);
     }
-    DevicePath = AppendDevicePathNode (DevicePath, FileDevicePathNode);
-    FreePool (FileDevicePathNode);
+
+    DevicePath = AppendDevicePath (DevicePath, FileDevicePath);
+    FreePool (FileDevicePath);
   }
 
   return DevicePath;