PcdLib is only referenced by IPF arch.

[mirror_edk2.git] / MdePkg / Library / BaseIoLibIntrinsic / IoLibMsc.c

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index cfe5ddff4394b4a6305825f049b56bba0ae413d0..d05a7fcace98202bfc18aa00baeb410ff8828aee 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
@@ -46,8 +46,8 @@ void          _ReadWriteBarrier (void);
 //\r
 // _ReadWriteBarrier() forces memory reads and writes to complete at the point\r
 // in the call. This is only a hint to the compiler and does emit code.\r
-// In past versions of the compiler, _ReadWriteBarrier was enforced only \r
-// locally and did not affect functions up the call tree. In Visual C++ \r
+// In past versions of the compiler, _ReadWriteBarrier was enforced only\r
+// locally and did not affect functions up the call tree. In Visual C++\r
 // 2005, _ReadWriteBarrier is enforced all the way up the call tree.\r
 //\r
 \r
@@ -71,8 +71,12 @@ IoRead8 (
   IN      UINTN                     Port\r
   )\r
 {\r
+  UINT8                             Value;\r
+\r
+  _ReadWriteBarrier ();\r
+  Value = (UINT8)_inp ((UINT16)Port);\r
   _ReadWriteBarrier ();\r
-  return (UINT8)_inp ((UINT16)Port);\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -98,7 +102,9 @@ IoWrite8 (
   )\r
 {\r
   _ReadWriteBarrier ();\r
-  return (UINT8)_outp ((UINT16)Port, Value);\r
+  (UINT8)_outp ((UINT16)Port, Value);\r
+  _ReadWriteBarrier ();\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -121,9 +127,13 @@ IoRead16 (
   IN      UINTN                     Port\r
   )\r
 {\r
+  UINT16                            Value;\r
+\r
   ASSERT ((Port & 1) == 0);\r
   _ReadWriteBarrier ();\r
-  return _inpw((UINT16)Port);\r
+  Value = _inpw ((UINT16)Port);\r
+  _ReadWriteBarrier ();\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -150,7 +160,9 @@ IoWrite16 (
 {\r
   ASSERT ((Port & 1) == 0);\r
   _ReadWriteBarrier ();\r
-  return _outpw ((UINT16)Port, Value);\r
+  _outpw ((UINT16)Port, Value);\r
+  _ReadWriteBarrier ();\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -173,9 +185,13 @@ IoRead32 (
   IN      UINTN                     Port\r
   )\r
 {\r
+  UINT32                            Value;\r
+\r
   ASSERT ((Port & 3) == 0);\r
   _ReadWriteBarrier ();\r
-  return _inpd((UINT16)Port);\r
+  Value = _inpd ((UINT16)Port);\r
+  _ReadWriteBarrier ();\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -202,7 +218,9 @@ IoWrite32 (
 {\r
   ASSERT ((Port & 3) == 0);\r
   _ReadWriteBarrier ();\r
-  return _outpd ((UINT16)Port, Value);\r
+  _outpd ((UINT16)Port, Value);\r
+  _ReadWriteBarrier ();\r
+  return Value;\r
 }\r
 \r
 \r
@@ -226,8 +244,10 @@ MmioRead8 (
   IN      UINTN                     Address\r
   )\r
 {\r
-  _ReadWriteBarrier ();\r
-  return *(volatile UINT8 *)Address;\r
+  UINT8                             Value;\r
+\r
+  Value = *(volatile UINT8*)Address;\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -250,8 +270,7 @@ MmioWrite8 (
   IN      UINT8                     Value\r
   )\r
 {\r
-  _ReadWriteBarrier ();\r
-  return *(volatile UINT8 *)Address = Value;\r
+  return *(volatile UINT8*)Address = Value;\r
 }\r
 \r
 /**\r
@@ -274,9 +293,11 @@ MmioRead16 (
   IN      UINTN                     Address\r
   )\r
 {\r
+  UINT16                            Value;\r
+\r
   ASSERT ((Address & 1) == 0);\r
-  _ReadWriteBarrier ();\r
-  return *(volatile UINT16 *)Address;\r
+  Value = *(volatile UINT16*)Address;\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -300,8 +321,7 @@ MmioWrite16 (
   )\r
 {\r
   ASSERT ((Address & 1) == 0);\r
-  _ReadWriteBarrier ();\r
-  return *(volatile UINT16 *)Address = Value;\r
+  return *(volatile UINT16*)Address = Value;\r
 }\r
 \r
 /**\r
@@ -324,9 +344,11 @@ MmioRead32 (
   IN      UINTN                     Address\r
   )\r
 {\r
+  UINT32                            Value;\r
+\r
   ASSERT ((Address & 3) == 0);\r
-  _ReadWriteBarrier ();\r
-  return *(volatile UINT32 *)Address;\r
+  Value = *(volatile UINT32*)Address;\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -350,8 +372,7 @@ MmioWrite32 (
   )\r
 {\r
   ASSERT ((Address & 3) == 0);\r
-  _ReadWriteBarrier ();\r
-  return *(volatile UINT32 *)Address = Value;\r
+  return *(volatile UINT32*)Address = Value;\r
 }\r
 \r
 /**\r
@@ -374,9 +395,11 @@ MmioRead64 (
   IN      UINTN                     Address\r
   )\r
 {\r
+  UINT64                            Value;\r
+\r
   ASSERT ((Address & 7) == 0);\r
-  _ReadWriteBarrier ();\r
-  return *(volatile UINT64 *)Address;\r
+  Value = *(volatile UINT64*)Address;\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -400,8 +423,7 @@ MmioWrite64 (
   )\r
 {\r
   ASSERT ((Address & 7) == 0);\r
-  _ReadWriteBarrier ();\r
-  return *(volatile UINT64 *)Address = Value;\r
+  return *(volatile UINT64*)Address = Value;\r
 }\r
 \r
 #endif\r