1. Fix one bug on EBC for GetPowerOfTwo64.c

2. Fix one bug for GetPowerOfTwo32.c and GetPowerOfTwo64.c, when Operand is 1, 1 should be returned

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

diff --git a/MdePkg/Library/BaseLib/GetPowerOfTwo32.c b/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
index 6dfe8056b41c776756b108d89fe9acefac43d6ad..dbf4ca65138cef6585e2c550afc359b0308e2098 100644 (file)
--- a/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
+++ b/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
@@ -34,6 +34,7 @@ GetPowerOfTwo32 (
   )\r
 {\r
   INTN                              BitPos;\r
-\r
-  return (BitPos = HighBitSet32 (Operand)) > 0 ? 1ul << BitPos : 0;\r
+  \r
+  BitPos = HighBitSet32 (Operand);\r
+  return BitPos >= 0 ? 1ul << BitPos : 0;\r
 }\r

diff --git a/MdePkg/Library/BaseLib/GetPowerOfTwo64.c b/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
index 9994fb8f12e29acd8cc6cf2bfbebc13deb1d5735..8372a7f1361594ff413134c574edb82d4c83d26e 100644 (file)
--- a/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
+++ b/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
@@ -35,5 +35,6 @@ GetPowerOfTwo64 (
 {\r
   INTN                              BitPos;\r
 \r
-  return (BitPos = HighBitSet64 (Operand)) > 0 ? LShiftU64 (1, BitPos) : 0;\r
+  BitPos = HighBitSet64 (Operand);\r
+  return BitPos >= 0 ? LShiftU64 (1, BitPos) : 0;\r
 }\r