4 files changed, 3848 insertions, 2346 deletions
diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
index fc2b1dab7c..7e4c870b4f 100644
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/MdePkg/Library/BaseLib/BaseLib.msa
@@ -1,657 +1,658 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <MsaHeader>
-    <ModuleName>BaseLib</ModuleName>
-    <ModuleType>BASE</ModuleType>
-    <GuidValue>27d67720-ea68-48ae-93da-a3a074c90e30</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Component description file for Base Library</Abstract>
-    <Description>Base Library implementation.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>BaseLib</OutputFileBasename>
-  </ModuleDefinitions>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>TimerLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>BaseLibInternals.h</Filename>
-    <Filename>String.c</Filename>
-    <Filename>LinkedList.c</Filename>
-    <Filename>Synchronization.c</Filename>
-    <Filename>Cpu.c</Filename>
-    <Filename>CpuDeadLoop.c</Filename>
-    <Filename>BitField.c</Filename>
-    <Filename>ARShiftU64.c</Filename>
-    <Filename>DivS64x64Remainder.c</Filename>
-    <Filename>DivU64x32.c</Filename>
-    <Filename>DivU64x32Remainder.c</Filename>
-    <Filename>DivU64x64Remainder.c</Filename>
-    <Filename>GetPowerOfTwo32.c</Filename>
-    <Filename>GetPowerOfTwo64.c</Filename>
-    <Filename>HighBitSet32.c</Filename>
-    <Filename>HighBitSet64.c</Filename>
-    <Filename>LowBitSet32.c</Filename>
-    <Filename>LowBitSet64.c</Filename>
-    <Filename>LRotU32.c</Filename>
-    <Filename>LRotU64.c</Filename>
-    <Filename>LShiftU64.c</Filename>
-    <Filename>ModU64x32.c</Filename>
-    <Filename>MultS64x64.c</Filename>
-    <Filename>MultU64x32.c</Filename>
-    <Filename>MultU64x64.c</Filename>
-    <Filename>RRotU32.c</Filename>
-    <Filename>RRotU64.c</Filename>
-    <Filename>RShiftU64.c</Filename>
-    <Filename>SetJump.c</Filename>
-    <Filename>LongJump.c</Filename>
-    <Filename>SwapBytes16.c</Filename>
-    <Filename>SwapBytes32.c</Filename>
-    <Filename>SwapBytes64.c</Filename>
-    <Filename>SwitchStack.c</Filename>
-
-    <Filename SupArchList="IA32">x86DisablePaging32.c</Filename>
-    <Filename SupArchList="IA32">x86DisablePaging64.c</Filename>
-    <Filename SupArchList="IA32">x86EnablePaging32.c</Filename>
-    <Filename SupArchList="IA32">x86EnablePaging64.c</Filename>
-    <Filename SupArchList="IA32">x86FxRestore.c</Filename>
-    <Filename SupArchList="IA32">x86FxSave.c</Filename>
-    <Filename SupArchList="IA32">x86GetInterruptState.c</Filename>
-    <Filename SupArchList="IA32">x86MemoryFence.c</Filename>
-    <Filename SupArchList="IA32">x86Msr.c</Filename>
-    <Filename SupArchList="IA32">x86ReadGdtr.c</Filename>
-    <Filename SupArchList="IA32">x86ReadIdtr.c</Filename>
-    <Filename SupArchList="IA32">x86Thunk.c</Filename>
-    <Filename SupArchList="IA32">x86WriteGdtr.c</Filename>
-    <Filename SupArchList="IA32">x86WriteIdtr.c</Filename>
-    <Filename SupArchList="IA32">Unaligned.c</Filename>
-    <Filename SupArchList="IA32">Ia32/Non-existing.c</Filename>
-    <Filename SupArchList="IA32">Ia32/InternalSwitchStack.c</Filename>
-    <Filename SupArchList="IA32">Ia32/DivS64x64Remainder.c</Filename>
-
-    <!-- GCC assembly code is with .S extension -->
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LShiftU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/RShiftU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ARShiftU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LRotU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/RRotU64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/MultU64x32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/MultU64x64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ModU64x32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x32Remainder.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x64Remainder.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/SwapBytes64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/SetJump.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LongJump.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuId.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuIdEx.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadEflags.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMsr64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMsr64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr1.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr5.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr6.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr7.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr1.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr5.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr6.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr7.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadEs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadFs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadGs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadSs.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadTr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadGdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteGdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadIdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteIdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadLdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteLdtr.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FxSave.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FxRestore.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm1.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm5.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm6.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm7.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm0.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm1.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm2.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm3.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm4.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm5.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm6.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm7.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadTsc.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadPmc.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Monitor.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Mwait.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnablePaging32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DisablePaging32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnablePaging64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Wbinvd.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Invd.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FlushCacheLine.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedIncrement.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedDecrement.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedCompareExchange32.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedCompareExchange64.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnableInterrupts.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DisableInterrupts.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnableDisableInterrupts.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuSleep.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuPause.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuBreakpoint.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuFlushTlb.S</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Thunk16.S</Filename>
-
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuBreakpoint.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuFlushTlb.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuIdEx.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuId.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuPause.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuSleep.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/DisableInterrupts.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/DisablePaging64.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnableDisableInterrupts.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnableInterrupts.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnablePaging64.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FlushCacheLine.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FxRestore.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FxSave.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedCompareExchange32.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedCompareExchange64.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedDecrement.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedIncrement.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Invd.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/LongJump.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Monitor.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Mwait.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr1.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr5.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr6.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr7.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadEflags.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadEs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadFs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadGdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadGs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadIdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadLdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm1.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm5.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm6.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm7.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMsr64.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadPmc.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadSs.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadTr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadTsc.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/SetJump.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/SwitchStack.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Thunk16.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Wbinvd.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr1.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr5.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr6.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr7.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteGdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteIdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteLdtr.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm0.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm1.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm2.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm3.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm4.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm5.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm6.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm7.S</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMsr64.S</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ARShiftU64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuBreakpoint.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuFlushTlb.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuSleep.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuId.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuIdEx.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuPause.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DisableInterrupts.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DisablePaging32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x32Remainder.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x64Remainder.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnableDisableInterrupts.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnableInterrupts.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnablePaging32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnablePaging64.asm</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FlushCacheLine.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FxSave.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FxRestore.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedIncrement.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedDecrement.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedCompareExchange32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedCompareExchange64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Invd.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LongJump.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LRotU64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LShiftU64.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/MultU64x32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/MultU64x64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ModU64x32.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Monitor.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Mwait.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr1.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr5.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr6.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr7.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadEflags.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm1.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm5.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm6.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm7.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMsr64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadEs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadFs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadGs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadSs.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadTr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadGdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadIdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadLdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadTsc.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadPmc.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/RShiftU64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/RRotU64.c</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/SetJump.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/SwapBytes64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Thunk16.asm</Filename>
-
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMsr64.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr1.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr5.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr6.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr7.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteGdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteIdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteLdtr.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm0.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm1.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm2.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm3.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm4.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm5.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm6.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm7.c</Filename>
-    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Wbinvd.c</Filename>
-
-    <Filename SupArchList="X64">x86DisablePaging32.c</Filename>
-    <Filename SupArchList="X64">x86DisablePaging64.c</Filename>
-    <Filename SupArchList="X64">x86EnablePaging32.c</Filename>
-    <Filename SupArchList="X64">x86EnablePaging64.c</Filename>
-    <Filename SupArchList="X64">x86FxRestore.c</Filename>
-    <Filename SupArchList="X64">x86FxSave.c</Filename>
-    <Filename SupArchList="X64">x86GetInterruptState.c</Filename>
-    <Filename SupArchList="X64">x86MemoryFence.c</Filename>
-    <Filename SupArchList="X64">x86Msr.c</Filename>
-    <Filename SupArchList="X64">x86ReadGdtr.c</Filename>
-    <Filename SupArchList="X64">x86ReadIdtr.c</Filename>
-    <Filename SupArchList="X64">x86Thunk.c</Filename>
-    <Filename SupArchList="X64">x86WriteGdtr.c</Filename>
-    <Filename SupArchList="X64">x86WriteIdtr.c</Filename>
-    <Filename SupArchList="X64">Unaligned.c</Filename>
-    <Filename SupArchList="X64">Math64.c</Filename>
-    <Filename SupArchList="X64">X64/Non-existing.c</Filename>
-    <Filename SupArchList="X64">X64/SwitchStack.asm</Filename>
-    <Filename SupArchList="X64">X64/SetJump.asm</Filename>
-    <Filename SupArchList="X64">X64/LongJump.asm</Filename>
-    <Filename SupArchList="X64">X64/CpuId.asm</Filename>
-    <Filename SupArchList="X64">X64/CpuIdEx.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadEflags.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/ReadMsr64.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/WriteMsr64.c</Filename>
-    <Filename SupArchList="X64">X64/ReadCr0.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadCr2.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadCr3.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadCr4.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteCr0.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteCr2.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteCr3.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteCr4.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr0.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr1.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr2.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr3.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr4.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr5.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr6.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDr7.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr0.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr1.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr2.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr3.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr4.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr5.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr6.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteDr7.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadCs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadDs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadEs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadFs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadGs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadSs.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadTr.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadGdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteGdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadIdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteIdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadLdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteLdtr.asm</Filename>
-    <Filename SupArchList="X64">X64/FxSave.asm</Filename>
-    <Filename SupArchList="X64">X64/FxRestore.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm0.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm1.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm2.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm3.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm4.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm5.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm6.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadMm7.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm0.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm1.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm2.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm3.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm4.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm5.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm6.asm</Filename>
-    <Filename SupArchList="X64">X64/WriteMm7.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadTsc.asm</Filename>
-    <Filename SupArchList="X64">X64/ReadPmc.asm</Filename>
-    <Filename SupArchList="X64">X64/Monitor.asm</Filename>
-    <Filename SupArchList="X64">X64/Mwait.asm</Filename>
-    <Filename SupArchList="X64">X64/EnablePaging64.asm</Filename>
-    <Filename SupArchList="X64">X64/DisablePaging64.asm</Filename>
-    <Filename SupArchList="X64">X64/Wbinvd.asm</Filename>
-    <Filename SupArchList="X64">X64/Invd.asm</Filename>
-    <Filename SupArchList="X64">X64/FlushCacheLine.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedIncrement.c</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedDecrement.c</Filename>
-    <Filename SupArchList="X64">X64/InterlockedCompareExchange32.asm</Filename>
-    <Filename SupArchList="X64">X64/InterlockedCompareExchange64.asm</Filename>
-    <Filename SupArchList="X64">X64/EnableInterrupts.asm</Filename>
-    <Filename SupArchList="X64">X64/DisableInterrupts.asm</Filename>
-    <Filename SupArchList="X64">X64/EnableDisableInterrupts.asm</Filename>
-    <Filename SupArchList="X64">X64/CpuSleep.asm</Filename>
-    <Filename SupArchList="X64">X64/CpuPause.asm</Filename>
-    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/CpuBreakpoint.c</Filename>
-    <Filename SupArchList="X64">X64/CpuFlushTlb.asm</Filename>
-    <Filename SupArchList="X64">X64/Thunk16.asm</Filename>
-
-    <Filename SupArchList="IPF">Math64.c</Filename>
-    <Filename SupArchList="IPF">Ipf/asm.h</Filename>
-    <Filename SupArchList="IPF">Ipf/ia_64gen.h</Filename>
-    <Filename SupArchList="IPF">Ipf/PalCallStatic.s</Filename>
-    <Filename SupArchList="IPF">Ipf/setjmp.s</Filename>
-    <Filename SupArchList="IPF">Ipf/longjmp.s</Filename>
-    <Filename SupArchList="IPF">Ipf/SwitchStack.s</Filename>
-    <Filename SupArchList="IPF">Ipf/Unaligned.c</Filename>
-    <Filename SupArchList="IPF">Ipf/CpuBreakpoint.c</Filename>
-    <Filename SupArchList="IPF">Ipf/InterlockedCompareExchange32.s</Filename>
-    <Filename SupArchList="IPF">Ipf/InterlockedCompareExchange64.s</Filename>
-    <Filename SupArchList="IPF">Ipf/Synchronization.c</Filename>
-    <Filename SupArchList="IPF">Ipf/CpuPause.s</Filename>
-    <Filename SupArchList="IPF">Ipf/CpuFlushTlb.s</Filename>
-    <Filename SupArchList="IPF">Ipf/GetInterruptState.s</Filename>
-    <Filename SupArchList="IPF">Ipf/Non-existing.c</Filename>
-    <Filename SupArchList="IPF">Ipf/FlushCacheRange.s</Filename>
-    <Filename SupArchList="IPF">Ipf/ReadItc.s</Filename>
-
-    <Filename SupArchList="EBC">Math64.c</Filename>
-    <Filename SupArchList="EBC">Unaligned.c</Filename>
-    <Filename SupArchList="EBC">Ebc/SwitchStack.c</Filename>
-    <Filename SupArchList="EBC">Ebc/SetJumpLongJump.c</Filename>
-    <Filename SupArchList="EBC">Ebc/CpuBreakpoint.c</Filename>
-    <Filename SupArchList="EBC">Ebc/Synchronization.c</Filename>
-  </SourceFiles>
-  <NonProcessedFiles>
-    <Filename>Ia32/ARShiftU64.asm</Filename>
-    <Filename>Ia32/CpuBreakpoint.asm</Filename>
-    <Filename>Ia32/CpuFlushTlb.asm</Filename>
-    <Filename>Ia32/CpuId.asm</Filename>
-    <Filename>Ia32/CpuIdEx.asm</Filename>
-    <Filename>Ia32/CpuPause.asm</Filename>
-    <Filename>Ia32/CpuSleep.asm</Filename>
-    <Filename>Ia32/DisableInterrupts.asm</Filename>
-    <Filename>Ia32/DisablePaging32.asm</Filename>
-    <Filename>Ia32/DivU64x32.asm</Filename>
-    <Filename>Ia32/DivU64x32Remainder.asm</Filename>
-    <Filename>Ia32/DivU64x64Remainder.asm</Filename>
-    <Filename>Ia32/EnableDisableInterrupts.asm</Filename>
-    <Filename>Ia32/EnableInterrupts.asm</Filename>
-    <Filename>Ia32/EnablePaging32.asm</Filename>
-    <Filename>Ia32/EnablePaging64.asm</Filename>
-    <Filename>Ia32/FlushCacheLine.asm</Filename>
-    <Filename>Ia32/FxRestore.asm</Filename>
-    <Filename>Ia32/FxSave.asm</Filename>
-    <Filename>Ia32/InterlockedCompareExchange32.asm</Filename>
-    <Filename>Ia32/InterlockedCompareExchange64.asm</Filename>
-    <Filename>Ia32/InterlockedDecrement.asm</Filename>
-    <Filename>Ia32/InterlockedIncrement.asm</Filename>
-    <Filename>Ia32/Invd.asm</Filename>
-    <Filename>Ia32/LongJump.asm</Filename>
-    <Filename>Ia32/LRotU64.asm</Filename>
-    <Filename>Ia32/LShiftU64.asm</Filename>
-    <Filename>Ia32/ModU64x32.asm</Filename>
-    <Filename>Ia32/Monitor.asm</Filename>
-    <Filename>Ia32/MultU64x32.asm</Filename>
-    <Filename>Ia32/MultU64x64.asm</Filename>
-    <Filename>Ia32/Mwait.asm</Filename>
-    <Filename>Ia32/ReadCr0.asm</Filename>
-    <Filename>Ia32/ReadCr2.asm</Filename>
-    <Filename>Ia32/ReadCr3.asm</Filename>
-    <Filename>Ia32/ReadCr4.asm</Filename>
-    <Filename>Ia32/ReadCs.asm</Filename>
-    <Filename>Ia32/ReadDr0.asm</Filename>
-    <Filename>Ia32/ReadDr1.asm</Filename>
-    <Filename>Ia32/ReadDr2.asm</Filename>
-    <Filename>Ia32/ReadDr3.asm</Filename>
-    <Filename>Ia32/ReadDr4.asm</Filename>
-    <Filename>Ia32/ReadDr5.asm</Filename>
-    <Filename>Ia32/ReadDr6.asm</Filename>
-    <Filename>Ia32/ReadDr7.asm</Filename>
-    <Filename>Ia32/ReadDs.asm</Filename>
-    <Filename>Ia32/ReadEflags.asm</Filename>
-    <Filename>Ia32/ReadEs.asm</Filename>
-    <Filename>Ia32/ReadFs.asm</Filename>
-    <Filename>Ia32/ReadGdtr.asm</Filename>
-    <Filename>Ia32/ReadGs.asm</Filename>
-    <Filename>Ia32/ReadIdtr.asm</Filename>
-    <Filename>Ia32/ReadLdtr.asm</Filename>
-    <Filename>Ia32/ReadMm0.asm</Filename>
-    <Filename>Ia32/ReadMm1.asm</Filename>
-    <Filename>Ia32/ReadMm2.asm</Filename>
-    <Filename>Ia32/ReadMm3.asm</Filename>
-    <Filename>Ia32/ReadMm4.asm</Filename>
-    <Filename>Ia32/ReadMm5.asm</Filename>
-    <Filename>Ia32/ReadMm6.asm</Filename>
-    <Filename>Ia32/ReadMm7.asm</Filename>
-    <Filename>Ia32/ReadMsr64.asm</Filename>
-    <Filename>Ia32/ReadPmc.asm</Filename>
-    <Filename>Ia32/ReadSs.asm</Filename>
-    <Filename>Ia32/ReadTr.asm</Filename>
-    <Filename>Ia32/ReadTsc.asm</Filename>
-    <Filename>Ia32/RRotU64.asm</Filename>
-    <Filename>Ia32/RShiftU64.asm</Filename>
-    <Filename>Ia32/SetJump.asm</Filename>
-    <Filename>Ia32/SwapBytes64.asm</Filename>
-    <Filename>Ia32/Thunk16.asm</Filename>
-    <Filename>Ia32/Wbinvd.asm</Filename>
-    <Filename>Ia32/WriteCr0.asm</Filename>
-    <Filename>Ia32/WriteCr2.asm</Filename>
-    <Filename>Ia32/WriteCr3.asm</Filename>
-    <Filename>Ia32/WriteCr4.asm</Filename>
-    <Filename>Ia32/WriteDr0.asm</Filename>
-    <Filename>Ia32/WriteDr1.asm</Filename>
-    <Filename>Ia32/WriteDr2.asm</Filename>
-    <Filename>Ia32/WriteDr3.asm</Filename>
-    <Filename>Ia32/WriteDr4.asm</Filename>
-    <Filename>Ia32/WriteDr5.asm</Filename>
-    <Filename>Ia32/WriteDr6.asm</Filename>
-    <Filename>Ia32/WriteDr7.asm</Filename>
-    <Filename>Ia32/WriteGdtr.asm</Filename>
-    <Filename>Ia32/WriteIdtr.asm</Filename>
-    <Filename>Ia32/WriteLdtr.asm</Filename>
-    <Filename>Ia32/WriteMm0.asm</Filename>
-    <Filename>Ia32/WriteMm1.asm</Filename>
-    <Filename>Ia32/WriteMm2.asm</Filename>
-    <Filename>Ia32/WriteMm3.asm</Filename>
-    <Filename>Ia32/WriteMm4.asm</Filename>
-    <Filename>Ia32/WriteMm5.asm</Filename>
-    <Filename>Ia32/WriteMm6.asm</Filename>
-    <Filename>Ia32/WriteMm7.asm</Filename>
-    <Filename>Ia32/WriteMsr64.asm</Filename>
-  </NonProcessedFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-  </Externs>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum
-                number of characters (not counting the NULL-terminator) in a
-                Unicode string cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumAsciiStringLength</C_Name>
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number
-                of characters (not counting the NULL-terminator) in an ASCII
-                string cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumLinkedListLength</C_Name>
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number
-                of nodes (not counting the list header) in a linked list
-                cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">
-      <C_Name>PcdSpinLockTimeout</C_Name>
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout
-                value (unit: millisecond) for spin lock.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-</ModuleSurfaceArea>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+  <MsaHeader>
+    <ModuleName>BaseLib</ModuleName>
+    <ModuleType>BASE</ModuleType>
+    <GuidValue>27d67720-ea68-48ae-93da-a3a074c90e30</GuidValue>
+    <Version>1.0</Version>
+    <Abstract>Component description file for Base Library</Abstract>
+    <Description>Base Library implementation.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>BaseLib</OutputFileBasename>
+  </ModuleDefinitions>
+  <LibraryClassDefinitions>
+    <LibraryClass Usage="ALWAYS_PRODUCED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>TimerLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PcdLib</Keyword>
+    </LibraryClass>
+  </LibraryClassDefinitions>
+  <SourceFiles>
+    <Filename>BaseLibInternals.h</Filename>
+    <Filename>String.c</Filename>
+    <Filename>LinkedList.c</Filename>
+    <Filename>Synchronization.c</Filename>
+    <Filename>Cpu.c</Filename>
+    <Filename>CpuDeadLoop.c</Filename>
+    <Filename>BitField.c</Filename>
+    <Filename>ARShiftU64.c</Filename>
+    <Filename>DivS64x64Remainder.c</Filename>
+    <Filename>DivU64x32.c</Filename>
+    <Filename>DivU64x32Remainder.c</Filename>
+    <Filename>DivU64x64Remainder.c</Filename>
+    <Filename>GetPowerOfTwo32.c</Filename>
+    <Filename>GetPowerOfTwo64.c</Filename>
+    <Filename>HighBitSet32.c</Filename>
+    <Filename>HighBitSet64.c</Filename>
+    <Filename>LowBitSet32.c</Filename>
+    <Filename>LowBitSet64.c</Filename>
+    <Filename>LRotU32.c</Filename>
+    <Filename>LRotU64.c</Filename>
+    <Filename>LShiftU64.c</Filename>
+    <Filename>ModU64x32.c</Filename>
+    <Filename>MultS64x64.c</Filename>
+    <Filename>MultU64x32.c</Filename>
+    <Filename>MultU64x64.c</Filename>
+    <Filename>RRotU32.c</Filename>
+    <Filename>RRotU64.c</Filename>
+    <Filename>RShiftU64.c</Filename>
+    <Filename>SetJump.c</Filename>
+    <Filename>LongJump.c</Filename>
+    <Filename>SwapBytes16.c</Filename>
+    <Filename>SwapBytes32.c</Filename>
+    <Filename>SwapBytes64.c</Filename>
+    <Filename>SwitchStack.c</Filename>
+	  <Filename>CheckSum.c</Filename>
+    <Filename SupArchList="IA32">x86DisablePaging32.c</Filename>
+    <Filename SupArchList="IA32">x86DisablePaging64.c</Filename>
+    <Filename SupArchList="IA32">x86EnablePaging32.c</Filename>
+    <Filename SupArchList="IA32">x86EnablePaging64.c</Filename>
+    <Filename SupArchList="IA32">x86FxRestore.c</Filename>
+    <Filename SupArchList="IA32">x86FxSave.c</Filename>
+    <Filename SupArchList="IA32">x86GetInterruptState.c</Filename>
+    <Filename SupArchList="IA32">x86MemoryFence.c</Filename>
+    <Filename SupArchList="IA32">x86Msr.c</Filename>
+    <Filename SupArchList="IA32">x86ReadGdtr.c</Filename>
+    <Filename SupArchList="IA32">x86ReadIdtr.c</Filename>
+    <Filename SupArchList="IA32">x86Thunk.c</Filename>
+    <Filename SupArchList="IA32">x86WriteGdtr.c</Filename>
+    <Filename SupArchList="IA32">x86WriteIdtr.c</Filename>
+    <Filename SupArchList="IA32">Unaligned.c</Filename>
+    <Filename SupArchList="IA32">Ia32/Non-existing.c</Filename>
+    <Filename SupArchList="IA32">Ia32/InternalSwitchStack.c</Filename>
+    <Filename SupArchList="IA32">Ia32/DivS64x64Remainder.c</Filename>
+
+    <!-- GCC assembly code is with .S extension -->
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LShiftU64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/RShiftU64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ARShiftU64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LRotU64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/RRotU64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/MultU64x32.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/MultU64x64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x32.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ModU64x32.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x32Remainder.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DivU64x64Remainder.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/SwapBytes64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/SetJump.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/LongJump.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuId.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuIdEx.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadEflags.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMsr64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMsr64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr0.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr2.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr3.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCr4.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr0.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr2.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr3.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteCr4.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr0.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr1.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr2.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr3.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr4.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr5.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr6.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDr7.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr0.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr1.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr2.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr3.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr4.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr5.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr6.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteDr7.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadCs.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadDs.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadEs.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadFs.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadGs.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadSs.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadTr.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadGdtr.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteGdtr.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadIdtr.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteIdtr.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadLdtr.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteLdtr.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FxSave.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FxRestore.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm0.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm1.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm2.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm3.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm4.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm5.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm6.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadMm7.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm0.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm1.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm2.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm3.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm4.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm5.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm6.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/WriteMm7.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadTsc.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/ReadPmc.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Monitor.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Mwait.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnablePaging32.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DisablePaging32.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnablePaging64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Wbinvd.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Invd.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/FlushCacheLine.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedIncrement.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedDecrement.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedCompareExchange32.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/InterlockedCompareExchange64.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnableInterrupts.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/DisableInterrupts.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EnableDisableInterrupts.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuSleep.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuPause.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuBreakpoint.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/CpuFlushTlb.S</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/Thunk16.S</Filename>
+
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuBreakpoint.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuFlushTlb.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuIdEx.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuId.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuPause.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/CpuSleep.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/DisableInterrupts.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/DisablePaging64.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnableDisableInterrupts.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnableInterrupts.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/EnablePaging64.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FlushCacheLine.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FxRestore.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/FxSave.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedCompareExchange32.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedCompareExchange64.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedDecrement.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/InterlockedIncrement.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Invd.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/LongJump.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Monitor.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Mwait.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr0.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr2.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr3.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCr4.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadCs.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr0.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr1.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr2.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr3.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr4.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr5.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr6.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDr7.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadDs.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadEflags.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadEs.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadFs.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadGdtr.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadGs.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadIdtr.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadLdtr.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm0.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm1.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm2.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm3.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm4.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm5.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm6.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMm7.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadMsr64.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadPmc.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadSs.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadTr.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/ReadTsc.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/SetJump.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/SwitchStack.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Thunk16.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/Wbinvd.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr0.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr2.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr3.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteCr4.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr0.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr1.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr2.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr3.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr4.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr5.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr6.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteDr7.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteGdtr.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteIdtr.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteLdtr.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm0.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm1.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm2.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm3.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm4.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm5.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm6.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMm7.S</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">X64/WriteMsr64.S</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ARShiftU64.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuBreakpoint.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuFlushTlb.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuSleep.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuId.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuIdEx.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/CpuPause.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DisableInterrupts.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DisablePaging32.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x32.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x32Remainder.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/DivU64x64Remainder.c</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnableDisableInterrupts.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnableInterrupts.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnablePaging32.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EnablePaging64.asm</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FlushCacheLine.c</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FxSave.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/FxRestore.c</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedIncrement.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedDecrement.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedCompareExchange32.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/InterlockedCompareExchange64.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Invd.c</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LongJump.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LRotU64.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/LShiftU64.c</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/MultU64x32.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/MultU64x64.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ModU64x32.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Monitor.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Mwait.c</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr0.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr2.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr3.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCr4.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr0.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr1.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr2.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr3.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr4.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr5.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr6.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDr7.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadEflags.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm0.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm1.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm2.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm3.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm4.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm5.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm6.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMm7.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadMsr64.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadCs.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadDs.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadEs.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadFs.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadGs.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadSs.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadTr.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadGdtr.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadIdtr.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadLdtr.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadTsc.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/ReadPmc.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/RShiftU64.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/RRotU64.c</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/SetJump.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/SwapBytes64.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Thunk16.asm</Filename>
+
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMsr64.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr0.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr2.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr3.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteCr4.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr0.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr1.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr2.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr3.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr4.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr5.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr6.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteDr7.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteGdtr.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteIdtr.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteLdtr.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm0.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm1.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm2.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm3.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm4.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm5.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm6.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/WriteMm7.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/Wbinvd.c</Filename>
+
+    <Filename SupArchList="X64">x86DisablePaging32.c</Filename>
+    <Filename SupArchList="X64">x86DisablePaging64.c</Filename>
+    <Filename SupArchList="X64">x86EnablePaging32.c</Filename>
+    <Filename SupArchList="X64">x86EnablePaging64.c</Filename>
+    <Filename SupArchList="X64">x86FxRestore.c</Filename>
+    <Filename SupArchList="X64">x86FxSave.c</Filename>
+    <Filename SupArchList="X64">x86GetInterruptState.c</Filename>
+    <Filename SupArchList="X64">x86MemoryFence.c</Filename>
+    <Filename SupArchList="X64">x86Msr.c</Filename>
+    <Filename SupArchList="X64">x86ReadGdtr.c</Filename>
+    <Filename SupArchList="X64">x86ReadIdtr.c</Filename>
+    <Filename SupArchList="X64">x86Thunk.c</Filename>
+    <Filename SupArchList="X64">x86WriteGdtr.c</Filename>
+    <Filename SupArchList="X64">x86WriteIdtr.c</Filename>
+    <Filename SupArchList="X64">Unaligned.c</Filename>
+    <Filename SupArchList="X64">Math64.c</Filename>
+    <Filename SupArchList="X64">X64/Non-existing.c</Filename>
+    <Filename SupArchList="X64">X64/SwitchStack.asm</Filename>
+    <Filename SupArchList="X64">X64/SetJump.asm</Filename>
+    <Filename SupArchList="X64">X64/LongJump.asm</Filename>
+    <Filename SupArchList="X64">X64/CpuId.asm</Filename>
+    <Filename SupArchList="X64">X64/CpuIdEx.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadEflags.asm</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/ReadMsr64.c</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/WriteMsr64.c</Filename>
+    <Filename SupArchList="X64">X64/ReadCr0.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadCr2.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadCr3.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadCr4.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteCr0.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteCr2.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteCr3.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteCr4.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDr0.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDr1.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDr2.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDr3.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDr4.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDr5.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDr6.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDr7.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteDr0.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteDr1.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteDr2.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteDr3.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteDr4.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteDr5.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteDr6.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteDr7.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadCs.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadDs.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadEs.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadFs.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadGs.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadSs.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadTr.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadGdtr.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteGdtr.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadIdtr.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteIdtr.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadLdtr.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteLdtr.asm</Filename>
+    <Filename SupArchList="X64">X64/FxSave.asm</Filename>
+    <Filename SupArchList="X64">X64/FxRestore.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadMm0.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadMm1.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadMm2.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadMm3.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadMm4.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadMm5.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadMm6.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadMm7.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteMm0.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteMm1.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteMm2.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteMm3.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteMm4.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteMm5.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteMm6.asm</Filename>
+    <Filename SupArchList="X64">X64/WriteMm7.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadTsc.asm</Filename>
+    <Filename SupArchList="X64">X64/ReadPmc.asm</Filename>
+    <Filename SupArchList="X64">X64/Monitor.asm</Filename>
+    <Filename SupArchList="X64">X64/Mwait.asm</Filename>
+    <Filename SupArchList="X64">X64/EnablePaging64.asm</Filename>
+    <Filename SupArchList="X64">X64/DisablePaging64.asm</Filename>
+    <Filename SupArchList="X64">X64/Wbinvd.asm</Filename>
+    <Filename SupArchList="X64">X64/Invd.asm</Filename>
+    <Filename SupArchList="X64">X64/FlushCacheLine.asm</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedIncrement.c</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedDecrement.c</Filename>
+    <Filename SupArchList="X64">X64/InterlockedCompareExchange32.asm</Filename>
+    <Filename SupArchList="X64">X64/InterlockedCompareExchange64.asm</Filename>
+    <Filename SupArchList="X64">X64/EnableInterrupts.asm</Filename>
+    <Filename SupArchList="X64">X64/DisableInterrupts.asm</Filename>
+    <Filename SupArchList="X64">X64/EnableDisableInterrupts.asm</Filename>
+    <Filename SupArchList="X64">X64/CpuSleep.asm</Filename>
+    <Filename SupArchList="X64">X64/CpuPause.asm</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/CpuBreakpoint.c</Filename>
+    <Filename SupArchList="X64">X64/CpuFlushTlb.asm</Filename>
+    <Filename SupArchList="X64">X64/Thunk16.asm</Filename>
+
+    <Filename SupArchList="IPF">Math64.c</Filename>
+    <Filename SupArchList="IPF">Ipf/asm.h</Filename>
+    <Filename SupArchList="IPF">Ipf/ia_64gen.h</Filename>
+    <Filename SupArchList="IPF">Ipf/PalCallStatic.s</Filename>
+    <Filename SupArchList="IPF">Ipf/setjmp.s</Filename>
+    <Filename SupArchList="IPF">Ipf/longjmp.s</Filename>
+    <Filename SupArchList="IPF">Ipf/SwitchStack.s</Filename>
+    <Filename SupArchList="IPF">Ipf/Unaligned.c</Filename>
+    <Filename SupArchList="IPF">Ipf/CpuBreakpoint.c</Filename>
+    <Filename SupArchList="IPF">Ipf/InterlockedCompareExchange32.s</Filename>
+    <Filename SupArchList="IPF">Ipf/InterlockedCompareExchange64.s</Filename>
+    <Filename SupArchList="IPF">Ipf/Synchronization.c</Filename>
+    <Filename SupArchList="IPF">Ipf/CpuPause.s</Filename>
+    <Filename SupArchList="IPF">Ipf/CpuFlushTlb.s</Filename>
+    <Filename SupArchList="IPF">Ipf/GetInterruptState.s</Filename>
+    <Filename SupArchList="IPF">Ipf/Non-existing.c</Filename>
+    <Filename SupArchList="IPF">Ipf/FlushCacheRange.s</Filename>
+    <Filename SupArchList="IPF">Ipf/ReadItc.s</Filename>
+
+    <Filename SupArchList="EBC">Math64.c</Filename>
+    <Filename SupArchList="EBC">Unaligned.c</Filename>
+    <Filename SupArchList="EBC">Ebc/SwitchStack.c</Filename>
+    <Filename SupArchList="EBC">Ebc/SetJumpLongJump.c</Filename>
+    <Filename SupArchList="EBC">Ebc/CpuBreakpoint.c</Filename>
+    <Filename SupArchList="EBC">Ebc/Synchronization.c</Filename>
+    <Filename>CheckSum.c</Filename>
+  </SourceFiles>
+  <NonProcessedFiles>
+    <Filename>Ia32/ARShiftU64.asm</Filename>
+    <Filename>Ia32/CpuBreakpoint.asm</Filename>
+    <Filename>Ia32/CpuFlushTlb.asm</Filename>
+    <Filename>Ia32/CpuId.asm</Filename>
+    <Filename>Ia32/CpuIdEx.asm</Filename>
+    <Filename>Ia32/CpuPause.asm</Filename>
+    <Filename>Ia32/CpuSleep.asm</Filename>
+    <Filename>Ia32/DisableInterrupts.asm</Filename>
+    <Filename>Ia32/DisablePaging32.asm</Filename>
+    <Filename>Ia32/DivU64x32.asm</Filename>
+    <Filename>Ia32/DivU64x32Remainder.asm</Filename>
+    <Filename>Ia32/DivU64x64Remainder.asm</Filename>
+    <Filename>Ia32/EnableDisableInterrupts.asm</Filename>
+    <Filename>Ia32/EnableInterrupts.asm</Filename>
+    <Filename>Ia32/EnablePaging32.asm</Filename>
+    <Filename>Ia32/EnablePaging64.asm</Filename>
+    <Filename>Ia32/FlushCacheLine.asm</Filename>
+    <Filename>Ia32/FxRestore.asm</Filename>
+    <Filename>Ia32/FxSave.asm</Filename>
+    <Filename>Ia32/InterlockedCompareExchange32.asm</Filename>
+    <Filename>Ia32/InterlockedCompareExchange64.asm</Filename>
+    <Filename>Ia32/InterlockedDecrement.asm</Filename>
+    <Filename>Ia32/InterlockedIncrement.asm</Filename>
+    <Filename>Ia32/Invd.asm</Filename>
+    <Filename>Ia32/LongJump.asm</Filename>
+    <Filename>Ia32/LRotU64.asm</Filename>
+    <Filename>Ia32/LShiftU64.asm</Filename>
+    <Filename>Ia32/ModU64x32.asm</Filename>
+    <Filename>Ia32/Monitor.asm</Filename>
+    <Filename>Ia32/MultU64x32.asm</Filename>
+    <Filename>Ia32/MultU64x64.asm</Filename>
+    <Filename>Ia32/Mwait.asm</Filename>
+    <Filename>Ia32/ReadCr0.asm</Filename>
+    <Filename>Ia32/ReadCr2.asm</Filename>
+    <Filename>Ia32/ReadCr3.asm</Filename>
+    <Filename>Ia32/ReadCr4.asm</Filename>
+    <Filename>Ia32/ReadCs.asm</Filename>
+    <Filename>Ia32/ReadDr0.asm</Filename>
+    <Filename>Ia32/ReadDr1.asm</Filename>
+    <Filename>Ia32/ReadDr2.asm</Filename>
+    <Filename>Ia32/ReadDr3.asm</Filename>
+    <Filename>Ia32/ReadDr4.asm</Filename>
+    <Filename>Ia32/ReadDr5.asm</Filename>
+    <Filename>Ia32/ReadDr6.asm</Filename>
+    <Filename>Ia32/ReadDr7.asm</Filename>
+    <Filename>Ia32/ReadDs.asm</Filename>
+    <Filename>Ia32/ReadEflags.asm</Filename>
+    <Filename>Ia32/ReadEs.asm</Filename>
+    <Filename>Ia32/ReadFs.asm</Filename>
+    <Filename>Ia32/ReadGdtr.asm</Filename>
+    <Filename>Ia32/ReadGs.asm</Filename>
+    <Filename>Ia32/ReadIdtr.asm</Filename>
+    <Filename>Ia32/ReadLdtr.asm</Filename>
+    <Filename>Ia32/ReadMm0.asm</Filename>
+    <Filename>Ia32/ReadMm1.asm</Filename>
+    <Filename>Ia32/ReadMm2.asm</Filename>
+    <Filename>Ia32/ReadMm3.asm</Filename>
+    <Filename>Ia32/ReadMm4.asm</Filename>
+    <Filename>Ia32/ReadMm5.asm</Filename>
+    <Filename>Ia32/ReadMm6.asm</Filename>
+    <Filename>Ia32/ReadMm7.asm</Filename>
+    <Filename>Ia32/ReadMsr64.asm</Filename>
+    <Filename>Ia32/ReadPmc.asm</Filename>
+    <Filename>Ia32/ReadSs.asm</Filename>
+    <Filename>Ia32/ReadTr.asm</Filename>
+    <Filename>Ia32/ReadTsc.asm</Filename>
+    <Filename>Ia32/RRotU64.asm</Filename>
+    <Filename>Ia32/RShiftU64.asm</Filename>
+    <Filename>Ia32/SetJump.asm</Filename>
+    <Filename>Ia32/SwapBytes64.asm</Filename>
+    <Filename>Ia32/Thunk16.asm</Filename>
+    <Filename>Ia32/Wbinvd.asm</Filename>
+    <Filename>Ia32/WriteCr0.asm</Filename>
+    <Filename>Ia32/WriteCr2.asm</Filename>
+    <Filename>Ia32/WriteCr3.asm</Filename>
+    <Filename>Ia32/WriteCr4.asm</Filename>
+    <Filename>Ia32/WriteDr0.asm</Filename>
+    <Filename>Ia32/WriteDr1.asm</Filename>
+    <Filename>Ia32/WriteDr2.asm</Filename>
+    <Filename>Ia32/WriteDr3.asm</Filename>
+    <Filename>Ia32/WriteDr4.asm</Filename>
+    <Filename>Ia32/WriteDr5.asm</Filename>
+    <Filename>Ia32/WriteDr6.asm</Filename>
+    <Filename>Ia32/WriteDr7.asm</Filename>
+    <Filename>Ia32/WriteGdtr.asm</Filename>
+    <Filename>Ia32/WriteIdtr.asm</Filename>
+    <Filename>Ia32/WriteLdtr.asm</Filename>
+    <Filename>Ia32/WriteMm0.asm</Filename>
+    <Filename>Ia32/WriteMm1.asm</Filename>
+    <Filename>Ia32/WriteMm2.asm</Filename>
+    <Filename>Ia32/WriteMm3.asm</Filename>
+    <Filename>Ia32/WriteMm4.asm</Filename>
+    <Filename>Ia32/WriteMm5.asm</Filename>
+    <Filename>Ia32/WriteMm6.asm</Filename>
+    <Filename>Ia32/WriteMm7.asm</Filename>
+    <Filename>Ia32/WriteMsr64.asm</Filename>
+  </NonProcessedFiles>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+  </PackageDependencies>
+  <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
+  </Externs>
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
+      <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
+      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum
+                number of characters (not counting the NULL-terminator) in a
+                Unicode string cannot exceed it.</HelpText>
+    </PcdEntry>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
+      <C_Name>PcdMaximumAsciiStringLength</C_Name>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
+      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number
+                of characters (not counting the NULL-terminator) in an ASCII
+                string cannot exceed it.</HelpText>
+    </PcdEntry>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
+      <C_Name>PcdMaximumLinkedListLength</C_Name>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
+      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number
+                of nodes (not counting the list header) in a linked list
+                cannot exceed it.</HelpText>
+    </PcdEntry>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
+      <C_Name>PcdSpinLockTimeout</C_Name>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
+      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout
+                value (unit: millisecond) for spin lock.</HelpText>
+    </PcdEntry>
+  </PcdCoded>
+</ModuleSurfaceArea>
diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h b/MdePkg/Library/BaseLib/BaseLibInternals.h
index d0b9ef6f20..8c55cdc6a9 100644
--- a/MdePkg/Library/BaseLib/BaseLibInternals.h
+++ b/MdePkg/Library/BaseLib/BaseLibInternals.h
@@ -1,793 +1,805 @@
-/** @file
-  Declaration of internal functions in BaseLib.
-
-  Copyright (c) 2006, Intel Corporation<BR>
-  All rights reserved. This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  Module Name:  BaseLibInternals.h
-
-**/
-
-#ifndef __BASE_LIB_INTERNALS__
-#define __BASE_LIB_INTERNALS__
-
-//
-// Math functions
-//
-
-/**
-  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
-  low Count bits are set to zero. The shifted value is returned.
-
-  @param  Operand The 64-bit operand to shift left.
-  @param  Count   The number of bits to shift left.
-
-  @return Operand << Count
-
-**/
-UINT64
-EFIAPI
-InternalMathLShiftU64 (
-  IN      UINT64                    Operand,
-  IN      UINTN                     Count
-  );
-
-/**
-  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
-  high Count bits are set to zero. The shifted value is returned.
-
-  @param  Operand The 64-bit operand to shift right.
-  @param  Count   The number of bits to shift right.
-
-  @return Operand >> Count
-
-**/
-UINT64
-EFIAPI
-InternalMathRShiftU64 (
-  IN      UINT64                    Operand,
-  IN      UINTN                     Count
-  );
-
-/**
-  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
-  high Count bits are set to bit 63 of Operand.  The shifted value is returned.
-
-  @param  Operand The 64-bit operand to shift right.
-  @param  Count   The number of bits to shift right.
-
-  @return Operand arithmetically shifted right by Count
-
-**/
-UINT64
-EFIAPI
-InternalMathARShiftU64 (
-  IN      UINT64                    Operand,
-  IN      UINTN                     Count
-  );
-
-/**
-  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
-  low Count bits are fill with the high Count bits of Operand. The rotated
-  value is returned.
-
-  @param  Operand The 64-bit operand to rotate left.
-  @param  Count   The number of bits to rotate left.
-
-  @return Operand <<< Count
-
-**/
-UINT64
-EFIAPI
-InternalMathLRotU64 (
-  IN      UINT64                    Operand,
-  IN      UINTN                     Count
-  );
-
-/**
-  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.
-  The high Count bits are fill with the low Count bits of Operand. The rotated
-  value is returned.
-
-  @param  Operand The 64-bit operand to rotate right.
-  @param  Count   The number of bits to rotate right.
-
-  @return Operand >>> Count
-
-**/
-UINT64
-EFIAPI
-InternalMathRRotU64 (
-  IN      UINT64                    Operand,
-  IN      UINTN                     Count
-  );
-
-/**
-  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
-  returned.
-
-  @param  Operand A 64-bit unsigned value.
-
-  @return The byte swaped Operand.
-
-**/
-UINT64
-EFIAPI
-InternalMathSwapBytes64 (
-  IN      UINT64                    Operand
-  );
-
-/**
-  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
-  unsigned value Multiplier and generates a 64-bit unsigned result. This 64-
-  bit unsigned result is returned.
-
-  @param  Multiplicand  A 64-bit unsigned value.
-  @param  Multiplier    A 32-bit unsigned value.
-
-  @return Multiplicand * Multiplier
-
-**/
-UINT64
-EFIAPI
-InternalMathMultU64x32 (
-  IN      UINT64                    Multiplicand,
-  IN      UINT32                    Multiplier
-  );
-
-/**
-  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
-  unsigned value Multiplier and generates a 64-bit unsigned result. This 64-
-  bit unsigned result is returned.
-
-  @param  Multiplicand  A 64-bit unsigned value.
-  @param  Multiplier    A 64-bit unsigned value.
-
-  @return Multiplicand * Multiplier
-
-**/
-UINT64
-EFIAPI
-InternalMathMultU64x64 (
-  IN      UINT64                    Multiplicand,
-  IN      UINT64                    Multiplier
-  );
-
-/**
-  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.
-
-   @param  Dividend  A 64-bit unsigned value.
-  @param  Divisor   A 32-bit unsigned value.
-
-  @return Dividend / Divisor
-
-**/
-UINT64
-EFIAPI
-InternalMathDivU64x32 (
-  IN      UINT64                    Dividend,
-  IN      UINT32                    Divisor
-  );
-
-/**
-  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
-  unsigned value Divisor and generates a 32-bit remainder. This function
-  returns the 32-bit unsigned remainder.
-
-  @param  Dividend  A 64-bit unsigned value.
-  @param  Divisor   A 32-bit unsigned value.
-
-  @return Dividend % Divisor
-
-**/
-UINT32
-EFIAPI
-InternalMathModU64x32 (
-  IN      UINT64                    Dividend,
-  IN      UINT32                    Divisor
-  );
-
-/**
-  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
-  unsigned value Divisor and generates a 64-bit unsigned quotient. If Remainder
-  is not NULL, then the 32-bit unsigned remainder is returned in Remainder.
-  This function returns the 64-bit unsigned quotient.
-
-  @param  Dividend  A 64-bit unsigned value.
-  @param  Divisor   A 32-bit unsigned value.
-  @param  Remainder A pointer to a 32-bit unsigned value. This parameter is
-                    optional and may be NULL.
-
-  @return Dividend / Divisor
-
-**/
-UINT64
-EFIAPI
-InternalMathDivRemU64x32 (
-  IN      UINT64                    Dividend,
-  IN      UINT32                    Divisor,
-  OUT     UINT32                    *Remainder
-  );
-
-/**
-  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
-  unsigned value Divisor and generates a 64-bit unsigned quotient. If Remainder
-  is not NULL, then the 64-bit unsigned remainder is returned in Remainder.
-  This function returns the 64-bit unsigned quotient.
-
-  @param  Dividend  A 64-bit unsigned value.
-  @param  Divisor   A 64-bit unsigned value.
-  @param  Remainder A pointer to a 64-bit unsigned value. This parameter is
-                    optional and may be NULL.
-
-  @return Dividend / Divisor
-
-**/
-UINT64
-EFIAPI
-InternalMathDivRemU64x64 (
-  IN      UINT64                    Dividend,
-  IN      UINT64                    Divisor,
-  OUT     UINT64                    *Remainder
-  );
-
-/**
-  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
-  unsigned value Divisor and generates a 64-bit unsigned quotient. If Remainder
-  is not NULL, then the 64-bit unsigned remainder is returned in Remainder.
-  This function returns the 64-bit unsigned quotient.
-
-  @param  Dividend  A 64-bit signed value.
-  @param  Divisor   A 64-bit signed value.
-  @param  Remainder A pointer to a 64-bit signed value. This parameter is
-                    optional and may be NULL.
-
-  @return Dividend / Divisor
-
-**/
-INT64
-InternalMathDivRemS64x64 (
-  IN      INT64                     Dividend,
-  IN      INT64                     Divisor,
-  OUT     INT64                     *Remainder  OPTIONAL
- );
-
-/**
-  Transfers control to a function starting with a new stack.
-
-  Transfers control to the function specified by EntryPoint using the new stack
-  specified by NewStack and passing in the parameters specified by Context1 and
-  Context2. Context1 and Context2 are optional and may be NULL. The function
-  EntryPoint must never return.
-
-  @param  EntryPoint  A pointer to function to call with the new stack.
-  @param  Context1    A pointer to the context to pass into the EntryPoint
-                      function.
-  @param  Context2    A pointer to the context to pass into the EntryPoint
-                      function.
-  @param  NewStack    A pointer to the new stack to use for the EntryPoint
-                      function.
-
-**/
-VOID
-EFIAPI
-InternalSwitchStack (
-  IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,
-  IN      VOID                      *Context2,
-  IN      VOID                      *NewStack
-  );
-
-//
-// Ia32 and x64 specific functions
-//
-
-/**
-  Reads the current Global Descriptor Table Register(GDTR) descriptor.
-
-  Reads and returns the current GDTR descriptor and returns it in Gdtr. This
-  function is only available on IA-32 and X64.
-
-  @param  Gdtr  Pointer to a GDTR descriptor.
-
-**/
-VOID
-EFIAPI
-InternalX86ReadGdtr (
-  OUT     IA32_DESCRIPTOR           *Gdtr
-  );
-
-/**
-  Writes the current Global Descriptor Table Register (GDTR) descriptor.
-
-  Writes and the current GDTR descriptor specified by Gdtr. This function is
-  only available on IA-32 and X64.
-
-  @param  Gdtr  Pointer to a GDTR descriptor.
-
-**/
-VOID
-EFIAPI
-InternalX86WriteGdtr (
-  IN      CONST IA32_DESCRIPTOR     *Gdtr
-  );
-
-/**
-  Reads the current Interrupt Descriptor Table Register(GDTR) descriptor.
-
-  Reads and returns the current IDTR descriptor and returns it in Idtr. This
-  function is only available on IA-32 and X64.
-
-  @param  Idtr  Pointer to a IDTR descriptor.
-
-**/
-VOID
-EFIAPI
-InternalX86ReadIdtr (
-  OUT     IA32_DESCRIPTOR           *Idtr
-  );
-
-/**
-  Writes the current Interrupt Descriptor Table Register(GDTR) descriptor.
-
-  Writes the current IDTR descriptor and returns it in Idtr. This function is
-  only available on IA-32 and X64.
-
-  @param  Idtr  Pointer to a IDTR descriptor.
-
-**/
-VOID
-EFIAPI
-InternalX86WriteIdtr (
-  IN      CONST IA32_DESCRIPTOR     *Idtr
-  );
-
-/**
-  Save the current floating point/SSE/SSE2 context to a buffer.
-
-  Saves the current floating point/SSE/SSE2 state to the buffer specified by
-  Buffer. Buffer must be aligned on a 16-byte boundary. This function is only
-  available on IA-32 and X64.
-
-  @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
-
-**/
-VOID
-EFIAPI
-InternalX86FxSave (
-  OUT     IA32_FX_BUFFER            *Buffer
-  );
-
-/**
-  Restores the current floating point/SSE/SSE2 context from a buffer.
-
-  Restores the current floating point/SSE/SSE2 state from the buffer specified
-  by Buffer. Buffer must be aligned on a 16-byte boundary. This function is
-  only available on IA-32 and X64.
-
-  @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
-
-**/
-VOID
-EFIAPI
-InternalX86FxRestore (
-  IN      CONST IA32_FX_BUFFER      *Buffer
-  );
-
-/**
-  Enables the 32-bit paging mode on the CPU.
-
-  Enables the 32-bit paging mode on the CPU. CR0, CR3, CR4, and the page tables
-  must be properly initialized prior to calling this service. This function
-  assumes the current execution mode is 32-bit protected mode. This function is
-  only available on IA-32. After the 32-bit paging mode is enabled, control is
-  transferred to the function specified by EntryPoint using the new stack
-  specified by NewStack and passing in the parameters specified by Context1 and
-  Context2. Context1 and Context2 are optional and may be NULL. The function
-  EntryPoint must never return.
-
-  There are a number of constraints that must be followed before calling this
-  function:
-  1)  Interrupts must be disabled.
-  2)  The caller must be in 32-bit protected mode with flat descriptors. This
-      means all descriptors must have a base of 0 and a limit of 4GB.
-  3)  CR0 and CR4 must be compatible with 32-bit protected mode with flat
-      descriptors.
-  4)  CR3 must point to valid page tables that will be used once the transition
-      is complete, and those page tables must guarantee that the pages for this
-      function and the stack are identity mapped.
-
-  @param  EntryPoint  A pointer to function to call with the new stack after
-                      paging is enabled.
-  @param  Context1    A pointer to the context to pass into the EntryPoint
-                      function as the first parameter after paging is enabled.
-  @param  Context2    A pointer to the context to pass into the EntryPoint
-                      function as the second parameter after paging is enabled.
-  @param  NewStack    A pointer to the new stack to use for the EntryPoint
-                      function after paging is enabled.
-
-**/
-VOID
-EFIAPI
-InternalX86EnablePaging32 (
-  IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
-  IN      VOID                      *NewStack
-  );
-
-/**
-  Disables the 32-bit paging mode on the CPU.
-
-  Disables the 32-bit paging mode on the CPU and returns to 32-bit protected
-  mode. This function assumes the current execution mode is 32-paged protected
-  mode. This function is only available on IA-32. After the 32-bit paging mode
-  is disabled, control is transferred to the function specified by EntryPoint
-  using the new stack specified by NewStack and passing in the parameters
-  specified by Context1 and Context2. Context1 and Context2 are optional and
-  may be NULL. The function EntryPoint must never return.
-
-  There are a number of constraints that must be followed before calling this
-  function:
-  1)  Interrupts must be disabled.
-  2)  The caller must be in 32-bit paged mode.
-  3)  CR0, CR3, and CR4 must be compatible with 32-bit paged mode.
-  4)  CR3 must point to valid page tables that guarantee that the pages for
-      this function and the stack are identity mapped.
-
-  @param  EntryPoint  A pointer to function to call with the new stack after
-                      paging is disabled.
-  @param  Context1    A pointer to the context to pass into the EntryPoint
-                      function as the first parameter after paging is disabled.
-  @param  Context2    A pointer to the context to pass into the EntryPoint
-                      function as the second parameter after paging is
-                      disabled.
-  @param  NewStack    A pointer to the new stack to use for the EntryPoint
-                      function after paging is disabled.
-
-**/
-VOID
-EFIAPI
-InternalX86DisablePaging32 (
-  IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
-  IN      VOID                      *Context1,  OPTIONAL
-  IN      VOID                      *Context2,  OPTIONAL
-  IN      VOID                      *NewStack
-  );
-
-/**
-  Enables the 64-bit paging mode on the CPU.
-
-  Enables the 64-bit paging mode on the CPU. CR0, CR3, CR4, and the page tables
-  must be properly initialized prior to calling this service. This function
-  assumes the current execution mode is 32-bit protected mode with flat
-  descriptors. This function is only available on IA-32. After the 64-bit
-  paging mode is enabled, control is transferred to the function specified by
-  EntryPoint using the new stack specified by NewStack and passing in the
-  parameters specified by Context1 and Context2. Context1 and Context2 are
-  optional and may be 0. The function EntryPoint must never return.
-
-  @param  Cs          The 16-bit selector to load in the CS before EntryPoint
-                      is called. The descriptor in the GDT that this selector
-                      references must be setup for long mode.
-  @param  EntryPoint  The 64-bit virtual address of the function to call with
-                      the new stack after paging is enabled.
-  @param  Context1    The 64-bit virtual address of the context to pass into
-                      the EntryPoint function as the first parameter after
-                      paging is enabled.
-  @param  Context2    The 64-bit virtual address of the context to pass into
-                      the EntryPoint function as the second parameter after
-                      paging is enabled.
-  @param  NewStack    The 64-bit virtual address of the new stack to use for
-                      the EntryPoint function after paging is enabled.
-
-**/
-VOID
-EFIAPI
-InternalX86EnablePaging64 (
-  IN      UINT16                    Cs,
-  IN      UINT64                    EntryPoint,
-  IN      UINT64                    Context1,  OPTIONAL
-  IN      UINT64                    Context2,  OPTIONAL
-  IN      UINT64                    NewStack
-  );
-
-/**
-  Disables the 64-bit paging mode on the CPU.
-
-  Disables the 64-bit paging mode on the CPU and returns to 32-bit protected
-  mode. This function assumes the current execution mode is 64-paging mode.
-  This function is only available on X64. After the 64-bit paging mode is
-  disabled, control is transferred to the function specified by EntryPoint
-  using the new stack specified by NewStack and passing in the parameters
-  specified by Context1 and Context2. Context1 and Context2 are optional and
-  may be 0. The function EntryPoint must never return.
-
-  @param  Cs          The 16-bit selector to load in the CS before EntryPoint
-                      is called. The descriptor in the GDT that this selector
-                      references must be setup for 32-bit protected mode.
-  @param  EntryPoint  The 64-bit virtual address of the function to call with
-                      the new stack after paging is disabled.
-  @param  Context1    The 64-bit virtual address of the context to pass into
-                      the EntryPoint function as the first parameter after
-                      paging is disabled.
-  @param  Context2    The 64-bit virtual address of the context to pass into
-                      the EntryPoint function as the second parameter after
-                      paging is disabled.
-  @param  NewStack    The 64-bit virtual address of the new stack to use for
-                      the EntryPoint function after paging is disabled.
-
-**/
-VOID
-EFIAPI
-InternalX86DisablePaging64 (
-  IN      UINT16                    Cs,
-  IN      UINT32                    EntryPoint,
-  IN      UINT32                    Context1,  OPTIONAL
-  IN      UINT32                    Context2,  OPTIONAL
-  IN      UINT32                    NewStack
-  );
-
-/**
-  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,
-  verifies the validity of this list.
-
-  If List is NULL, then ASSERT().
-  If List->ForwardLink is NULL, then ASSERT().
-  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
-  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
-
-**/
-BOOLEAN
-IsNodeInList (
-  IN      CONST LIST_ENTRY      *List,
-  IN      CONST LIST_ENTRY      *Node
-  );
-
-/**
-  Performs an atomic increment of an 32-bit unsigned integer.
-
-  Performs an atomic increment of the 32-bit unsigned integer specified by
-  Value and returns the incremented value. The increment operation must be
-  performed using MP safe mechanisms. The state of the return value is not
-  guaranteed to be MP safe.
-
-  @param  Value A pointer to the 32-bit value to increment.
-
-  @return The incremented value.
-
-**/
-UINT32
-EFIAPI
-InternalSyncIncrement (
-  IN      volatile UINT32           *Value
-  );
-
-/**
-  Performs an atomic decrement of an 32-bit unsigned integer.
-
-  Performs an atomic decrement of the 32-bit unsigned integer specified by
-  Value and returns the decrement value. The decrement operation must be
-  performed using MP safe mechanisms. The state of the return value is not
-  guaranteed to be MP safe.
-
-  @param  Value A pointer to the 32-bit value to decrement.
-
-  @return The decrement value.
-
-**/
-UINT32
-EFIAPI
-InternalSyncDecrement (
-  IN      volatile UINT32           *Value
-  );
-
-/**
-  Performs an atomic compare exchange operation on a 32-bit unsigned integer.
-
-  Performs an atomic compare exchange operation on the 32-bit unsigned integer
-  specified by Value.  If Value is equal to CompareValue, then Value is set to 
-  ExchangeValue and CompareValue is returned.  If Value is not equal to CompareValue,
-  then Value is returned.  The compare exchange operation must be performed using 
-  MP safe mechanisms.
-
-  @param  Value         A pointer to the 32-bit value for the compare exchange
-                        operation.
-  @param  CompareValue  32-bit value used in compare operation.
-  @param  ExchangeValue 32-bit value used in exchange operation.
-
-  @return The original *Value before exchange.
-
-**/
-UINT32
-EFIAPI
-InternalSyncCompareExchange32 (
-  IN      volatile UINT32           *Value,
-  IN      UINT32                    CompareValue,
-  IN      UINT32                    ExchangeValue
-  );
-
-/**
-  Performs an atomic compare exchange operation on a 64-bit unsigned integer.
-
-  Performs an atomic compare exchange operation on the 64-bit unsigned integer specified 
-  by Value.  If Value is equal to CompareValue, then Value is set to ExchangeValue and 
-  CompareValue is returned.  If Value is not equal to CompareValue, then Value is returned. 
-  The compare exchange operation must be performed using MP safe mechanisms.
-
-  @param  Value         A pointer to the 64-bit value for the compare exchange
-                        operation.
-  @param  CompareValue  64-bit value used in compare operation.
-  @param  ExchangeValue 64-bit value used in exchange operation.
-
-  @return The original *Value before exchange.
-
-**/
-UINT64
-EFIAPI
-InternalSyncCompareExchange64 (
-  IN      volatile UINT64           *Value,
-  IN      UINT64                    CompareValue,
-  IN      UINT64                    ExchangeValue
-  );
-
-/**
-  Worker function that returns a bit field from Operand
-
-  Returns the bitfield specified by the StartBit and the EndBit from Operand.
-
-  @param  Operand   Operand on which to perform the bitfield operation.
-  @param  StartBit  The ordinal of the least significant bit in the bit field.
-  @param  EndBit    The ordinal of the most significant bit in the bit field.
-
-  @return The bit field read.
-
-**/
-unsigned int
-BitFieldReadUint (
-  IN      unsigned int              Operand,
-  IN      UINTN                     StartBit,
-  IN      UINTN                     EndBit
-  );
-
-/**
-  Worker function that reads a bit field from Operand, performs a bitwise OR, 
-  and returns the result.
-
-  Performs a bitwise OR between the bit field specified by StartBit and EndBit
-  in Operand and the value specified by AndData. All other bits in Operand are
-  preserved. The new value is returned.
-
-  @param  Operand   Operand on which to perform the bitfield operation.
-  @param  StartBit  The ordinal of the least significant bit in the bit field.
-  @param  EndBit    The ordinal of the most significant bit in the bit field.
-  @param  OrData    The value to OR with the read value from the value
-
-  @return The new value.
-
-**/
-unsigned int
-BitFieldOrUint (
-  IN      unsigned int              Operand,
-  IN      UINTN                     StartBit,
-  IN      UINTN                     EndBit,
-  IN      unsigned int              OrData
-  );
-
-/**
-  Worker function that reads a bit field from Operand, performs a bitwise AND, 
-  and returns the result.
-
-  Performs a bitwise AND between the bit field specified by StartBit and EndBit
-  in Operand and the value specified by AndData. All other bits in Operand are
-  preserved. The new value is returned.
-
-  @param  Operand   Operand on which to perform the bitfield operation.
-  @param  StartBit  The ordinal of the least significant bit in the bit field.
-  @param  EndBit    The ordinal of the most significant bit in the bit field.
-  @param  AndData    The value to And with the read value from the value
-
-  @return The new value.
-
-**/
-unsigned int
-BitFieldAndUint (
-  IN      unsigned int              Operand,
-  IN      UINTN                     StartBit,
-  IN      UINTN                     EndBit,
-  IN      unsigned int              AndData
-  );
-
-/**
-  Worker function that checks ASSERT condition for JumpBuffer
-
-  Checks ASSERT condition for JumpBuffer.
-
-  If JumpBuffer is NULL, then ASSERT().
-  For IPF CPUs, if JumpBuffer is not aligned on a 16-byte boundary, then ASSERT().
-
-  @param  JumpBuffer    A pointer to CPU context buffer.
-
-**/
-VOID
-InternalAssertJumpBuffer (
-  IN      BASE_LIBRARY_JUMP_BUFFER  *JumpBuffer
-  );
-
-/**
-  Restores the CPU context that was saved with SetJump().
-
-  Restores the CPU context from the buffer specified by JumpBuffer.
-  This function never returns to the caller.
-  Instead is resumes execution based on the state of JumpBuffer.
-
-  @param  JumpBuffer    A pointer to CPU context buffer.
-  @param  Value         The value to return when the SetJump() context is restored.
-
-**/
-VOID
-EFIAPI
-InternalLongJump (
-  IN      BASE_LIBRARY_JUMP_BUFFER  *JumpBuffer,
-  IN      UINTN                     Value
-  );
-
-#endif
+/** @file
+  Declaration of internal functions in BaseLib.
+
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
+  All rights reserved. This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  Module Name:  BaseLibInternals.h
+
+**/
+
+#ifndef __BASE_LIB_INTERNALS__
+#define __BASE_LIB_INTERNALS__
+
+#define QUIENT_MAX_UINTN_DIVIDED_BY_10      ((UINTN) -1 / 10)
+#define REMINDER_MAX_UINTN_DIVIDED_BY_10    ((UINTN) -1 % 10)
+
+#define QUIENT_MAX_UINTN_DIVIDED_BY_16      ((UINTN) -1 / 16)
+#define REMINDER_MAX_UINTN_DIVIDED_BY_16    ((UINTN) -1 % 16)
+
+#define QUIENT_MAX_UINT64_DIVIDED_BY_10      ((UINT64) -1 / 10)
+#define REMINDER_MAX_UINT64_DIVIDED_BY_10    ((UINT64) -1 % 10)
+
+#define QUIENT_MAX_UINT64_DIVIDED_BY_16      ((UINT64) -1 / 16)
+#define REMINDER_MAX_UINT64_DIVIDED_BY_16    ((UINT64) -1 % 16)
+
+//
+// Math functions
+//
+
+/**
+  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
+  low Count bits are set to zero. The shifted value is returned.
+
+  @param  Operand The 64-bit operand to shift left.
+  @param  Count   The number of bits to shift left.
+
+  @return Operand << Count
+
+**/
+UINT64
+EFIAPI
+InternalMathLShiftU64 (
+  IN      UINT64                    Operand,
+  IN      UINTN                     Count
+  );
+
+/**
+  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
+  high Count bits are set to zero. The shifted value is returned.
+
+  @param  Operand The 64-bit operand to shift right.
+  @param  Count   The number of bits to shift right.
+
+  @return Operand >> Count
+
+**/
+UINT64
+EFIAPI
+InternalMathRShiftU64 (
+  IN      UINT64                    Operand,
+  IN      UINTN                     Count
+  );
+
+/**
+  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
+  high Count bits are set to bit 63 of Operand.  The shifted value is returned.
+
+  @param  Operand The 64-bit operand to shift right.
+  @param  Count   The number of bits to shift right.
+
+  @return Operand arithmetically shifted right by Count
+
+**/
+UINT64
+EFIAPI
+InternalMathARShiftU64 (
+  IN      UINT64                    Operand,
+  IN      UINTN                     Count
+  );
+
+/**
+  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
+  low Count bits are fill with the high Count bits of Operand. The rotated
+  value is returned.
+
+  @param  Operand The 64-bit operand to rotate left.
+  @param  Count   The number of bits to rotate left.
+
+  @return Operand <<< Count
+
+**/
+UINT64
+EFIAPI
+InternalMathLRotU64 (
+  IN      UINT64                    Operand,
+  IN      UINTN                     Count
+  );
+
+/**
+  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.
+  The high Count bits are fill with the low Count bits of Operand. The rotated
+  value is returned.
+
+  @param  Operand The 64-bit operand to rotate right.
+  @param  Count   The number of bits to rotate right.
+
+  @return Operand >>> Count
+
+**/
+UINT64
+EFIAPI
+InternalMathRRotU64 (
+  IN      UINT64                    Operand,
+  IN      UINTN                     Count
+  );
+
+/**
+  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
+  returned.
+
+  @param  Operand A 64-bit unsigned value.
+
+  @return The byte swaped Operand.
+
+**/
+UINT64
+EFIAPI
+InternalMathSwapBytes64 (
+  IN      UINT64                    Operand
+  );
+
+/**
+  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
+  unsigned value Multiplier and generates a 64-bit unsigned result. This 64-
+  bit unsigned result is returned.
+
+  @param  Multiplicand  A 64-bit unsigned value.
+  @param  Multiplier    A 32-bit unsigned value.
+
+  @return Multiplicand * Multiplier
+
+**/
+UINT64
+EFIAPI
+InternalMathMultU64x32 (
+  IN      UINT64                    Multiplicand,
+  IN      UINT32                    Multiplier
+  );
+
+/**
+  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
+  unsigned value Multiplier and generates a 64-bit unsigned result. This 64-
+  bit unsigned result is returned.
+
+  @param  Multiplicand  A 64-bit unsigned value.
+  @param  Multiplier    A 64-bit unsigned value.
+
+  @return Multiplicand * Multiplier
+
+**/
+UINT64
+EFIAPI
+InternalMathMultU64x64 (
+  IN      UINT64                    Multiplicand,
+  IN      UINT64                    Multiplier
+  );
+
+/**
+  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.
+
+   @param  Dividend  A 64-bit unsigned value.
+  @param  Divisor   A 32-bit unsigned value.
+
+  @return Dividend / Divisor
+
+**/
+UINT64
+EFIAPI
+InternalMathDivU64x32 (
+  IN      UINT64                    Dividend,
+  IN      UINT32                    Divisor
+  );
+
+/**
+  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
+  unsigned value Divisor and generates a 32-bit remainder. This function
+  returns the 32-bit unsigned remainder.
+
+  @param  Dividend  A 64-bit unsigned value.
+  @param  Divisor   A 32-bit unsigned value.
+
+  @return Dividend % Divisor
+
+**/
+UINT32
+EFIAPI
+InternalMathModU64x32 (
+  IN      UINT64                    Dividend,
+  IN      UINT32                    Divisor
+  );
+
+/**
+  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
+  unsigned value Divisor and generates a 64-bit unsigned quotient. If Remainder
+  is not NULL, then the 32-bit unsigned remainder is returned in Remainder.
+  This function returns the 64-bit unsigned quotient.
+
+  @param  Dividend  A 64-bit unsigned value.
+  @param  Divisor   A 32-bit unsigned value.
+  @param  Remainder A pointer to a 32-bit unsigned value. This parameter is
+                    optional and may be NULL.
+
+  @return Dividend / Divisor
+
+**/
+UINT64
+EFIAPI
+InternalMathDivRemU64x32 (
+  IN      UINT64                    Dividend,
+  IN      UINT32                    Divisor,
+  OUT     UINT32                    *Remainder
+  );
+
+/**
+  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
+  unsigned value Divisor and generates a 64-bit unsigned quotient. If Remainder
+  is not NULL, then the 64-bit unsigned remainder is returned in Remainder.
+  This function returns the 64-bit unsigned quotient.
+
+  @param  Dividend  A 64-bit unsigned value.
+  @param  Divisor   A 64-bit unsigned value.
+  @param  Remainder A pointer to a 64-bit unsigned value. This parameter is
+                    optional and may be NULL.
+
+  @return Dividend / Divisor
+
+**/
+UINT64
+EFIAPI
+InternalMathDivRemU64x64 (
+  IN      UINT64                    Dividend,
+  IN      UINT64                    Divisor,
+  OUT     UINT64                    *Remainder
+  );
+
+/**
+  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
+  unsigned value Divisor and generates a 64-bit unsigned quotient. If Remainder
+  is not NULL, then the 64-bit unsigned remainder is returned in Remainder.
+  This function returns the 64-bit unsigned quotient.
+
+  @param  Dividend  A 64-bit signed value.
+  @param  Divisor   A 64-bit signed value.
+  @param  Remainder A pointer to a 64-bit signed value. This parameter is
+                    optional and may be NULL.
+
+  @return Dividend / Divisor
+
+**/
+INT64
+InternalMathDivRemS64x64 (
+  IN      INT64                     Dividend,
+  IN      INT64                     Divisor,
+  OUT     INT64                     *Remainder  OPTIONAL
+ );
+
+/**
+  Transfers control to a function starting with a new stack.
+
+  Transfers control to the function specified by EntryPoint using the new stack
+  specified by NewStack and passing in the parameters specified by Context1 and
+  Context2. Context1 and Context2 are optional and may be NULL. The function
+  EntryPoint must never return.
+
+  @param  EntryPoint  A pointer to function to call with the new stack.
+  @param  Context1    A pointer to the context to pass into the EntryPoint
+                      function.
+  @param  Context2    A pointer to the context to pass into the EntryPoint
+                      function.
+  @param  NewStack    A pointer to the new stack to use for the EntryPoint
+                      function.
+
+**/
+VOID
+EFIAPI
+InternalSwitchStack (
+  IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
+  IN      VOID                      *Context1,
+  IN      VOID                      *Context2,
+  IN      VOID                      *NewStack
+  );
+
+//
+// Ia32 and x64 specific functions
+//
+
+/**
+  Reads the current Global Descriptor Table Register(GDTR) descriptor.
+
+  Reads and returns the current GDTR descriptor and returns it in Gdtr. This
+  function is only available on IA-32 and X64.
+
+  @param  Gdtr  Pointer to a GDTR descriptor.
+
+**/
+VOID
+EFIAPI
+InternalX86ReadGdtr (
+  OUT     IA32_DESCRIPTOR           *Gdtr
+  );
+
+/**
+  Writes the current Global Descriptor Table Register (GDTR) descriptor.
+
+  Writes and the current GDTR descriptor specified by Gdtr. This function is
+  only available on IA-32 and X64.
+
+  @param  Gdtr  Pointer to a GDTR descriptor.
+
+**/
+VOID
+EFIAPI
+InternalX86WriteGdtr (
+  IN      CONST IA32_DESCRIPTOR     *Gdtr
+  );
+
+/**
+  Reads the current Interrupt Descriptor Table Register(GDTR) descriptor.
+
+  Reads and returns the current IDTR descriptor and returns it in Idtr. This
+  function is only available on IA-32 and X64.
+
+  @param  Idtr  Pointer to a IDTR descriptor.
+
+**/
+VOID
+EFIAPI
+InternalX86ReadIdtr (
+  OUT     IA32_DESCRIPTOR           *Idtr
+  );
+
+/**
+  Writes the current Interrupt Descriptor Table Register(GDTR) descriptor.
+
+  Writes the current IDTR descriptor and returns it in Idtr. This function is
+  only available on IA-32 and X64.
+
+  @param  Idtr  Pointer to a IDTR descriptor.
+
+**/
+VOID
+EFIAPI
+InternalX86WriteIdtr (
+  IN      CONST IA32_DESCRIPTOR     *Idtr
+  );
+
+/**
+  Save the current floating point/SSE/SSE2 context to a buffer.
+
+  Saves the current floating point/SSE/SSE2 state to the buffer specified by
+  Buffer. Buffer must be aligned on a 16-byte boundary. This function is only
+  available on IA-32 and X64.
+
+  @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
+
+**/
+VOID
+EFIAPI
+InternalX86FxSave (
+  OUT     IA32_FX_BUFFER            *Buffer
+  );
+
+/**
+  Restores the current floating point/SSE/SSE2 context from a buffer.
+
+  Restores the current floating point/SSE/SSE2 state from the buffer specified
+  by Buffer. Buffer must be aligned on a 16-byte boundary. This function is
+  only available on IA-32 and X64.
+
+  @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
+
+**/
+VOID
+EFIAPI
+InternalX86FxRestore (
+  IN      CONST IA32_FX_BUFFER      *Buffer
+  );
+
+/**
+  Enables the 32-bit paging mode on the CPU.
+
+  Enables the 32-bit paging mode on the CPU. CR0, CR3, CR4, and the page tables
+  must be properly initialized prior to calling this service. This function
+  assumes the current execution mode is 32-bit protected mode. This function is
+  only available on IA-32. After the 32-bit paging mode is enabled, control is
+  transferred to the function specified by EntryPoint using the new stack
+  specified by NewStack and passing in the parameters specified by Context1 and
+  Context2. Context1 and Context2 are optional and may be NULL. The function
+  EntryPoint must never return.
+
+  There are a number of constraints that must be followed before calling this
+  function:
+  1)  Interrupts must be disabled.
+  2)  The caller must be in 32-bit protected mode with flat descriptors. This
+      means all descriptors must have a base of 0 and a limit of 4GB.
+  3)  CR0 and CR4 must be compatible with 32-bit protected mode with flat
+      descriptors.
+  4)  CR3 must point to valid page tables that will be used once the transition
+      is complete, and those page tables must guarantee that the pages for this
+      function and the stack are identity mapped.
+
+  @param  EntryPoint  A pointer to function to call with the new stack after
+                      paging is enabled.
+  @param  Context1    A pointer to the context to pass into the EntryPoint
+                      function as the first parameter after paging is enabled.
+  @param  Context2    A pointer to the context to pass into the EntryPoint
+                      function as the second parameter after paging is enabled.
+  @param  NewStack    A pointer to the new stack to use for the EntryPoint
+                      function after paging is enabled.
+
+**/
+VOID
+EFIAPI
+InternalX86EnablePaging32 (
+  IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
+  IN      VOID                      *Context1,  OPTIONAL
+  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *NewStack
+  );
+
+/**
+  Disables the 32-bit paging mode on the CPU.
+
+  Disables the 32-bit paging mode on the CPU and returns to 32-bit protected
+  mode. This function assumes the current execution mode is 32-paged protected
+  mode. This function is only available on IA-32. After the 32-bit paging mode
+  is disabled, control is transferred to the function specified by EntryPoint
+  using the new stack specified by NewStack and passing in the parameters
+  specified by Context1 and Context2. Context1 and Context2 are optional and
+  may be NULL. The function EntryPoint must never return.
+
+  There are a number of constraints that must be followed before calling this
+  function:
+  1)  Interrupts must be disabled.
+  2)  The caller must be in 32-bit paged mode.
+  3)  CR0, CR3, and CR4 must be compatible with 32-bit paged mode.
+  4)  CR3 must point to valid page tables that guarantee that the pages for
+      this function and the stack are identity mapped.
+
+  @param  EntryPoint  A pointer to function to call with the new stack after
+                      paging is disabled.
+  @param  Context1    A pointer to the context to pass into the EntryPoint
+                      function as the first parameter after paging is disabled.
+  @param  Context2    A pointer to the context to pass into the EntryPoint
+                      function as the second parameter after paging is
+                      disabled.
+  @param  NewStack    A pointer to the new stack to use for the EntryPoint
+                      function after paging is disabled.
+
+**/
+VOID
+EFIAPI
+InternalX86DisablePaging32 (
+  IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
+  IN      VOID                      *Context1,  OPTIONAL
+  IN      VOID                      *Context2,  OPTIONAL
+  IN      VOID                      *NewStack
+  );
+
+/**
+  Enables the 64-bit paging mode on the CPU.
+
+  Enables the 64-bit paging mode on the CPU. CR0, CR3, CR4, and the page tables
+  must be properly initialized prior to calling this service. This function
+  assumes the current execution mode is 32-bit protected mode with flat
+  descriptors. This function is only available on IA-32. After the 64-bit
+  paging mode is enabled, control is transferred to the function specified by
+  EntryPoint using the new stack specified by NewStack and passing in the
+  parameters specified by Context1 and Context2. Context1 and Context2 are
+  optional and may be 0. The function EntryPoint must never return.
+
+  @param  Cs          The 16-bit selector to load in the CS before EntryPoint
+                      is called. The descriptor in the GDT that this selector
+                      references must be setup for long mode.
+  @param  EntryPoint  The 64-bit virtual address of the function to call with
+                      the new stack after paging is enabled.
+  @param  Context1    The 64-bit virtual address of the context to pass into
+                      the EntryPoint function as the first parameter after
+                      paging is enabled.
+  @param  Context2    The 64-bit virtual address of the context to pass into
+                      the EntryPoint function as the second parameter after
+                      paging is enabled.
+  @param  NewStack    The 64-bit virtual address of the new stack to use for
+                      the EntryPoint function after paging is enabled.
+
+**/
+VOID
+EFIAPI
+InternalX86EnablePaging64 (
+  IN      UINT16                    Cs,
+  IN      UINT64                    EntryPoint,
+  IN      UINT64                    Context1,  OPTIONAL
+  IN      UINT64                    Context2,  OPTIONAL
+  IN      UINT64                    NewStack
+  );
+
+/**
+  Disables the 64-bit paging mode on the CPU.
+
+  Disables the 64-bit paging mode on the CPU and returns to 32-bit protected
+  mode. This function assumes the current execution mode is 64-paging mode.
+  This function is only available on X64. After the 64-bit paging mode is
+  disabled, control is transferred to the function specified by EntryPoint
+  using the new stack specified by NewStack and passing in the parameters
+  specified by Context1 and Context2. Context1 and Context2 are optional and
+  may be 0. The function EntryPoint must never return.
+
+  @param  Cs          The 16-bit selector to load in the CS before EntryPoint
+                      is called. The descriptor in the GDT that this selector
+                      references must be setup for 32-bit protected mode.
+  @param  EntryPoint  The 64-bit virtual address of the function to call with
+                      the new stack after paging is disabled.
+  @param  Context1    The 64-bit virtual address of the context to pass into
+                      the EntryPoint function as the first parameter after
+                      paging is disabled.
+  @param  Context2    The 64-bit virtual address of the context to pass into
+                      the EntryPoint function as the second parameter after
+                      paging is disabled.
+  @param  NewStack    The 64-bit virtual address of the new stack to use for
+                      the EntryPoint function after paging is disabled.
+
+**/
+VOID
+EFIAPI
+InternalX86DisablePaging64 (
+  IN      UINT16                    Cs,
+  IN      UINT32                    EntryPoint,
+  IN      UINT32                    Context1,  OPTIONAL
+  IN      UINT32                    Context2,  OPTIONAL
+  IN      UINT32                    NewStack
+  );
+
+/**
+  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,
+  verifies the validity of this list.
+
+  If List is NULL, then ASSERT().
+  If List->ForwardLink is NULL, then ASSERT().
+  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
+  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
+
+**/
+BOOLEAN
+IsNodeInList (
+  IN      CONST LIST_ENTRY      *List,
+  IN      CONST LIST_ENTRY      *Node
+  );
+
+/**
+  Performs an atomic increment of an 32-bit unsigned integer.
+
+  Performs an atomic increment of the 32-bit unsigned integer specified by
+  Value and returns the incremented value. The increment operation must be
+  performed using MP safe mechanisms. The state of the return value is not
+  guaranteed to be MP safe.
+
+  @param  Value A pointer to the 32-bit value to increment.
+
+  @return The incremented value.
+
+**/
+UINT32
+EFIAPI
+InternalSyncIncrement (
+  IN      volatile UINT32           *Value
+  );
+
+/**
+  Performs an atomic decrement of an 32-bit unsigned integer.
+
+  Performs an atomic decrement of the 32-bit unsigned integer specified by
+  Value and returns the decrement value. The decrement operation must be
+  performed using MP safe mechanisms. The state of the return value is not
+  guaranteed to be MP safe.
+
+  @param  Value A pointer to the 32-bit value to decrement.
+
+  @return The decrement value.
+
+**/
+UINT32
+EFIAPI
+InternalSyncDecrement (
+  IN      volatile UINT32           *Value
+  );
+
+/**
+  Performs an atomic compare exchange operation on a 32-bit unsigned integer.
+
+  Performs an atomic compare exchange operation on the 32-bit unsigned integer
+  specified by Value.  If Value is equal to CompareValue, then Value is set to 
+  ExchangeValue and CompareValue is returned.  If Value is not equal to CompareValue,
+  then Value is returned.  The compare exchange operation must be performed using 
+  MP safe mechanisms.
+
+  @param  Value         A pointer to the 32-bit value for the compare exchange
+                        operation.
+  @param  CompareValue  32-bit value used in compare operation.
+  @param  ExchangeValue 32-bit value used in exchange operation.
+
+  @return The original *Value before exchange.
+
+**/
+UINT32
+EFIAPI
+InternalSyncCompareExchange32 (
+  IN      volatile UINT32           *Value,
+  IN      UINT32                    CompareValue,
+  IN      UINT32                    ExchangeValue
+  );
+
+/**
+  Performs an atomic compare exchange operation on a 64-bit unsigned integer.
+
+  Performs an atomic compare exchange operation on the 64-bit unsigned integer specified 
+  by Value.  If Value is equal to CompareValue, then Value is set to ExchangeValue and 
+  CompareValue is returned.  If Value is not equal to CompareValue, then Value is returned. 
+  The compare exchange operation must be performed using MP safe mechanisms.
+
+  @param  Value         A pointer to the 64-bit value for the compare exchange
+                        operation.
+  @param  CompareValue  64-bit value used in compare operation.
+  @param  ExchangeValue 64-bit value used in exchange operation.
+
+  @return The original *Value before exchange.
+
+**/
+UINT64
+EFIAPI
+InternalSyncCompareExchange64 (
+  IN      volatile UINT64           *Value,
+  IN      UINT64                    CompareValue,
+  IN      UINT64                    ExchangeValue
+  );
+
+/**
+  Worker function that returns a bit field from Operand
+
+  Returns the bitfield specified by the StartBit and the EndBit from Operand.
+
+  @param  Operand   Operand on which to perform the bitfield operation.
+  @param  StartBit  The ordinal of the least significant bit in the bit field.
+  @param  EndBit    The ordinal of the most significant bit in the bit field.
+
+  @return The bit field read.
+
+**/
+unsigned int
+BitFieldReadUint (
+  IN      unsigned int              Operand,
+  IN      UINTN                     StartBit,
+  IN      UINTN                     EndBit
+  );
+
+/**
+  Worker function that reads a bit field from Operand, performs a bitwise OR, 
+  and returns the result.
+
+  Performs a bitwise OR between the bit field specified by StartBit and EndBit
+  in Operand and the value specified by AndData. All other bits in Operand are
+  preserved. The new value is returned.
+
+  @param  Operand   Operand on which to perform the bitfield operation.
+  @param  StartBit  The ordinal of the least significant bit in the bit field.
+  @param  EndBit    The ordinal of the most significant bit in the bit field.
+  @param  OrData    The value to OR with the read value from the value
+
+  @return The new value.
+
+**/
+unsigned int
+BitFieldOrUint (
+  IN      unsigned int              Operand,
+  IN      UINTN                     StartBit,
+  IN      UINTN                     EndBit,
+  IN      unsigned int              OrData
+  );
+
+/**
+  Worker function that reads a bit field from Operand, performs a bitwise AND, 
+  and returns the result.
+
+  Performs a bitwise AND between the bit field specified by StartBit and EndBit
+  in Operand and the value specified by AndData. All other bits in Operand are
+  preserved. The new value is returned.
+
+  @param  Operand   Operand on which to perform the bitfield operation.
+  @param  StartBit  The ordinal of the least significant bit in the bit field.
+  @param  EndBit    The ordinal of the most significant bit in the bit field.
+  @param  AndData    The value to And with the read value from the value
+
+  @return The new value.
+
+**/
+unsigned int
+BitFieldAndUint (
+  IN      unsigned int              Operand,
+  IN      UINTN                     StartBit,
+  IN      UINTN                     EndBit,
+  IN      unsigned int              AndData
+  );
+
+/**
+  Worker function that checks ASSERT condition for JumpBuffer
+
+  Checks ASSERT condition for JumpBuffer.
+
+  If JumpBuffer is NULL, then ASSERT().
+  For IPF CPUs, if JumpBuffer is not aligned on a 16-byte boundary, then ASSERT().
+
+  @param  JumpBuffer    A pointer to CPU context buffer.
+
+**/
+VOID
+InternalAssertJumpBuffer (
+  IN      BASE_LIBRARY_JUMP_BUFFER  *JumpBuffer
+  );
+
+/**
+  Restores the CPU context that was saved with SetJump().
+
+  Restores the CPU context from the buffer specified by JumpBuffer.
+  This function never returns to the caller.
+  Instead is resumes execution based on the state of JumpBuffer.
+
+  @param  JumpBuffer    A pointer to CPU context buffer.
+  @param  Value         The value to return when the SetJump() context is restored.
+
+**/
+VOID
+EFIAPI
+InternalLongJump (
+  IN      BASE_LIBRARY_JUMP_BUFFER  *JumpBuffer,
+  IN      UINTN                     Value
+  );
+
+#endif
diff --git a/MdePkg/Library/BaseLib/CheckSum.c b/MdePkg/Library/BaseLib/CheckSum.c
new file mode 100644
index 0000000000..957a2224f9
--- /dev/null
+++ b/MdePkg/Library/BaseLib/CheckSum.c
@@ -0,0 +1,334 @@
+/** @file
+  Utility functions to generate checksum based on 2's complement
+  algorithm.
+
+  Copyright (c) 2007, Intel Corporation<BR>
+  All rights reserved. This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  Module Name:  CheckSum.c
+
+**/
+
+/**
+  Calculate the sum of all elements in a buffer in unit of UINT8. 
+  During calculation, the carry bits are dropped.
+
+  This function calculates the sum of all elements in a buffer 
+  in unit of UINT8. The carry bits in result of addition are dropped. 
+  The result is returned as UINT8. If Length is Zero, then Zero is 
+  returned.
+  
+  If Buffer is NULL, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). 
+
+  @param  Buffer			Pointer to the buffer to carry out the sum operation.
+  @param  Length	    The size, in bytes, of Buffer .
+
+  @return Sum         The sum of Buffer with carry bits dropped during additions.
+
+**/
+UINT8
+EFIAPI
+CalculateSum8 (
+  IN      CONST UINT8     	        *Buffer,
+  IN      UINTN		  	              Length
+  )
+{
+  UINT8     Sum;
+  UINTN     Count;
+
+  ASSERT (Buffer != NULL);
+  ASSERT (Length <= (MAX_ADDRESS - ((UINTN) Buffer) + 1));
+
+  for (Sum = 0, Count = 0; Count < Length; Count++) {
+    Sum = Sum + *(Buffer + Count);
+  }
+  
+  return Sum;
+}
+
+
+/**
+  Returns the two's complement checksum of all elements in a buffer 
+  of 8-bit values.
+
+  This function first calculates the sum of the 8-bit values in the 
+  buffer specified by Buffer and Length.  The carry bits in the result 
+  of addition are dropped. Then, the two's complement of the sum is 
+  returned.  If Length is 0, then 0 is returned.
+  
+  If Buffer is NULL, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
+
+
+  @param  Buffer			Pointer to the buffer to carry out the checksum operation.
+  @param  Length	    The size, in bytes, of Buffer.
+
+  @return Checksum	  The 2's complement checksum of Buffer.
+
+**/
+UINT8
+EFIAPI
+CalculateCheckSum8 (
+  IN      CONST UINT8     	        *Buffer,
+  IN      UINTN		  	              Length
+  )
+{
+  UINT8     CheckSum;
+
+  CheckSum = CalculateSum8 (Buffer, Length);
+
+  //
+  // Return the checksum based on 2's complement.
+  //
+  return (UINT8) (0x100 - CheckSum);
+}
+
+/**
+  Returns the sum of all elements in a buffer of 16-bit values.  During 
+  calculation, the carry bits are dropped.
+
+  This function calculates the sum of the 16-bit values in the buffer 
+  specified by Buffer and Length. The carry bits in result of addition are dropped. 
+  The 16-bit result is returned.  If Length is 0, then 0 is returned.  
+  
+  If Buffer is NULL, then ASSERT().
+  If Buffer is not aligned on a 16-bit boundary, then ASSERT().
+  If Length is not aligned on a 16-bit boundary, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
+
+  @param  Buffer			Pointer to the buffer to carry out the sum operation.
+  @param  Length	    The size, in bytes, of Buffer.
+
+  @return Sum         The sum of Buffer with carry bits dropped during additions.
+
+**/
+UINT16
+EFIAPI
+CalculateSum16 (
+  IN      CONST UINT16    	        *Buffer,
+  IN      UINTN		  	              Length
+  )
+{
+  UINT16    Sum;
+  UINTN     Count;
+
+  ASSERT (Buffer != NULL);
+  ASSERT (((UINTN) Buffer & 0x1) == 0);
+  ASSERT ((Length & 0x1) == 0);
+  ASSERT (Length <= (MAX_ADDRESS - ((UINTN) Buffer) + 1));
+
+
+  for (Sum = 0, Count = 0; Count < Length; Count++) {
+    Sum = Sum + *(Buffer + Count);
+  }
+  
+  return Sum;
+}
+
+
+/**
+  Returns the two's complement checksum of all elements in a buffer of 
+  16-bit values.
+
+  This function first calculates the sum of the 16-bit values in the buffer 
+  specified by Buffer and Length.  The carry bits in the result of addition 
+  are dropped. Then, the two's complement of the sum is returned.  If Length 
+  is 0, then 0 is returned.
+  
+  If Buffer is NULL, then ASSERT().
+  If Buffer is not aligned on a 16-bit boundary, then ASSERT().
+  If Length is not aligned on a 16-bit boundary, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). 
+
+  @param  Buffer			Pointer to the buffer to carry out the checksum operation.
+  @param  Length	    The size, in bytes, of Buffer.
+
+  @return Checksum	  The 2's complement checksum of Buffer.
+
+**/
+UINT16
+EFIAPI
+CalculateCheckSum16 (
+  IN      CONST UINT16    	        *Buffer,
+  IN      UINTN		  	              Length
+  )
+{
+  UINT16     CheckSum;
+
+  CheckSum = CalculateSum16 (Buffer, Length);
+
+  //
+  // Return the checksum based on 2's complement.
+  //
+  return (UINT16) (0x10000 - CheckSum);
+}
+
+
+/**
+  Returns the sum of all elements in a buffer of 32-bit values.  During 
+  calculation, the carry bits are dropped.
+
+  This function calculates the sum of the 32-bit values in the buffer 
+  specified by Buffer and Length. The carry bits in result of addition are dropped. 
+  The 32-bit result is returned.  If Length is 0, then 0 is returned.  
+  
+  If Buffer is NULL, then ASSERT().
+  If Buffer is not aligned on a 32-bit boundary, then ASSERT().
+  If Length is not aligned on a 32-bit boundary, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
+
+  @param  Buffer			Pointer to the buffer to carry out the sum operation.
+  @param  Length	    The size, in bytes, of Buffer.
+
+  @return Sum         The sum of Buffer with carry bits dropped during additions.
+
+**/
+UINT32
+EFIAPI
+CalculateSum32 (
+  IN      CONST UINT32    	        *Buffer,
+  IN      UINTN		  	              Length
+  )
+{
+  UINT32    Sum;
+  UINTN     Count;
+
+  ASSERT (Buffer != NULL);
+  ASSERT (((UINTN) Buffer & 0x3) == 0);
+  ASSERT ((Length & 0x3) == 0);
+  ASSERT (Length <= (MAX_ADDRESS - ((UINTN) Buffer) + 1));
+
+
+  for (Sum = 0, Count = 0; Count < Length; Count++) {
+    Sum = Sum + *(Buffer + Count);
+  }
+  
+  return Sum;
+}
+
+
+/**
+  Returns the two's complement checksum of all elements in a buffer of 
+  32-bit values.
+
+  This function first calculates the sum of the 32-bit values in the buffer 
+  specified by Buffer and Length.  The carry bits in the result of addition 
+  are dropped. Then, the two's complement of the sum is returned.  If Length 
+  is 0, then 0 is returned.
+  
+  If Buffer is NULL, then ASSERT().
+  If Buffer is not aligned on a 32-bit boundary, then ASSERT().
+  If Length is not aligned on a 32-bit boundary, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). 
+
+  @param  Buffer			Pointer to the buffer to carry out the checksum operation.
+  @param  Length	    The size, in bytes, of Buffer.
+
+  @return Checksum	  The 2's complement checksum of Buffer.
+
+**/
+UINT32
+EFIAPI
+CalculateCheckSum32 (
+  IN      CONST UINT32    	        *Buffer,
+  IN      UINTN		  	              Length
+  )
+{
+  UINT32     CheckSum;
+
+  CheckSum = CalculateSum32 (Buffer, Length);
+
+  //
+  // Return the checksum based on 2's complement.
+  //
+  return (UINT32) ((UINT32)(-1) - CheckSum + 1);
+}
+
+
+/**
+  Returns the sum of all elements in a buffer of 64-bit values.  During 
+  calculation, the carry bits are dropped.
+
+  This function calculates the sum of the 64-bit values in the buffer 
+  specified by Buffer and Length. The carry bits in result of addition are dropped. 
+  The 64-bit result is returned.  If Length is 0, then 0 is returned.  
+  
+  If Buffer is NULL, then ASSERT().
+  If Buffer is not aligned on a 64-bit boundary, then ASSERT().
+  If Length is not aligned on a 64-bit boundary, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
+
+  @param  Buffer			Pointer to the buffer to carry out the sum operation.
+  @param  Length	    The size, in bytes, of Buffer.
+
+  @return Sum         The sum of Buffer with carry bits dropped during additions.
+
+**/
+UINT64
+EFIAPI
+CalculateSum64 (
+  IN      CONST UINT64    	        *Buffer,
+  IN      UINTN		  	              Length
+  )
+{
+  UINT64    Sum;
+  UINTN     Count;
+
+  ASSERT (Buffer != NULL);
+  ASSERT (((UINTN) Buffer & 0x7) == 0);
+  ASSERT ((Length & 0x7) == 0);
+  ASSERT (Length <= (MAX_ADDRESS - ((UINTN) Buffer) + 1));
+
+  for (Sum = 0, Count = 0; Count < Length; Count++) {
+    Sum = Sum + *(Buffer + Count);
+  }
+  
+  return Sum;
+}
+
+
+/**
+  Returns the two's complement checksum of all elements in a buffer of 
+  64-bit values.
+
+  This function first calculates the sum of the 64-bit values in the buffer 
+  specified by Buffer and Length.  The carry bits in the result of addition 
+  are dropped. Then, the two's complement of the sum is returned.  If Length 
+  is 0, then 0 is returned.
+  
+  If Buffer is NULL, then ASSERT().
+  If Buffer is not aligned on a 64-bit boundary, then ASSERT().
+  If Length is not aligned on a 64-bit boundary, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). 
+
+  @param  Buffer			Pointer to the buffer to carry out the checksum operation.
+  @param  Length	    The size, in bytes, of Buffer.
+
+  @return Checksum	  The 2's complement checksum of Buffer.
+
+**/
+UINT64
+EFIAPI
+CalculateCheckSum64 (
+  IN      CONST UINT64    	        *Buffer,
+  IN      UINTN		  	              Length
+  )
+{
+  UINT64     CheckSum;
+
+  CheckSum = CalculateSum64 (Buffer, Length);
+
+  //
+  // Return the checksum based on 2's complement.
+  //
+  return (UINT64) ((UINT64)(-1) - CheckSum + 1);
+}
+
+
diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 7db468aee5..402d676631 100644
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -1,896 +1,2051 @@
-/** @file
-  Unicode string primatives.
-
-  Copyright (c) 2006, Intel Corporation<BR>
-  All rights reserved. This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  Module Name:  String.c
-
-**/
-
-/**
-  Copies one Null-terminated Unicode string to another Null-terminated Unicode
-  string and returns the new Unicode string.
-
-  This function copies the contents of the Unicode string Source to the Unicode
-  string Destination, and returns Destination. If Source and Destination
-  overlap, then the results are undefined.
-
-  If Destination is NULL, then ASSERT().
-  If Source is NULL, then ASSERT().
-  If Source and Destination overlap, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the 
-  Null-terminator, then ASSERT().
-
-  @param  Destination Pointer to a Null-terminated Unicode string.
-  @param  Source      Pointer to a Null-terminated Unicode string.
-
-  @return Destiantion
-
-**/
-CHAR16 *
-EFIAPI
-StrCpy (
-  OUT     CHAR16                    *Destination,
-  IN      CONST CHAR16              *Source
-  )
-{
-  CHAR16                            *ReturnValue;
-
-  //
-  // Destination cannot be NULL
-  //
-  ASSERT (Destination != NULL);
-
-  //
-  // Destination and source cannot overlap
-  //
-  ASSERT ((UINTN)(Destination - Source) > StrLen (Source));
-  ASSERT ((UINTN)(Source - Destination) > StrLen (Source));
-
-  ReturnValue = Destination;
-  while (*Source) {
-    *(Destination++) = *(Source++);
-  }
-  *Destination = 0;
-  return ReturnValue;
-}
-
-/**
-  Copies one Null-terminated Unicode string with a maximum length to another
-  Null-terminated Unicode string with a maximum length and returns the new
-  Unicode string.
-
-  This function copies the contents of the Unicode string Source to the Unicode
-  string Destination, and returns Destination. At most, Length Unicode
-  characters are copied from Source to Destination. If Length is 0, then
-  Destination is returned unmodified. If Length is greater that the number of
-  Unicode characters in Source, then Destination is padded with Null Unicode
-  characters. If Source and Destination overlap, then the results are
-  undefined.
-
-  If Destination is NULL, then ASSERT().
-  If Source is NULL, then ASSERT().
-  If Source and Destination overlap, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the 
-  Null-terminator, then ASSERT().
-
-  @param  Destination Pointer to a Null-terminated Unicode string.
-  @param  Source      Pointer to a Null-terminated Unicode string.
-  @param  Length      Maximum number of Unicode characters to copy.
-
-  @return Destination
-
-**/
-CHAR16 *
-EFIAPI
-StrnCpy (
-  OUT     CHAR16                    *Destination,
-  IN      CONST CHAR16              *Source,
-  IN      UINTN                     Length
-  )
-{
-  CHAR16                            *ReturnValue;
-
-  if (Length == 0) {
-    return Destination;
-  }
-
-  //
-  // Destination cannot be NULL if Length is not zero
-  //
-  ASSERT (Destination != NULL);
-
-  //
-  // Destination and source cannot overlap
-  // Q: Does Source have to be NULL-terminated?
-  //
-  ASSERT ((UINTN)(Destination - Source) > StrLen (Source));
-  ASSERT ((UINTN)(Source - Destination) >= Length);
-
-  ReturnValue = Destination;
-
-  while ((*Source != L'\0') && (Length > 0)) {
-    *(Destination++) = *(Source++);
-    Length--;
-  }
-
-  ZeroMem (Destination, Length * sizeof (*Destination));
-  return ReturnValue;
-}
-
-/**
-  Returns the length of a Null-terminated Unicode string.
-
-  This function returns the number of Unicode characters in the Null-terminated
-  Unicode string specified by String.
-
-  If String is NULL, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and String contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the 
-  Null-terminator, then ASSERT().
-
-  @param  String  Pointer to a Null-terminated Unicode string.
-
-  @return The length of String.
-
-**/
-UINTN
-EFIAPI
-StrLen (
-  IN      CONST CHAR16              *String
-  )
-{
-  UINTN                             Length;
-
-  ASSERT (String != NULL);
-
-  for (Length = 0; *String != L'\0'; String++, Length++) {
-    //
-    // If PcdMaximumUnicodeStringLength is not zero,
-    // length should not more than PcdMaximumUnicodeStringLength
-    //
-    if (PcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
-      ASSERT (Length < PcdGet32 (PcdMaximumUnicodeStringLength));
-    }
-  }
-  return Length;
-}
-
-/**
-  Returns the size of a Null-terminated Unicode string in bytes, including the
-  Null terminator.
-
-  This function returns the size, in bytes, of the Null-terminated Unicode
-  string specified by String.
-
-  If String is NULL, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and String contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the 
-  Null-terminator, then ASSERT().
-
-  @param  String  Pointer to a Null-terminated Unicode string.
-
-  @return The size of String.
-
-**/
-UINTN
-EFIAPI
-StrSize (
-  IN      CONST CHAR16              *String
-  )
-{
-  return (StrLen (String) + 1) * sizeof (*String);
-}
-
-/**
-  Compares two Null-terminated Unicode strings, and returns the difference
-  between the first mismatched Unicode characters.
-
-  This function compares the Null-terminated Unicode string FirstString to the
-  Null-terminated Unicode string SecondString. If FirstString is identical to
-  SecondString, then 0 is returned. Otherwise, the value returned is the first
-  mismatched Unicode character in SecondString subtracted from the first
-  mismatched Unicode character in FirstString.
-
-  If FirstString is NULL, then ASSERT().
-  If SecondString is NULL, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters not including the 
-  Null-terminator, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters not including the 
-  Null-terminator, then ASSERT().
-
-  @param  FirstString   Pointer to a Null-terminated Unicode string.
-  @param  SecondString  Pointer to a Null-terminated Unicode string.
-
-  @retval 0   FirstString is identical to SecondString.
-  @retval !=0 FirstString is not identical to SecondString.
-
-**/
-INTN
-EFIAPI
-StrCmp (
-  IN      CONST CHAR16              *FirstString,
-  IN      CONST CHAR16              *SecondString
-  )
-{
-  //
-  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength
-  //
-  ASSERT (StrSize (FirstString) != 0);
-  ASSERT (StrSize (SecondString) != 0);
-
-  while ((*FirstString != L'\0') && (*FirstString == *SecondString)) {
-    FirstString++;
-    SecondString++;
-  }
-  return *FirstString - *SecondString;
-}
-
-/**
-  Compares two Null-terminated Unicode strings with maximum lengths, and
-  returns the difference between the first mismatched Unicode characters.
-
-  This function compares the Null-terminated Unicode string FirstString to the
-  Null-terminated Unicode string SecondString. At most, Length Unicode
-  characters will be compared. If Length is 0, then 0 is returned. If
-  FirstString is identical to SecondString, then 0 is returned. Otherwise, the
-  value returned is the first mismatched Unicode character in SecondString
-  subtracted from the first mismatched Unicode character in FirstString.
-
-  If FirstString is NULL, then ASSERT().
-  If SecondString is NULL, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters not including the
-  Null-terminator, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters not including the
-  Null-terminator, then ASSERT().
-
-  @param  FirstString   Pointer to a Null-terminated Unicode string.
-  @param  SecondString  Pointer to a Null-terminated Unicode string.
-  @param  Length        Maximum number of Unicode characters to compare.
-
-  @retval 0   FirstString is identical to SecondString.
-  @retval !=0 FirstString is not identical to SecondString.
-
-**/
-INTN
-EFIAPI
-StrnCmp (
-  IN      CONST CHAR16              *FirstString,
-  IN      CONST CHAR16              *SecondString,
-  IN      UINTN                     Length
-  )
-{
-  if (Length == 0) {
-    return 0;
-  }
-
-  //
-  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength.
-  // Length tests are performed inside StrLen().
-  //
-  ASSERT (StrSize (FirstString) != 0);
-  ASSERT (StrSize (SecondString) != 0);
-
-  while ((*FirstString != L'\0') &&
-         (*FirstString == *SecondString) &&
-         (Length > 1)) {
-    FirstString++;
-    SecondString++;
-    Length--;
-  }
-
-  return *FirstString - *SecondString;
-}
-
-/**
-  Concatenates one Null-terminated Unicode string to another Null-terminated
-  Unicode string, and returns the concatenated Unicode string.
-
-  This function concatenates two Null-terminated Unicode strings. The contents
-  of Null-terminated Unicode string Source are concatenated to the end of
-  Null-terminated Unicode string Destination. The Null-terminated concatenated
-  Unicode String is returned. If Source and Destination overlap, then the
-  results are undefined.
-
-  If Destination is NULL, then ASSERT().
-  If Source is NULL, then ASSERT().
-  If Source and Destination overlap, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
-  than PcdMaximumUnicodeStringLength Unicode characters not including the
-  Null-terminator, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the
-  Null-terminator, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
-  and Source results in a Unicode string with more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the
-  Null-terminator, then ASSERT().
-
-  @param  Destination Pointer to a Null-terminated Unicode string.
-  @param  Source      Pointer to a Null-terminated Unicode string.
-
-  @return Destination
-
-**/
-CHAR16 *
-EFIAPI
-StrCat (
-  IN OUT  CHAR16                    *Destination,
-  IN      CONST CHAR16              *Source
-  )
-{
-  StrCpy (Destination + StrLen (Destination), Source);
-
-  //
-  // Size of the resulting string should never be zero.
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().
-  //
-  ASSERT (StrSize (Destination) != 0);
-  return Destination;
-}
-
-/**
-  Concatenates one Null-terminated Unicode string with a maximum length to the
-  end of another Null-terminated Unicode string, and returns the concatenated
-  Unicode string.
-
-  This function concatenates two Null-terminated Unicode strings. The contents
-  of Null-terminated Unicode string Source are concatenated to the end of
-  Null-terminated Unicode string Destination, and Destination is returned. At
-  most, Length Unicode characters are concatenated from Source to the end of
-  Destination, and Destination is always Null-terminated. If Length is 0, then
-  Destination is returned unmodified. If Source and Destination overlap, then
-  the results are undefined.
-
-  If Destination is NULL, then ASSERT().
-  If Source is NULL, then ASSERT().
-  If Source and Destination overlap, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
-  than PcdMaximumUnicodeStringLength Unicode characters not including the
-  Null-terminator, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the
-  Null-terminator, then ASSERT().
-  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
-  and Source results in a Unicode string with more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the
-  Null-terminator, then ASSERT().
-
-  @param  Destination Pointer to a Null-terminated Unicode string.
-  @param  Source      Pointer to a Null-terminated Unicode string.
-  @param  Length      Maximum number of Unicode characters to concatenate from
-                      Source.
-
-  @return Destination
-
-**/
-CHAR16 *
-EFIAPI
-StrnCat (
-  IN OUT  CHAR16                    *Destination,
-  IN      CONST CHAR16              *Source,
-  IN      UINTN                     Length
-  )
-{
-  StrnCpy (Destination + StrLen (Destination), Source, Length);
-
-  //
-  // Size of the resulting string should never be zero.
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().
-  //
-  ASSERT (StrSize (Destination) != 0);
-  return Destination;
-}
-
-/**
-  Copies one Null-terminated ASCII string to another Null-terminated ASCII
-  string and returns the new ASCII string.
-
-  This function copies the contents of the ASCII string Source to the ASCII
-  string Destination, and returns Destination. If Source and Destination
-  overlap, then the results are undefined.
-
-  If Destination is NULL, then ASSERT().
-  If Source is NULL, then ASSERT().
-  If Source and Destination overlap, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and Source contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-
-  @param  Destination Pointer to a Null-terminated ASCII string.
-  @param  Source      Pointer to a Null-terminated ASCII string.
-
-  @return Destination
-
-**/
-CHAR8 *
-EFIAPI
-AsciiStrCpy (
-  OUT     CHAR8                     *Destination,
-  IN      CONST CHAR8               *Source
-  )
-{
-  CHAR8                             *ReturnValue;
-
-  //
-  // Destination cannot be NULL
-  //
-  ASSERT (Destination != NULL);
-
-  //
-  // Destination and source cannot overlap
-  //
-  ASSERT ((UINTN)(Destination - Source) > AsciiStrLen (Source));
-  ASSERT ((UINTN)(Source - Destination) > AsciiStrLen (Source));
-
-  ReturnValue = Destination;
-  while (*Source) {
-    *(Destination++) = *(Source++);
-  }
-  *Destination = 0;
-  return ReturnValue;
-}
-
-/**
-  Copies one Null-terminated ASCII string with a maximum length to another
-  Null-terminated ASCII string with a maximum length and returns the new ASCII
-  string.
-
-  This function copies the contents of the ASCII string Source to the ASCII
-  string Destination, and returns Destination. At most, Length ASCII characters
-  are copied from Source to Destination. If Length is 0, then Destination is
-  returned unmodified. If Length is greater that the number of ASCII characters
-  in Source, then Destination is padded with Null ASCII characters. If Source
-  and Destination overlap, then the results are undefined.
-
-  If Destination is NULL, then ASSERT().
-  If Source is NULL, then ASSERT().
-  If Source and Destination overlap, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero, and Source contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-
-  @param  Destination Pointer to a Null-terminated ASCII string.
-  @param  Source      Pointer to a Null-terminated ASCII string.
-  @param  Length      Maximum number of ASCII characters to copy.
-
-  @return Destination
-
-**/
-CHAR8 *
-EFIAPI
-AsciiStrnCpy (
-  OUT     CHAR8                     *Destination,
-  IN      CONST CHAR8               *Source,
-  IN      UINTN                     Length
-  )
-{
-  CHAR8                             *ReturnValue;
-
-  if (Length == 0) {
-    return Destination;
-  }
-
-  //
-  // Destination cannot be NULL
-  //
-  ASSERT (Destination != NULL);
-
-  //
-  // Destination and source cannot overlap
-  //
-  ASSERT ((UINTN)(Destination - Source) > AsciiStrLen (Source));
-  ASSERT ((UINTN)(Source - Destination) >= Length);
-
-  ReturnValue = Destination;
-
-  while (*Source && Length > 0) {
-    *(Destination++) = *(Source++);
-    Length--;
-  }
-
-  ZeroMem (Destination, Length * sizeof (*Destination));
-  return ReturnValue;
-}
-
-/**
-  Returns the length of a Null-terminated ASCII string.
-
-  This function returns the number of ASCII characters in the Null-terminated
-  ASCII string specified by String.
-
-  If String is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and String contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-
-  @param  String  Pointer to a Null-terminated ASCII string.
-
-  @return The length of String.
-
-**/
-UINTN
-EFIAPI
-AsciiStrLen (
-  IN      CONST CHAR8               *String
-  )
-{
-  UINTN                             Length;
-
-  ASSERT (String != NULL);
-
-  for (Length = 0; *String != '\0'; String++, Length++) {
-    //
-    // If PcdMaximumUnicodeStringLength is not zero,
-    // length should not more than PcdMaximumUnicodeStringLength
-    //
-    if (PcdGet32 (PcdMaximumAsciiStringLength) != 0) {
-      ASSERT (Length < PcdGet32 (PcdMaximumAsciiStringLength));
-    }
-  }
-  return Length;
-}
-
-/**
-  Returns the size of a Null-terminated ASCII string in bytes, including the
-  Null terminator.
-
-  This function returns the size, in bytes, of the Null-terminated ASCII string
-  specified by String.
-
-  If String is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and String contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-
-  @param  String  Pointer to a Null-terminated ASCII string.
-
-  @return The size of String.
-
-**/
-UINTN
-EFIAPI
-AsciiStrSize (
-  IN      CONST CHAR8               *String
-  )
-{
-  return (AsciiStrLen (String) + 1) * sizeof (*String);
-}
-
-/**
-  Compares two Null-terminated ASCII strings, and returns the difference
-  between the first mismatched ASCII characters.
-
-  This function compares the Null-terminated ASCII string FirstString to the
-  Null-terminated ASCII string SecondString. If FirstString is identical to
-  SecondString, then 0 is returned. Otherwise, the value returned is the first
-  mismatched ASCII character in SecondString subtracted from the first
-  mismatched ASCII character in FirstString.
-
-  If FirstString is NULL, then ASSERT().
-  If SecondString is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more
-  than PcdMaximumAsciiStringLength ASCII characters not including the
-  Null-terminator, then ASSERT().
-
-  @param  FirstString   Pointer to a Null-terminated ASCII string.
-  @param  SecondString  Pointer to a Null-terminated ASCII string.
-
-  @retval 0   FirstString is identical to SecondString.
-  @retval !=0 FirstString is not identical to SecondString.
-
-**/
-INTN
-EFIAPI
-AsciiStrCmp (
-  IN      CONST CHAR8               *FirstString,
-  IN      CONST CHAR8               *SecondString
-  )
-{
-  //
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
-  //
-  ASSERT (AsciiStrSize (FirstString));
-  ASSERT (AsciiStrSize (SecondString));
-
-  while ((*FirstString != '\0') && (*FirstString == *SecondString)) {
-    FirstString++;
-    SecondString++;
-  }
-
-  return *FirstString - *SecondString;
-}
-
-/**
-  Converts a lowercase Ascii character to upper one
-
-  If Chr is lowercase Ascii character, then converts it to upper one.
-
-  If Value >= 0xA0, then ASSERT().
-  If (Value & 0x0F) >= 0x0A, then ASSERT().
-
-  @param  chr   one Ascii character
-
-  @return The uppercase value of Ascii character 
-
-**/
-STATIC
-CHAR8
-AsciiToUpper (
-  IN      CHAR8                     Chr
-  )
-{
-  return (UINT8) ((Chr >= 'a' && Chr <= 'z') ? Chr - ('a' - 'A') : Chr);
-}
-
-/**
-  Performs a case insensitive comparison of two Null-terminated ASCII strings,
-  and returns the difference between the first mismatched ASCII characters.
-
-  This function performs a case insensitive comparison of the Null-terminated
-  ASCII string FirstString to the Null-terminated ASCII string SecondString. If
-  FirstString is identical to SecondString, then 0 is returned. Otherwise, the
-  value returned is the first mismatched lower case ASCII character in
-  SecondString subtracted from the first mismatched lower case ASCII character
-  in FirstString.
-
-  If FirstString is NULL, then ASSERT().
-  If SecondString is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more
-  than PcdMaximumAsciiStringLength ASCII characters not including the
-  Null-terminator, then ASSERT().
-
-  @param  FirstString   Pointer to a Null-terminated ASCII string.
-  @param  SecondString  Pointer to a Null-terminated ASCII string.
-
-  @retval 0   FirstString is identical to SecondString using case insensitive
-              comparisons.
-  @retval !=0 FirstString is not identical to SecondString using case
-              insensitive comparisons.
-
-**/
-INTN
-EFIAPI
-AsciiStriCmp (
-  IN      CONST CHAR8               *FirstString,
-  IN      CONST CHAR8               *SecondString
-  )
-{
-  CHAR8  UpperFirstString;
-  CHAR8  UpperSecondString;
-
-  //
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
-  //
-  ASSERT (AsciiStrSize (FirstString));
-  ASSERT (AsciiStrSize (SecondString));
-
-  UpperFirstString  = AsciiToUpper (*FirstString);
-  UpperSecondString = AsciiToUpper (*SecondString);
-  while ((*FirstString != '\0') && (UpperFirstString == UpperSecondString)) {
-    FirstString++;
-    SecondString++;
-    UpperFirstString  = AsciiToUpper (*FirstString);
-    UpperSecondString = AsciiToUpper (*SecondString);
-  }
-
-  return UpperFirstString - UpperSecondString;
-}
-
-/**
-  Compares two Null-terminated ASCII strings with maximum lengths, and returns
-  the difference between the first mismatched ASCII characters.
-
-  This function compares the Null-terminated ASCII string FirstString to the
-  Null-terminated ASCII  string SecondString. At most, Length ASCII characters
-  will be compared. If Length is 0, then 0 is returned. If FirstString is
-  identical to SecondString, then 0 is returned. Otherwise, the value returned
-  is the first mismatched ASCII character in SecondString subtracted from the
-  first mismatched ASCII character in FirstString.
-
-  If FirstString is NULL, then ASSERT().
-  If SecondString is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-
-  @param  FirstString   Pointer to a Null-terminated ASCII string.
-  @param  SecondString  Pointer to a Null-terminated ASCII string.
-
-  @retval 0   FirstString is identical to SecondString.
-  @retval !=0 FirstString is not identical to SecondString.
-
-**/
-INTN
-EFIAPI
-AsciiStrnCmp (
-  IN      CONST CHAR8               *FirstString,
-  IN      CONST CHAR8               *SecondString,
-  IN      UINTN                     Length
-  )
-{
-  if (Length == 0) {
-    return 0;
-  }
-
-  //
-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
-  //
-  ASSERT (AsciiStrSize (FirstString));
-  ASSERT (AsciiStrSize (SecondString));
-
-  while ((*FirstString != '\0') &&
-         (*FirstString == *SecondString) &&
-         (Length > 1)) {
-    FirstString++;
-    SecondString++;
-    Length--;
-  }
-  return *FirstString - *SecondString;
-}
-
-/**
-  Concatenates one Null-terminated ASCII string to another Null-terminated
-  ASCII string, and returns the concatenated ASCII string.
-
-  This function concatenates two Null-terminated ASCII strings. The contents of
-  Null-terminated ASCII string Source are concatenated to the end of Null-
-  terminated ASCII string Destination. The Null-terminated concatenated ASCII
-  String is returned.
-
-  If Destination is NULL, then ASSERT().
-  If Source is NULL, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and Destination contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and Source contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero and concatenating Destination and
-  Source results in a ASCII string with more than PcdMaximumAsciiStringLength
-  ASCII characters, then ASSERT().
-
-  @param  Destination Pointer to a Null-terminated ASCII string.
-  @param  Source      Pointer to a Null-terminated ASCII string.
-
-  @return Destination
-
-**/
-CHAR8 *
-EFIAPI
-AsciiStrCat (
-  IN OUT CHAR8    *Destination,
-  IN CONST CHAR8  *Source
-  )
-{
-  AsciiStrCpy (Destination + AsciiStrLen (Destination), Source);
-
-  //
-  // Size of the resulting string should never be zero.
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().
-  //
-  ASSERT (AsciiStrSize (Destination) != 0);
-  return Destination;
-}
-
-/**
-  Concatenates one Null-terminated ASCII string with a maximum length to the
-  end of another Null-terminated ASCII string, and returns the concatenated
-  ASCII string.
-
-  This function concatenates two Null-terminated ASCII strings. The contents
-  of Null-terminated ASCII string Source are concatenated to the end of Null-
-  terminated ASCII string Destination, and Destination is returned. At most,
-  Length ASCII characters are concatenated from Source to the end of
-  Destination, and Destination is always Null-terminated. If Length is 0, then
-  Destination is returned unmodified. If Source and Destination overlap, then
-  the results are undefined.
-
-  If Destination is NULL, then ASSERT().
-  If Source is NULL, then ASSERT().
-  If Source and Destination overlap, then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero, and Destination contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero, and Source contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
-  then ASSERT().
-  If PcdMaximumAsciiStringLength is not zero, and concatenating Destination and
-  Source results in a ASCII string with more than PcdMaximumAsciiStringLength
-  ASCII characters not including the Null-terminator, then ASSERT().
-
-  @param  Destination Pointer to a Null-terminated ASCII string.
-  @param  Source      Pointer to a Null-terminated ASCII string.
-  @param  Length      Maximum number of ASCII characters to concatenate from
-                      Source.
-
-  @return Destination
-
-**/
-CHAR8 *
-EFIAPI
-AsciiStrnCat (
-  IN OUT  CHAR8                     *Destination,
-  IN      CONST CHAR8               *Source,
-  IN      UINTN                     Length
-  )
-{
-  AsciiStrnCpy (Destination + AsciiStrLen (Destination), Source, Length);
-
-  //
-  // Size of the resulting string should never be zero.
-  // PcdMaximumUnicodeStringLength is tested inside StrLen().
-  //
-  ASSERT (AsciiStrSize (Destination) != 0);
-  return Destination;
-}
-
-/**
-  Converts an 8-bit value to an 8-bit BCD value.
-
-  Converts the 8-bit value specified by Value to BCD. The BCD value is
-  returned.
-
-  If Value >= 100, then ASSERT().
-
-  @param  Value The 8-bit value to convert to BCD. Range 0..99.
-
-  @return The BCD value
-
-**/
-UINT8
-EFIAPI
-DecimalToBcd8 (
-  IN      UINT8                     Value
-  )
-{
-  ASSERT (Value < 100);
-  return (UINT8) (((Value / 10) << 4) | (Value % 10));
-}
-
-/**
-  Converts an 8-bit BCD value to an 8-bit value.
-
-  Converts the 8-bit BCD value specified by Value to an 8-bit value. The 8-bit
-  value is returned.
-
-  If Value >= 0xA0, then ASSERT().
-  If (Value & 0x0F) >= 0x0A, then ASSERT().
-
-  @param  Value The 8-bit BCD value to convert to an 8-bit value.
-
-  @return The 8-bit value is returned.
-
-**/
-UINT8
-EFIAPI
-BcdToDecimal8 (
-  IN      UINT8                     Value
-  )
-{
-  ASSERT (Value < 0xa0);
-  ASSERT ((Value & 0xf) < 0xa);
-  return (UINT8) ((Value >> 4) * 10 + (Value & 0xf));
-}
+/** @file
+  Unicode and ASCII string primatives.
+
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
+  All rights reserved. This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  Module Name:  String.c
+
+**/
+
+#include "BaseLibInternals.h"
+
+/**
+  Copies one Null-terminated Unicode string to another Null-terminated Unicode
+  string and returns the new Unicode string.
+
+  This function copies the contents of the Unicode string Source to the Unicode
+  string Destination, and returns Destination. If Source and Destination
+  overlap, then the results are undefined.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
+  PcdMaximumUnicodeStringLength Unicode characters not including the 
+  Null-terminator, then ASSERT().
+
+  @param  Destination Pointer to a Null-terminated Unicode string.
+  @param  Source      Pointer to a Null-terminated Unicode string.
+
+  @return Destiantion
+
+**/
+CHAR16 *
+EFIAPI
+StrCpy (
+  OUT     CHAR16                    *Destination,
+  IN      CONST CHAR16              *Source
+  )
+{
+  CHAR16                            *ReturnValue;
+
+  //
+  // Destination cannot be NULL
+  //
+  ASSERT (Destination != NULL);
+
+  //
+  // Destination and source cannot overlap
+  //
+  ASSERT ((UINTN)(Destination - Source) > StrLen (Source));
+  ASSERT ((UINTN)(Source - Destination) > StrLen (Source));
+
+  ReturnValue = Destination;
+  while (*Source) {
+    *(Destination++) = *(Source++);
+  }
+  *Destination = 0;
+  return ReturnValue;
+}
+
+/**
+  Copies one Null-terminated Unicode string with a maximum length to another
+  Null-terminated Unicode string with a maximum length and returns the new
+  Unicode string.
+
+  This function copies the contents of the Unicode string Source to the Unicode
+  string Destination, and returns Destination. At most, Length Unicode
+  characters are copied from Source to Destination. If Length is 0, then
+  Destination is returned unmodified. If Length is greater that the number of
+  Unicode characters in Source, then Destination is padded with Null Unicode
+  characters. If Source and Destination overlap, then the results are
+  undefined.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
+  PcdMaximumUnicodeStringLength Unicode characters not including the 
+  Null-terminator, then ASSERT().
+
+  @param  Destination Pointer to a Null-terminated Unicode string.
+  @param  Source      Pointer to a Null-terminated Unicode string.
+  @param  Length      Maximum number of Unicode characters to copy.
+
+  @return Destination
+
+**/
+CHAR16 *
+EFIAPI
+StrnCpy (
+  OUT     CHAR16                    *Destination,
+  IN      CONST CHAR16              *Source,
+  IN      UINTN                     Length
+  )
+{
+  CHAR16                            *ReturnValue;
+
+  if (Length == 0) {
+    return Destination;
+  }
+
+  //
+  // Destination cannot be NULL if Length is not zero
+  //
+  ASSERT (Destination != NULL);
+
+  //
+  // Destination and source cannot overlap
+  // Q: Does Source have to be NULL-terminated?
+  //
+  ASSERT ((UINTN)(Destination - Source) > StrLen (Source));
+  ASSERT ((UINTN)(Source - Destination) >= Length);
+
+  ReturnValue = Destination;
+
+  while ((*Source != L'\0') && (Length > 0)) {
+    *(Destination++) = *(Source++);
+    Length--;
+  }
+
+  ZeroMem (Destination, Length * sizeof (*Destination));
+  return ReturnValue;
+}
+
+/**
+  Returns the length of a Null-terminated Unicode string.
+
+  This function returns the number of Unicode characters in the Null-terminated
+  Unicode string specified by String.
+
+  If String is NULL, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and String contains more than
+  PcdMaximumUnicodeStringLength Unicode characters not including the 
+  Null-terminator, then ASSERT().
+
+  @param  String  Pointer to a Null-terminated Unicode string.
+
+  @return The length of String.
+
+**/
+UINTN
+EFIAPI
+StrLen (
+  IN      CONST CHAR16              *String
+  )
+{
+  UINTN                             Length;
+
+  ASSERT (String != NULL);
+
+  for (Length = 0; *String != L'\0'; String++, Length++) {
+    //
+    // If PcdMaximumUnicodeStringLength is not zero,
+    // length should not more than PcdMaximumUnicodeStringLength
+    //
+    if (PcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
+      ASSERT (Length < PcdGet32 (PcdMaximumUnicodeStringLength));
+    }
+  }
+  return Length;
+}
+
+/**
+  Returns the size of a Null-terminated Unicode string in bytes, including the
+  Null terminator.
+
+  This function returns the size, in bytes, of the Null-terminated Unicode
+  string specified by String.
+
+  If String is NULL, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and String contains more than
+  PcdMaximumUnicodeStringLength Unicode characters not including the 
+  Null-terminator, then ASSERT().
+
+  @param  String  Pointer to a Null-terminated Unicode string.
+
+  @return The size of String.
+
+**/
+UINTN
+EFIAPI
+StrSize (
+  IN      CONST CHAR16              *String
+  )
+{
+  return (StrLen (String) + 1) * sizeof (*String);
+}
+
+/**
+  Compares two Null-terminated Unicode strings, and returns the difference
+  between the first mismatched Unicode characters.
+
+  This function compares the Null-terminated Unicode string FirstString to the
+  Null-terminated Unicode string SecondString. If FirstString is identical to
+  SecondString, then 0 is returned. Otherwise, the value returned is the first
+  mismatched Unicode character in SecondString subtracted from the first
+  mismatched Unicode character in FirstString.
+
+  If FirstString is NULL, then ASSERT().
+  If SecondString is NULL, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more
+  than PcdMaximumUnicodeStringLength Unicode characters not including the 
+  Null-terminator, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
+  than PcdMaximumUnicodeStringLength Unicode characters not including the 
+  Null-terminator, then ASSERT().
+
+  @param  FirstString   Pointer to a Null-terminated Unicode string.
+  @param  SecondString  Pointer to a Null-terminated Unicode string.
+
+  @retval 0   FirstString is identical to SecondString.
+  @retval !=0 FirstString is not identical to SecondString.
+
+**/
+INTN
+EFIAPI
+StrCmp (
+  IN      CONST CHAR16              *FirstString,
+  IN      CONST CHAR16              *SecondString
+  )
+{
+  //
+  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength
+  //
+  ASSERT (StrSize (FirstString) != 0);
+  ASSERT (StrSize (SecondString) != 0);
+
+  while ((*FirstString != L'\0') && (*FirstString == *SecondString)) {
+    FirstString++;
+    SecondString++;
+  }
+  return *FirstString - *SecondString;
+}
+
+/**
+  Compares two Null-terminated Unicode strings with maximum lengths, and
+  returns the difference between the first mismatched Unicode characters.
+
+  This function compares the Null-terminated Unicode string FirstString to the
+  Null-terminated Unicode string SecondString. At most, Length Unicode
+  characters will be compared. If Length is 0, then 0 is returned. If
+  FirstString is identical to SecondString, then 0 is returned. Otherwise, the
+  value returned is the first mismatched Unicode character in SecondString
+  subtracted from the first mismatched Unicode character in FirstString.
+
+  If FirstString is NULL, then ASSERT().
+  If SecondString is NULL, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more
+  than PcdMaximumUnicodeStringLength Unicode characters not including the
+  Null-terminator, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
+  than PcdMaximumUnicodeStringLength Unicode characters not including the
+  Null-terminator, then ASSERT().
+
+  @param  FirstString   Pointer to a Null-terminated Unicode string.
+  @param  SecondString  Pointer to a Null-terminated Unicode string.
+  @param  Length        Maximum number of Unicode characters to compare.
+
+  @retval 0   FirstString is identical to SecondString.
+  @retval !=0 FirstString is not identical to SecondString.
+
+**/
+INTN
+EFIAPI
+StrnCmp (
+  IN      CONST CHAR16              *FirstString,
+  IN      CONST CHAR16              *SecondString,
+  IN      UINTN                     Length
+  )
+{
+  if (Length == 0) {
+    return 0;
+  }
+
+  //
+  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength.
+  // Length tests are performed inside StrLen().
+  //
+  ASSERT (StrSize (FirstString) != 0);
+  ASSERT (StrSize (SecondString) != 0);
+
+  while ((*FirstString != L'\0') &&
+         (*FirstString == *SecondString) &&
+         (Length > 1)) {
+    FirstString++;
+    SecondString++;
+    Length--;
+  }
+
+  return *FirstString - *SecondString;
+}
+
+/**
+  Concatenates one Null-terminated Unicode string to another Null-terminated
+  Unicode string, and returns the concatenated Unicode string.
+
+  This function concatenates two Null-terminated Unicode strings. The contents
+  of Null-terminated Unicode string Source are concatenated to the end of
+  Null-terminated Unicode string Destination. The Null-terminated concatenated
+  Unicode String is returned. If Source and Destination overlap, then the
+  results are undefined.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
+  than PcdMaximumUnicodeStringLength Unicode characters not including the
+  Null-terminator, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
+  PcdMaximumUnicodeStringLength Unicode characters not including the
+  Null-terminator, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
+  and Source results in a Unicode string with more than
+  PcdMaximumUnicodeStringLength Unicode characters not including the
+  Null-terminator, then ASSERT().
+
+  @param  Destination Pointer to a Null-terminated Unicode string.
+  @param  Source      Pointer to a Null-terminated Unicode string.
+
+  @return Destination
+
+**/
+CHAR16 *
+EFIAPI
+StrCat (
+  IN OUT  CHAR16                    *Destination,
+  IN      CONST CHAR16              *Source
+  )
+{
+  StrCpy (Destination + StrLen (Destination), Source);
+
+  //
+  // Size of the resulting string should never be zero.
+  // PcdMaximumUnicodeStringLength is tested inside StrLen().
+  //
+  ASSERT (StrSize (Destination) != 0);
+  return Destination;
+}
+
+/**
+  Concatenates one Null-terminated Unicode string with a maximum length to the
+  end of another Null-terminated Unicode string, and returns the concatenated
+  Unicode string.
+
+  This function concatenates two Null-terminated Unicode strings. The contents
+  of Null-terminated Unicode string Source are concatenated to the end of
+  Null-terminated Unicode string Destination, and Destination is returned. At
+  most, Length Unicode characters are concatenated from Source to the end of
+  Destination, and Destination is always Null-terminated. If Length is 0, then
+  Destination is returned unmodified. If Source and Destination overlap, then
+  the results are undefined.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
+  than PcdMaximumUnicodeStringLength Unicode characters not including the
+  Null-terminator, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
+  PcdMaximumUnicodeStringLength Unicode characters not including the
+  Null-terminator, then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
+  and Source results in a Unicode string with more than
+  PcdMaximumUnicodeStringLength Unicode characters not including the
+  Null-terminator, then ASSERT().
+
+  @param  Destination Pointer to a Null-terminated Unicode string.
+  @param  Source      Pointer to a Null-terminated Unicode string.
+  @param  Length      Maximum number of Unicode characters to concatenate from
+                      Source.
+
+  @return Destination
+
+**/
+CHAR16 *
+EFIAPI
+StrnCat (
+  IN OUT  CHAR16                    *Destination,
+  IN      CONST CHAR16              *Source,
+  IN      UINTN                     Length
+  )
+{
+  StrnCpy (Destination + StrLen (Destination), Source, Length);
+
+  //
+  // Size of the resulting string should never be zero.
+  // PcdMaximumUnicodeStringLength is tested inside StrLen().
+  //
+  ASSERT (StrSize (Destination) != 0);
+  return Destination;
+}
+
+/**
+  Returns the first occurance of a Null-terminated Unicode sub-string 
+  in a Null-terminated Unicode string.
+
+  This function scans the contents of the Null-terminated Unicode string 
+  specified by String and returns the first occurrence of SearchString.  
+  If SearchString is not found in String, then NULL is returned.  If 
+  the length of SearchString is zero, then String is 
+  returned.
+  
+  If String is NULL, then ASSERT().
+  If String is not aligned on a 16-bit boundary, then ASSERT().
+  If SearchString is NULL, then ASSERT().
+  If SearchString is not aligned on a 16-bit boundary, then ASSERT().
+
+  If PcdMaximumUnicodeStringLength is not zero, and SearchString 
+  or String contains more than PcdMaximumUnicodeStringLength Unicode 
+  characters not including the Null-terminator, then ASSERT().
+
+  @param  String				  Pointer to a Null-terminated Unicode string.
+  @param  SearchString	Pointer to a Null-terminated Unicode string to search for.
+
+  @retval NULL            If the SearchString does not appear in String.
+  @retval !NULL           If there is a match.
+
+**/
+CHAR16 *
+EFIAPI
+StrStr (
+  IN      CONST CHAR16      	      *String,
+  IN      CONST CHAR16      	      *SearchString
+  )
+{
+  CONST CHAR16 *FirstMatch;
+  CONST CHAR16 *SearchStringTmp;
+
+  ASSERT (String != NULL);
+  ASSERT (((UINTN) String & 0x01) == 0);
+  ASSERT (SearchString != NULL);
+  ASSERT (((UINTN) SearchString & 0x01) == 0);
+
+  //
+  // If PcdMaximumUnicodeStringLength is not zero,
+  // length of String should not more than PcdMaximumUnicodeStringLength
+  //
+  if (PcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
+    ASSERT (StrLen (String) < PcdGet32 (PcdMaximumUnicodeStringLength));
+  }
+
+  //
+  // If PcdMaximumUnicodeStringLength is not zero,
+  // length of SearchString should not more than PcdMaximumUnicodeStringLength
+  //
+  if (PcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
+    ASSERT (StrLen (SearchString) < PcdGet32 (PcdMaximumAsciiStringLength));
+  }
+
+  while (*String != '\0') {
+    SearchStringTmp = SearchString;
+    FirstMatch = String;
+    
+    while ((*String == *SearchStringTmp) 
+            && (*SearchStringTmp != '\0') 
+            && (*String != '\0')) {
+      String++;
+      SearchStringTmp++;
+    } 
+    
+    if (*SearchStringTmp == '\0') {
+      return (CHAR16 *) FirstMatch;
+    }
+
+    if (SearchStringTmp == SearchString) {
+      //
+      // If no character from SearchString match,
+      // move the pointer to the String under search
+      // by one character.
+      //
+      String++;
+    }
+  }
+
+  return NULL;
+}
+
+/**
+  Check if a Unicode character is a decimal character.
+
+  This internal function checks if a Unicode character is a 
+  decimal character. The valid decimal character is from
+  L'0' to L'9'.
+
+
+  @param  Char  The character to check against.
+
+  @retval TRUE  If the Char is a decmial character.
+  @retval FALSE Otherwise.
+
+**/
+STATIC
+BOOLEAN
+InternalIsDecimalDigitCharacter (
+  IN      CHAR16                    Char
+  )
+{
+  return (BOOLEAN) (Char >= L'0' && Char <= L'9');
+}
+
+/**
+  Convert a Unicode character to upper case only if 
+  it maps to a valid small-case ASCII character.
+
+  This internal function only deal with Unicode character
+  which maps to a valid small-case ASII character, i.e.
+  L'a' to L'z'. For other Unicode character, the input character
+  is returned directly.
+
+
+  @param  Char  The character to convert.
+
+  @retval LowerCharacter   If the Char is with range L'a' to L'z'.
+  @retval Unchanged        Otherwise.
+
+**/
+STATIC
+CHAR16
+InternalCharToUpper (
+  IN      CHAR16                    Char
+  )
+{
+  if (Char >= L'a' && Char <= L'z') {
+    return Char - (L'a' - L'A');
+  }
+
+  return Char;
+}
+
+/**
+  Convert a Unicode character to numerical value.
+
+  This internal function only deal with Unicode character
+  which maps to a valid hexadecimal ASII character, i.e.
+  L'0' to L'9', L'a' to L'f' or L'A' to L'F'. For other 
+  Unicode character, the value returned does not make sense.
+
+  @param  Char  The character to convert.
+
+  @retval UINTN   The numerical value converted.
+
+**/
+STATIC
+UINTN
+InternalHexCharToUintn (
+  IN      CHAR16                    Char
+  )
+{
+  if (InternalIsDecimalDigitCharacter (Char)) {
+    return Char - L'0';
+  }
+
+  return (UINTN) (10 + InternalCharToUpper (Char) - L'A');
+}
+
+/**
+  Check if a Unicode character is a hexadecimal character.
+
+  This internal function checks if a Unicode character is a 
+  decimal character.  The valid hexadecimal character is 
+  L'0' to L'9', L'a' to L'f', or L'A' to L'F'.
+
+
+  @param  Char  The character to check against.
+
+  @retval TRUE  If the Char is a hexadecmial character.
+  @retval FALSE Otherwise.
+
+**/
+STATIC
+BOOLEAN
+InternalIsHexaDecimalDigitCharacter (
+  IN      CHAR16                    Char
+  )
+{
+
+  return (BOOLEAN) (InternalIsDecimalDigitCharacter (Char) ||
+    (Char >= L'A' && Char <= L'F') ||
+    (Char >= L'a' && Char <= L'f'));
+}
+
+/**
+  Convert a Null-terminated Unicode decimal string to a value of 
+  type UINTN.
+
+  This function returns a value of type UINTN by interpreting the contents 
+  of the Unicode string specified by String as a decimal number. The format 
+  of the input Unicode string String is:
+  
+                  [spaces] [decimal digits].
+                  
+  The valid decimal digit character is in the range [0-9]. The 
+  function will ignore the pad space, which includes spaces or 
+  tab characters, before [decimal digits]. The running zero in the 
+  beginning of [decimal digits] will be ignored. Then, the function 
+  stops at the first character that is a not a valid decimal character 
+  or a Null-terminator, whichever one comes first. 
+  
+  If String is NULL, then ASSERT().
+  If String is not aligned in a 16-bit boundary, then ASSERT().  
+  If String has only pad spaces, then 0 is returned.
+  If String has no pad spaces or valid decimal digits, 
+  then 0 is returned.
+  If the number represented by String overflows according 
+  to the range defined by UINTN, then ASSERT().
+  
+  If PcdMaximumUnicodeStringLength is not zero, and String contains 
+  more than PcdMaximumUnicodeStringLength Unicode characters not including 
+  the Null-terminator, then ASSERT().
+
+  @param  String			    Pointer to a Null-terminated Unicode string.
+
+  @retval UINTN           
+
+**/
+UINTN
+EFIAPI
+StrDecimalToUintn (
+  IN      CONST CHAR16      	      *String
+  )
+{
+  UINTN     Result;
+  
+  ASSERT (String != NULL);
+  ASSERT (((UINTN) String & 0x01) == 0);
+  ASSERT (StrLen (String) < PcdGet32 (PcdMaximumUnicodeStringLength));
+
+  //
+  // Ignore the pad spaces (space or tab)
+  //
+  while ((*String == L' ') || (*String == L'\t')) {
+    String++;
+  }
+
+  //
+  // Ignore leading Zeros after the spaces
+  //
+  while (*String == L'0') {
+    String++;
+  }
+
+  Result = 0;
+
+  while (InternalIsDecimalDigitCharacter (*String)) {
+    //
+    // If the number represented by String overflows according 
+    // to the range defined by UINTN, then ASSERT().
+    //
+    ASSERT ((Result < QUIENT_MAX_UINTN_DIVIDED_BY_10) ||
+      ((Result == QUIENT_MAX_UINTN_DIVIDED_BY_10) &&
+      (*String - L'0') <= REMINDER_MAX_UINTN_DIVIDED_BY_10)
+      );
+
+    Result = Result * 10 + (*String - L'0');
+    String++;
+  }
+  
+  return Result;
+}
+
+
+/**
+  Convert a Null-terminated Unicode decimal string to a value of 
+  type UINT64.
+
+  This function returns a value of type UINT64 by interpreting the contents 
+  of the Unicode string specified by String as a decimal number. The format 
+  of the input Unicode string String is:
+  
+                  [spaces] [decimal digits].
+                  
+  The valid decimal digit character is in the range [0-9]. The 
+  function will ignore the pad space, which includes spaces or 
+  tab characters, before [decimal digits]. The running zero in the 
+  beginning of [decimal digits] will be ignored. Then, the function 
+  stops at the first character that is a not a valid decimal character 
+  or a Null-terminator, whichever one comes first. 
+  
+  If String is NULL, then ASSERT().
+  If String is not aligned in a 16-bit boundary, then ASSERT().  
+  If String has only pad spaces, then 0 is returned.
+  If String has no pad spaces or valid decimal digits, 
+  then 0 is returned.
+  If the number represented by String overflows according 
+  to the range defined by UINT64, then ASSERT().
+  
+  If PcdMaximumUnicodeStringLength is not zero, and String contains 
+  more than PcdMaximumUnicodeStringLength Unicode characters not including 
+  the Null-terminator, then ASSERT().
+
+  @param  String			    Pointer to a Null-terminated Unicode string.
+
+  @retval UINT64           
+
+**/
+UINT64
+EFIAPI
+StrDecimalToUint64 (
+  IN      CONST CHAR16      	      *String
+  )
+{
+  UINT64     Result;
+  
+  ASSERT (String != NULL);
+  ASSERT (((UINTN) String & 0x01) == 0);
+  ASSERT (StrLen (String) < PcdGet32 (PcdMaximumUnicodeStringLength));
+
+  //
+  // Ignore the pad spaces (space or tab)
+  //
+  while ((*String == L' ') || (*String == L'\t')) {
+    String++;
+  }
+
+  //
+  // Ignore leading Zeros after the spaces
+  //
+  while (*String == L'0') {
+    String++;
+  }
+
+  Result = 0;
+
+  while (InternalIsDecimalDigitCharacter (*String)) {
+    //
+    // If the number represented by String overflows according 
+    // to the range defined by UINTN, then ASSERT().
+    //
+    ASSERT ((Result < QUIENT_MAX_UINT64_DIVIDED_BY_10) || 
+      ((Result == QUIENT_MAX_UINT64_DIVIDED_BY_10) && 
+      (*String - L'0') <= REMINDER_MAX_UINT64_DIVIDED_BY_10)
+      );
+
+    Result = MultU64x32 (Result, 10) + (*String - L'0');
+    String++;
+  }
+  
+  return Result;
+}
+
+/**
+  Convert a Null-terminated Unicode hexadecimal string to a value of type UINTN.
+
+  This function returns a value of type UINTN by interpreting the contents 
+  of the Unicode string specified by String as a hexadecimal number. 
+  The format of the input Unicode string String is:
+  
+                  [spaces][zeros][x][hexadecimal digits]. 
+
+  The valid hexadecimal digit character is in the range [0-9], [a-f] and [A-F]. 
+  The prefix "0x" is optional. Both "x" and "X" is allowed in "0x" prefix. 
+  If "x" appears in the input string, it must be prefixed with at least one 0. 
+  The function will ignore the pad space, which includes spaces or tab characters, 
+  before [zeros], [x] or [hexadecimal digit]. The running zero before [x] or 
+  [hexadecimal digit] will be ignored. Then, the decoding starts after [x] or the 
+  first valid hexadecimal digit. Then, the function stops at the first character that is 
+  a not a valid hexadecimal character or NULL, whichever one comes first.
+
+  If String is NULL, then ASSERT().
+  If String is not aligned in a 16-bit boundary, then ASSERT().
+  If String has only pad spaces, then zero is returned.
+  If String has no leading pad spaces, leading zeros or valid hexadecimal digits, 
+  then zero is returned.
+  If the number represented by String overflows according to the range defined by 
+  UINTN, then ASSERT().
+
+  If PcdMaximumUnicodeStringLength is not zero, and String contains more than 
+  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, 
+  then ASSERT().
+
+  @param  String			    Pointer to a Null-terminated Unicode string.
+
+  @retval UINTN
+
+**/
+UINTN
+EFIAPI
+StrHexToUintn (
+  IN      CONST CHAR16      	      *String
+  )
+{
+  UINTN     Result;
+
+  ASSERT (String != NULL);
+  ASSERT (StrLen (String) < PcdGet32 (PcdMaximumUnicodeStringLength));
+  
+  //
+  // Ignore the pad spaces (space or tab) 
+  //
+  while ((*String == L' ') || (*String == L'\t')) {
+    String++;
+  }
+
+  //
+  // Ignore leading Zeros after the spaces
+  //
+  while (*String == L'0') {
+    String++;
+  }
+
+  if (InternalCharToUpper (*String) == L'X') {
+    ASSERT (*(String - 1)  == L'0');
+    if (*(String - 1)  != L'0') {
+      return 0;
+    }
+    //
+    // Skip the 'X'
+    //
+    String++;
+  }
+
+  Result = 0;
+  
+  while (InternalIsHexaDecimalDigitCharacter (*String)) {
+    //
+    // If the Hex Number represented by String overflows according 
+    // to the range defined by UINTN, then ASSERT().
+    //
+    ASSERT ((Result < QUIENT_MAX_UINTN_DIVIDED_BY_16) ||
+      ((Result == QUIENT_MAX_UINTN_DIVIDED_BY_16) && 
+      (InternalHexCharToUintn (*String) <= REMINDER_MAX_UINTN_DIVIDED_BY_16))
+      );
+
+    Result = (Result << 4) + InternalHexCharToUintn (*String);
+    String++;
+  }
+
+  return Result;
+}
+
+
+/**
+  Convert a Null-terminated Unicode hexadecimal string to a value of type UINT64.
+
+  This function returns a value of type UINT64 by interpreting the contents 
+  of the Unicode string specified by String as a hexadecimal number. 
+  The format of the input Unicode string String is 
+  
+                  [spaces][zeros][x][hexadecimal digits]. 
+
+  The valid hexadecimal digit character is in the range [0-9], [a-f] and [A-F]. 
+  The prefix "0x" is optional. Both "x" and "X" is allowed in "0x" prefix. 
+  If "x" appears in the input string, it must be prefixed with at least one 0. 
+  The function will ignore the pad space, which includes spaces or tab characters, 
+  before [zeros], [x] or [hexadecimal digit]. The running zero before [x] or 
+  [hexadecimal digit] will be ignored. Then, the decoding starts after [x] or the 
+  first valid hexadecimal digit. Then, the function stops at the first character that is 
+  a not a valid hexadecimal character or NULL, whichever one comes first.
+
+  If String is NULL, then ASSERT().
+  If String is not aligned in a 16-bit boundary, then ASSERT().
+  If String has only pad spaces, then zero is returned.
+  If String has no leading pad spaces, leading zeros or valid hexadecimal digits, 
+  then zero is returned.
+  If the number represented by String overflows according to the range defined by 
+  UINT64, then ASSERT().
+
+  If PcdMaximumUnicodeStringLength is not zero, and String contains more than 
+  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, 
+  then ASSERT().
+
+  @param  String			    Pointer to a Null-terminated Unicode string.
+
+  @retval UINT64
+
+**/
+UINT64
+EFIAPI
+StrHexToUint64 (
+  IN      CONST CHAR16      	      *String
+  )
+{
+  UINT64    Result;
+
+  ASSERT (String != NULL);
+  ASSERT (StrLen (String) < PcdGet32 (PcdMaximumUnicodeStringLength));
+  
+  //
+  // Ignore the pad spaces (space or tab) 
+  //
+  while ((*String == L' ') || (*String == L'\t')) {
+    String++;
+  }
+
+  //
+  // Ignore leading Zeros after the spaces
+  //
+  while (*String == L'0') {
+    String++;
+  }
+
+  if (InternalCharToUpper (*String) == L'X') {
+    ASSERT (*(String - 1)  == L'0');
+    if (*(String - 1)  != L'0') {
+      return 0;
+    }
+    //
+    // Skip the 'X'
+    //
+    String++;
+  }
+
+  Result = 0;
+  
+  while (InternalIsHexaDecimalDigitCharacter (*String)) {
+    //
+    // If the Hex Number represented by String overflows according 
+    // to the range defined by UINTN, then ASSERT().
+    //
+    ASSERT ((Result < QUIENT_MAX_UINT64_DIVIDED_BY_16)|| 
+      ((Result == QUIENT_MAX_UINT64_DIVIDED_BY_16) && 
+      (InternalHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))
+      );
+
+    Result = LShiftU64 (Result, 4) + InternalHexCharToUintn (*String);
+    String++;
+  }
+
+  return Result;
+}
+
+/**
+  Check if a ASCII character is a decimal character.
+
+  This internal function checks if a Unicode character is a 
+  decimal character. The valid decimal character is from
+  '0' to '9'.
+
+  @param  Char  The character to check against.
+
+  @retval TRUE  If the Char is a decmial character.
+  @retval FALSE Otherwise.
+
+**/
+STATIC
+BOOLEAN
+InternalAsciiIsDecimalDigitCharacter (
+  IN      CHAR8                     Char
+  )
+{
+  return (BOOLEAN) (Char >= '0' && Char <= '9');
+}
+
+/**
+  Check if a ASCII character is a hexadecimal character.
+
+  This internal function checks if a ASCII character is a 
+  decimal character.  The valid hexadecimal character is 
+  L'0' to L'9', L'a' to L'f', or L'A' to L'F'.
+
+
+  @param  Char  The character to check against.
+
+  @retval TRUE  If the Char is a hexadecmial character.
+  @retval FALSE Otherwise.
+
+**/
+STATIC
+BOOLEAN
+InternalAsciiIsHexaDecimalDigitCharacter (
+  IN      CHAR8                    Char
+  )
+{
+
+  return (BOOLEAN) (InternalAsciiIsDecimalDigitCharacter (Char) ||
+    (Char >= 'A' && Char <= 'F') ||
+    (Char >= 'a' && Char <= 'f'));
+}
+
+/**
+  Convert a Null-terminated Unicode string to a Null-terminated 
+  ASCII string and returns the ASCII string.
+  
+  This function converts the content of the Unicode string Source 
+  to the ASCII string Destination by copying the lower 8 bits of 
+  each Unicode character. It returns Destination. The function terminates 
+  the ASCII string Destination  by appending a Null-terminator character 
+  at the end. The caller is responsible to make sure Destination points 
+  to a buffer with size equal or greater than (StrLen (Source) + 1) in bytes.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source is not aligned on a 16-bit boundary, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+
+  If any Unicode characters in Source contain non-zero value in 
+  the upper 8 bits, then ASSERT().
+  
+  If PcdMaximumUnicodeStringLength is not zero, and Source contains 
+  more than PcdMaximumUnicodeStringLength Unicode characters not including 
+  the Null-terminator, then ASSERT().
+  
+  If PcdMaximumAsciiStringLength is not zero, and Source contains more 
+  than PcdMaximumAsciiStringLength Unicode characters not including the 
+  Null-terminator, then ASSERT().
+
+  @param  Source        Pointer to a Null-terminated Unicode string.
+  @param  Destination   Pointer to a Null-terminated ASCII string.
+
+  @reture Destination
+
+**/
+CHAR8 *
+EFIAPI
+UnicodeStrToAsciiStr (
+  IN      CONST CHAR16      	      *Source,
+  OUT 	  CHAR8  	                  *Destination
+  )
+{
+  ASSERT (Destination != NULL);
+  ASSERT (Source != NULL);
+
+  //
+  // Source and Destination should not overlap
+  //
+  ASSERT ((UINTN) ((CHAR16 *) Destination -  Source) > StrLen (Source));
+  ASSERT ((UINTN) ((CHAR8 *) Source - Destination) > StrLen (Source));
+
+  //
+  // If PcdMaximumUnicodeStringLength is not zero,
+  // length of Source should not more than PcdMaximumUnicodeStringLength
+  //
+  if (PcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
+    ASSERT (StrLen (Source) < PcdGet32 (PcdMaximumUnicodeStringLength));
+  }
+
+  while (*Source != '\0') {
+    //
+    // If any Unicode characters in Source contain 
+    // non-zero value in the upper 8 bits, then ASSERT().
+    //
+    ASSERT (*Source < 0x100);
+    *(Destination++) = (CHAR8) *(Source++);
+  }
+
+  *Destination = '\0';
+  
+  return Destination;
+}
+
+
+/**
+  Copies one Null-terminated ASCII string to another Null-terminated ASCII
+  string and returns the new ASCII string.
+
+  This function copies the contents of the ASCII string Source to the ASCII
+  string Destination, and returns Destination. If Source and Destination
+  overlap, then the results are undefined.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and Source contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+
+  @param  Destination Pointer to a Null-terminated ASCII string.
+  @param  Source      Pointer to a Null-terminated ASCII string.
+
+  @return Destination
+
+**/
+CHAR8 *
+EFIAPI
+AsciiStrCpy (
+  OUT     CHAR8                     *Destination,
+  IN      CONST CHAR8               *Source
+  )
+{
+  CHAR8                             *ReturnValue;
+
+  //
+  // Destination cannot be NULL
+  //
+  ASSERT (Destination != NULL);
+
+  //
+  // Destination and source cannot overlap
+  //
+  ASSERT ((UINTN)(Destination - Source) > AsciiStrLen (Source));
+  ASSERT ((UINTN)(Source - Destination) > AsciiStrLen (Source));
+
+  ReturnValue = Destination;
+  while (*Source) {
+    *(Destination++) = *(Source++);
+  }
+  *Destination = 0;
+  return ReturnValue;
+}
+
+/**
+  Copies one Null-terminated ASCII string with a maximum length to another
+  Null-terminated ASCII string with a maximum length and returns the new ASCII
+  string.
+
+  This function copies the contents of the ASCII string Source to the ASCII
+  string Destination, and returns Destination. At most, Length ASCII characters
+  are copied from Source to Destination. If Length is 0, then Destination is
+  returned unmodified. If Length is greater that the number of ASCII characters
+  in Source, then Destination is padded with Null ASCII characters. If Source
+  and Destination overlap, then the results are undefined.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, and Source contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+
+  @param  Destination Pointer to a Null-terminated ASCII string.
+  @param  Source      Pointer to a Null-terminated ASCII string.
+  @param  Length      Maximum number of ASCII characters to copy.
+
+  @return Destination
+
+**/
+CHAR8 *
+EFIAPI
+AsciiStrnCpy (
+  OUT     CHAR8                     *Destination,
+  IN      CONST CHAR8               *Source,
+  IN      UINTN                     Length
+  )
+{
+  CHAR8                             *ReturnValue;
+
+  if (Length == 0) {
+    return Destination;
+  }
+
+  //
+  // Destination cannot be NULL
+  //
+  ASSERT (Destination != NULL);
+
+  //
+  // Destination and source cannot overlap
+  //
+  ASSERT ((UINTN)(Destination - Source) > AsciiStrLen (Source));
+  ASSERT ((UINTN)(Source - Destination) >= Length);
+
+  ReturnValue = Destination;
+
+  while (*Source && Length > 0) {
+    *(Destination++) = *(Source++);
+    Length--;
+  }
+
+  ZeroMem (Destination, Length * sizeof (*Destination));
+  return ReturnValue;
+}
+
+/**
+  Returns the length of a Null-terminated ASCII string.
+
+  This function returns the number of ASCII characters in the Null-terminated
+  ASCII string specified by String.
+
+  If String is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and String contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+
+  @param  String  Pointer to a Null-terminated ASCII string.
+
+  @return The length of String.
+
+**/
+UINTN
+EFIAPI
+AsciiStrLen (
+  IN      CONST CHAR8               *String
+  )
+{
+  UINTN                             Length;
+
+  ASSERT (String != NULL);
+
+  for (Length = 0; *String != '\0'; String++, Length++) {
+    //
+    // If PcdMaximumUnicodeStringLength is not zero,
+    // length should not more than PcdMaximumUnicodeStringLength
+    //
+    if (PcdGet32 (PcdMaximumAsciiStringLength) != 0) {
+      ASSERT (Length < PcdGet32 (PcdMaximumAsciiStringLength));
+    }
+  }
+  return Length;
+}
+
+/**
+  Returns the size of a Null-terminated ASCII string in bytes, including the
+  Null terminator.
+
+  This function returns the size, in bytes, of the Null-terminated ASCII string
+  specified by String.
+
+  If String is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and String contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+
+  @param  String  Pointer to a Null-terminated ASCII string.
+
+  @return The size of String.
+
+**/
+UINTN
+EFIAPI
+AsciiStrSize (
+  IN      CONST CHAR8               *String
+  )
+{
+  return (AsciiStrLen (String) + 1) * sizeof (*String);
+}
+
+/**
+  Compares two Null-terminated ASCII strings, and returns the difference
+  between the first mismatched ASCII characters.
+
+  This function compares the Null-terminated ASCII string FirstString to the
+  Null-terminated ASCII string SecondString. If FirstString is identical to
+  SecondString, then 0 is returned. Otherwise, the value returned is the first
+  mismatched ASCII character in SecondString subtracted from the first
+  mismatched ASCII character in FirstString.
+
+  If FirstString is NULL, then ASSERT().
+  If SecondString is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and SecondString contains more
+  than PcdMaximumAsciiStringLength ASCII characters not including the
+  Null-terminator, then ASSERT().
+
+  @param  FirstString   Pointer to a Null-terminated ASCII string.
+  @param  SecondString  Pointer to a Null-terminated ASCII string.
+
+  @retval 0   FirstString is identical to SecondString.
+  @retval !=0 FirstString is not identical to SecondString.
+
+**/
+INTN
+EFIAPI
+AsciiStrCmp (
+  IN      CONST CHAR8               *FirstString,
+  IN      CONST CHAR8               *SecondString
+  )
+{
+  //
+  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
+  //
+  ASSERT (AsciiStrSize (FirstString));
+  ASSERT (AsciiStrSize (SecondString));
+
+  while ((*FirstString != '\0') && (*FirstString == *SecondString)) {
+    FirstString++;
+    SecondString++;
+  }
+
+  return *FirstString - *SecondString;
+}
+
+/**
+  Converts a lowercase Ascii character to upper one
+
+  If Chr is lowercase Ascii character, then converts it to upper one.
+
+  If Value >= 0xA0, then ASSERT().
+  If (Value & 0x0F) >= 0x0A, then ASSERT().
+
+  @param  chr   one Ascii character
+
+  @return The uppercase value of Ascii character 
+
+**/
+STATIC
+CHAR8
+AsciiToUpper (
+  IN      CHAR8                     Chr
+  )
+{
+  return (UINT8) ((Chr >= 'a' && Chr <= 'z') ? Chr - ('a' - 'A') : Chr);
+}
+
+/**
+  Convert a ASCII character to numerical value.
+
+  This internal function only deal with Unicode character
+  which maps to a valid hexadecimal ASII character, i.e.
+  '0' to '9', 'a' to 'f' or 'A' to 'F'. For other 
+  ASCII character, the value returned does not make sense.
+
+  @param  Char  The character to convert.
+
+  @retval UINTN   The numerical value converted.
+
+**/
+STATIC
+UINTN
+InternalAsciiHexCharToUintn (
+  IN      CHAR8                    Char
+  )
+{
+  if (InternalIsDecimalDigitCharacter (Char)) {
+    return Char - '0';
+  }
+
+  return (UINTN) (10 + AsciiToUpper (Char) - 'A');
+}
+
+
+/**
+  Performs a case insensitive comparison of two Null-terminated ASCII strings,
+  and returns the difference between the first mismatched ASCII characters.
+
+  This function performs a case insensitive comparison of the Null-terminated
+  ASCII string FirstString to the Null-terminated ASCII string SecondString. If
+  FirstString is identical to SecondString, then 0 is returned. Otherwise, the
+  value returned is the first mismatched lower case ASCII character in
+  SecondString subtracted from the first mismatched lower case ASCII character
+  in FirstString.
+
+  If FirstString is NULL, then ASSERT().
+  If SecondString is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and SecondString contains more
+  than PcdMaximumAsciiStringLength ASCII characters not including the
+  Null-terminator, then ASSERT().
+
+  @param  FirstString   Pointer to a Null-terminated ASCII string.
+  @param  SecondString  Pointer to a Null-terminated ASCII string.
+
+  @retval 0   FirstString is identical to SecondString using case insensitive
+              comparisons.
+  @retval !=0 FirstString is not identical to SecondString using case
+              insensitive comparisons.
+
+**/
+INTN
+EFIAPI
+AsciiStriCmp (
+  IN      CONST CHAR8               *FirstString,
+  IN      CONST CHAR8               *SecondString
+  )
+{
+  CHAR8  UpperFirstString;
+  CHAR8  UpperSecondString;
+
+  //
+  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
+  //
+  ASSERT (AsciiStrSize (FirstString));
+  ASSERT (AsciiStrSize (SecondString));
+
+  UpperFirstString  = AsciiToUpper (*FirstString);
+  UpperSecondString = AsciiToUpper (*SecondString);
+  while ((*FirstString != '\0') && (UpperFirstString == UpperSecondString)) {
+    FirstString++;
+    SecondString++;
+    UpperFirstString  = AsciiToUpper (*FirstString);
+    UpperSecondString = AsciiToUpper (*SecondString);
+  }
+
+  return UpperFirstString - UpperSecondString;
+}
+
+/**
+  Compares two Null-terminated ASCII strings with maximum lengths, and returns
+  the difference between the first mismatched ASCII characters.
+
+  This function compares the Null-terminated ASCII string FirstString to the
+  Null-terminated ASCII  string SecondString. At most, Length ASCII characters
+  will be compared. If Length is 0, then 0 is returned. If FirstString is
+  identical to SecondString, then 0 is returned. Otherwise, the value returned
+  is the first mismatched ASCII character in SecondString subtracted from the
+  first mismatched ASCII character in FirstString.
+
+  If FirstString is NULL, then ASSERT().
+  If SecondString is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and SecondString contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+
+  @param  FirstString   Pointer to a Null-terminated ASCII string.
+  @param  SecondString  Pointer to a Null-terminated ASCII string.
+
+  @retval 0   FirstString is identical to SecondString.
+  @retval !=0 FirstString is not identical to SecondString.
+
+**/
+INTN
+EFIAPI
+AsciiStrnCmp (
+  IN      CONST CHAR8               *FirstString,
+  IN      CONST CHAR8               *SecondString,
+  IN      UINTN                     Length
+  )
+{
+  if (Length == 0) {
+    return 0;
+  }
+
+  //
+  // ASSERT both strings are less long than PcdMaximumAsciiStringLength
+  //
+  ASSERT (AsciiStrSize (FirstString));
+  ASSERT (AsciiStrSize (SecondString));
+
+  while ((*FirstString != '\0') &&
+         (*FirstString == *SecondString) &&
+         (Length > 1)) {
+    FirstString++;
+    SecondString++;
+    Length--;
+  }
+  return *FirstString - *SecondString;
+}
+
+/**
+  Concatenates one Null-terminated ASCII string to another Null-terminated
+  ASCII string, and returns the concatenated ASCII string.
+
+  This function concatenates two Null-terminated ASCII strings. The contents of
+  Null-terminated ASCII string Source are concatenated to the end of Null-
+  terminated ASCII string Destination. The Null-terminated concatenated ASCII
+  String is returned.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and Destination contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and Source contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero and concatenating Destination and
+  Source results in a ASCII string with more than PcdMaximumAsciiStringLength
+  ASCII characters, then ASSERT().
+
+  @param  Destination Pointer to a Null-terminated ASCII string.
+  @param  Source      Pointer to a Null-terminated ASCII string.
+
+  @return Destination
+
+**/
+CHAR8 *
+EFIAPI
+AsciiStrCat (
+  IN OUT CHAR8    *Destination,
+  IN CONST CHAR8  *Source
+  )
+{
+  AsciiStrCpy (Destination + AsciiStrLen (Destination), Source);
+
+  //
+  // Size of the resulting string should never be zero.
+  // PcdMaximumUnicodeStringLength is tested inside StrLen().
+  //
+  ASSERT (AsciiStrSize (Destination) != 0);
+  return Destination;
+}
+
+/**
+  Concatenates one Null-terminated ASCII string with a maximum length to the
+  end of another Null-terminated ASCII string, and returns the concatenated
+  ASCII string.
+
+  This function concatenates two Null-terminated ASCII strings. The contents
+  of Null-terminated ASCII string Source are concatenated to the end of Null-
+  terminated ASCII string Destination, and Destination is returned. At most,
+  Length ASCII characters are concatenated from Source to the end of
+  Destination, and Destination is always Null-terminated. If Length is 0, then
+  Destination is returned unmodified. If Source and Destination overlap, then
+  the results are undefined.
+
+  If Destination is NULL, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, and Destination contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, and Source contains more than
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
+  then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, and concatenating Destination and
+  Source results in a ASCII string with more than PcdMaximumAsciiStringLength
+  ASCII characters not including the Null-terminator, then ASSERT().
+
+  @param  Destination Pointer to a Null-terminated ASCII string.
+  @param  Source      Pointer to a Null-terminated ASCII string.
+  @param  Length      Maximum number of ASCII characters to concatenate from
+                      Source.
+
+  @return Destination
+
+**/
+CHAR8 *
+EFIAPI
+AsciiStrnCat (
+  IN OUT  CHAR8                     *Destination,
+  IN      CONST CHAR8               *Source,
+  IN      UINTN                     Length
+  )
+{
+  AsciiStrnCpy (Destination + AsciiStrLen (Destination), Source, Length);
+
+  //
+  // Size of the resulting string should never be zero.
+  // PcdMaximumUnicodeStringLength is tested inside StrLen().
+  //
+  ASSERT (AsciiStrSize (Destination) != 0);
+  return Destination;
+}
+
+/**
+  Returns the first occurance of a Null-terminated ASCII sub-string 
+  in a Null-terminated ASCII string.
+
+  This function scans the contents of the ASCII string specified by String 
+  and returns the first occurrence of SearchString. If SearchString is not 
+  found in String, then NULL is returned. If the length of SearchString is zero, 
+  then String is returned.
+  
+  If String is NULL, then ASSERT().
+  If SearchString is NULL, then ASSERT().
+
+  If PcdMaximumAsciiStringLength is not zero, and SearchString or 
+  String contains more than PcdMaximumAsciiStringLength Unicode characters 
+  not including the Null-terminator, then ASSERT().
+
+  @param  String				  Pointer to a Null-terminated ASCII string.
+  @param  SearchString	  Pointer to a Null-terminated ASCII string to search for.
+
+  @retval NULL            If the SearchString does not appear in String.
+  @retval !NULL           If there is a match.
+
+**/
+CHAR8 *
+EFIAPI
+AsciiStrStr (
+  IN      CONST CHAR8      	      *String,
+  IN      CONST CHAR8             *SearchString
+  )
+{
+  CONST CHAR8 *FirstMatch;
+  CONST CHAR8 *SearchStringTmp;
+
+  ASSERT (String != NULL);
+  ASSERT (SearchString != NULL);
+
+  //
+  // If PcdMaximumUnicodeStringLength is not zero,
+  // length of String should not more than PcdMaximumUnicodeStringLength
+  //
+  if (PcdGet32 (PcdMaximumAsciiStringLength) != 0) {
+    ASSERT (AsciiStrLen (String) < PcdGet32 (PcdMaximumAsciiStringLength));
+  }
+
+  //
+  // If PcdMaximumUnicodeStringLength is not zero,
+  // length of SearchString should not more than PcdMaximumUnicodeStringLength
+  //
+  if (PcdGet32 (PcdMaximumAsciiStringLength) != 0) {
+    ASSERT (AsciiStrLen (SearchString) < PcdGet32 (PcdMaximumAsciiStringLength));
+  }
+
+  while (*String != '\0') {
+    SearchStringTmp = SearchString;
+    FirstMatch = String;
+    
+    while ((*String == *SearchStringTmp) 
+            && (*SearchStringTmp != '\0') 
+            && (*String != '\0')) {
+      String++;
+      SearchStringTmp++;
+    } 
+    
+    if (*SearchStringTmp == '\0') {
+      return (CHAR8 *) FirstMatch;
+    }
+
+    if (SearchStringTmp == SearchString) {
+      //
+      // If no character from SearchString match,
+      // move the pointer to the String under search
+      // by one character.
+      //
+      String++;
+    }
+
+  }
+
+  return NULL;
+}
+
+/**
+  Convert a Null-terminated ASCII decimal string to a value of type 
+  UINTN.
+
+  This function returns a value of type UINTN by interpreting the contents 
+  of the ASCII string String as a decimal number. The format of the input 
+  ASCII string String is:
+  
+                    [spaces] [decimal digits].
+  
+  The valid decimal digit character is in the range [0-9]. The function will 
+  ignore the pad space, which includes spaces or tab characters, before the digits. 
+  The running zero in the beginning of [decimal digits] will be ignored. Then, the 
+  function stops at the first character that is a not a valid decimal character or 
+  Null-terminator, whichever on comes first.
+  
+  If String has only pad spaces, then 0 is returned.
+  If String has no pad spaces or valid decimal digits, then 0 is returned.
+  If the number represented by String overflows according to the range defined by 
+  UINTN, then ASSERT().
+  If String is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, and String contains more than 
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, 
+  then ASSERT().
+
+  @param  String			    Pointer to a Null-terminated ASCII string.
+
+  @retval UINTN           
+
+**/
+UINTN
+EFIAPI
+AsciiStrDecimalToUintn (
+  IN      CONST CHAR8      	        *String
+  )
+{
+  UINTN     Result;
+  
+  ASSERT (String != NULL);
+  ASSERT (AsciiStrLen (String) < PcdGet32 (PcdMaximumAsciiStringLength));
+
+  //
+  // Ignore the pad spaces (space or tab)
+  //
+  while ((*String == ' ') || (*String == '\t')) {
+    String++;
+  }
+
+  //
+  // Ignore leading Zeros after the spaces
+  //
+  while (*String == '0') {
+    String++;
+  }
+
+  Result = 0;
+
+  while (InternalAsciiIsDecimalDigitCharacter (*String)) {
+    //
+    // If the number represented by String overflows according 
+    // to the range defined by UINTN, then ASSERT().
+    //
+    ASSERT ((Result < QUIENT_MAX_UINTN_DIVIDED_BY_10) ||
+      ((Result == QUIENT_MAX_UINTN_DIVIDED_BY_10) && 
+      (*String - '0') <= REMINDER_MAX_UINTN_DIVIDED_BY_10)
+      );
+
+    Result = Result * 10 + (*String - '0');
+    String++;
+  }
+  
+  return Result;
+}
+
+
+/**
+  Convert a Null-terminated ASCII decimal string to a value of type 
+  UINT64.
+
+  This function returns a value of type UINT64 by interpreting the contents 
+  of the ASCII string String as a decimal number. The format of the input 
+  ASCII string String is:
+  
+                    [spaces] [decimal digits].
+  
+  The valid decimal digit character is in the range [0-9]. The function will 
+  ignore the pad space, which includes spaces or tab characters, before the digits. 
+  The running zero in the beginning of [decimal digits] will be ignored. Then, the 
+  function stops at the first character that is a not a valid decimal character or 
+  Null-terminator, whichever on comes first.
+  
+  If String has only pad spaces, then 0 is returned.
+  If String has no pad spaces or valid decimal digits, then 0 is returned.
+  If the number represented by String overflows according to the range defined by 
+  UINT64, then ASSERT().
+  If String is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, and String contains more than 
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, 
+  then ASSERT().
+
+  @param  String			    Pointer to a Null-terminated ASCII string.
+
+  @retval UINT64           
+
+**/
+UINT64
+EFIAPI
+AsciiStrDecimalToUint64 (
+  IN      CONST CHAR8      	      *String
+  )
+{
+  UINT64     Result;
+  
+  ASSERT (String != NULL);
+  ASSERT (AsciiStrLen (String) < PcdGet32 (PcdMaximumAsciiStringLength));
+
+  //
+  // Ignore the pad spaces (space or tab)
+  //
+  while ((*String == ' ') || (*String == '\t')) {
+    String++;
+  }
+
+  //
+  // Ignore leading Zeros after the spaces
+  //
+  while (*String == '0') {
+    String++;
+  }
+
+  Result = 0;
+
+  while (InternalAsciiIsDecimalDigitCharacter (*String)) {
+    //
+    // If the number represented by String overflows according 
+    // to the range defined by UINTN, then ASSERT().
+    //
+    ASSERT ((Result < QUIENT_MAX_UINT64_DIVIDED_BY_10) || 
+      ((Result == QUIENT_MAX_UINT64_DIVIDED_BY_10) && 
+      (*String - '0') <= REMINDER_MAX_UINT64_DIVIDED_BY_10)
+      );
+
+    Result = MultU64x32 (Result, 10) + (*String - '0');
+    String++;
+  }
+  
+  return Result;
+}
+
+/**
+  Convert a Null-terminated ASCII hexadecimal string to a value of type UINTN.
+
+  This function returns a value of type UINTN by interpreting the contents of 
+  the ASCII string String as a hexadecimal number. The format of the input ASCII 
+  string String is:
+  
+                  [spaces][zeros][x][hexadecimal digits].
+                  
+  The valid hexadecimal digit character is in the range [0-9], [a-f] and [A-F]. 
+  The prefix "0x" is optional. Both "x" and "X" is allowed in "0x" prefix. If "x" 
+  appears in the input string, it must be prefixed with at least one 0. The function 
+  will ignore the pad space, which includes spaces or tab characters, before [zeros], 
+  [x] or [hexadecimal digits]. The running zero before [x] or [hexadecimal digits] 
+  will be ignored. Then, the decoding starts after [x] or the first valid hexadecimal 
+  digit. Then, the function stops at the first character that is a not a valid 
+  hexadecimal character or Null-terminator, whichever on comes first.
+  
+  If String has only pad spaces, then 0 is returned.
+  If String has no leading pad spaces, leading zeros or valid hexadecimal digits, then
+  0 is returned.
+
+  If the number represented by String overflows according to the range defined by UINTN, 
+  then ASSERT().
+  If String is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, 
+  and String contains more than PcdMaximumAsciiStringLength ASCII characters not including 
+  the Null-terminator, then ASSERT().
+
+  @param  String			    Pointer to a Null-terminated ASCII string.
+
+  @retval UINTN
+
+**/
+UINTN
+EFIAPI
+AsciiStrHexToUintn (
+  IN      CONST CHAR8      	      *String
+  )
+{
+  UINTN     Result;
+
+  ASSERT (String != NULL);
+  ASSERT (AsciiStrLen (String) < PcdGet32 (PcdMaximumAsciiStringLength));
+  
+  //
+  // Ignore the pad spaces (space or tab) 
+  //
+  while ((*String == ' ') || (*String == '\t')) {
+    String++;
+  }
+
+  //
+  // Ignore leading Zeros after the spaces
+  //
+  while (*String == '0') {
+    String++;
+  }
+
+  if (AsciiToUpper (*String) == 'X') {
+    ASSERT (*(String - 1)  == '0');
+    if (*(String - 1)  != '0') {
+      return 0;
+    }
+    //
+    // Skip the 'X'
+    //
+    String++;
+  }
+
+  Result = 0;
+  
+  while (InternalAsciiIsHexaDecimalDigitCharacter (*String)) {
+    //
+    // If the Hex Number represented by String overflows according 
+    // to the range defined by UINTN, then ASSERT().
+    //
+     ASSERT ((Result < QUIENT_MAX_UINTN_DIVIDED_BY_16) ||
+       ((Result == QUIENT_MAX_UINTN_DIVIDED_BY_16) && 
+       (InternalAsciiHexCharToUintn (*String) <= REMINDER_MAX_UINTN_DIVIDED_BY_16))
+       );
+
+    Result = (Result << 4) + InternalAsciiHexCharToUintn (*String);
+    String++;
+  }
+
+  return Result;
+}
+
+
+/**
+  Convert a Null-terminated ASCII hexadecimal string to a value of type UINT64.
+
+  This function returns a value of type UINT64 by interpreting the contents of 
+  the ASCII string String as a hexadecimal number. The format of the input ASCII 
+  string String is:
+  
+                  [spaces][zeros][x][hexadecimal digits].
+                  
+  The valid hexadecimal digit character is in the range [0-9], [a-f] and [A-F]. 
+  The prefix "0x" is optional. Both "x" and "X" is allowed in "0x" prefix. If "x" 
+  appears in the input string, it must be prefixed with at least one 0. The function 
+  will ignore the pad space, which includes spaces or tab characters, before [zeros], 
+  [x] or [hexadecimal digits]. The running zero before [x] or [hexadecimal digits] 
+  will be ignored. Then, the decoding starts after [x] or the first valid hexadecimal 
+  digit. Then, the function stops at the first character that is a not a valid 
+  hexadecimal character or Null-terminator, whichever on comes first.
+  
+  If String has only pad spaces, then 0 is returned.
+  If String has no leading pad spaces, leading zeros or valid hexadecimal digits, then
+  0 is returned.
+
+  If the number represented by String overflows according to the range defined by UINT64, 
+  then ASSERT().
+  If String is NULL, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, 
+  and String contains more than PcdMaximumAsciiStringLength ASCII characters not including 
+  the Null-terminator, then ASSERT().
+
+  @param  String			    Pointer to a Null-terminated ASCII string.
+
+  @retval UINT64
+
+**/
+UINT64
+EFIAPI
+AsciiStrHexToUint64 (
+  IN      CONST CHAR8      	      *String
+  )
+{
+  UINT64    Result;
+
+  ASSERT (String != NULL);
+  ASSERT (AsciiStrLen (String) < PcdGet32 (PcdMaximumUnicodeStringLength));
+  
+  //
+  // Ignore the pad spaces (space or tab) and leading Zeros
+  //
+  //
+  // Ignore the pad spaces (space or tab) 
+  //
+  while ((*String == ' ') || (*String == '\t')) {
+    String++;
+  }
+
+  //
+  // Ignore leading Zeros after the spaces
+  //
+  while (*String == '0') {
+    String++;
+  }
+
+  if (AsciiToUpper (*String) == 'X') {
+    ASSERT (*(String - 1)  == '0');
+    if (*(String - 1)  != '0') {
+      return 0;
+    }
+    //
+    // Skip the 'X'
+    //
+    String++;
+  }
+
+  Result = 0;
+  
+  while (InternalAsciiIsHexaDecimalDigitCharacter (*String)) {
+    //
+    // If the Hex Number represented by String overflows according 
+    // to the range defined by UINTN, then ASSERT().
+    //
+    ASSERT ((Result < QUIENT_MAX_UINT64_DIVIDED_BY_16) ||
+      ((Result == QUIENT_MAX_UINT64_DIVIDED_BY_16) && 
+      (InternalAsciiHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))
+      );
+
+    Result = LShiftU64 (Result, 4) + InternalAsciiHexCharToUintn (*String);
+    String++;
+  }
+
+  return Result;
+}
+
+
+/**
+  Convert one Null-terminated ASCII string to a Null-terminated 
+  Unicode string and returns the Unicode string.
+
+  This function converts the contents of the ASCII string Source to the Unicode 
+  string Destination, and returns Destination.  The function terminates the 
+  Unicode string Destination by appending a Null-terminator character at the end. 
+  The caller is responsible to make sure Destination points to a buffer with size 
+  equal or greater than ((AsciiStrLen (Source) + 1) * sizeof (CHAR16)) in bytes.
+  
+  If Destination is NULL, then ASSERT().
+  If Destination is not aligned on a 16-bit boundary, then ASSERT().
+  If Source is NULL, then ASSERT().
+  If Source and Destination overlap, then ASSERT().
+  If PcdMaximumAsciiStringLength is not zero, and Source contains more than 
+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, 
+  then ASSERT().
+  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than 
+  PcdMaximumUnicodeStringLength ASCII characters not including the 
+  Null-terminator, then ASSERT().
+
+  @param  Source        Pointer to a Null-terminated ASCII string.
+  @param  Destination   Pointer to a Null-terminated Unicode string.
+
+  @reture Destination
+
+**/
+CHAR16 *
+EFIAPI
+AsciiStrToUnicodeStr (
+  IN      CONST CHAR8       	      *Source,
+  OUT 	  CHAR16  	                *Destination
+  )
+{
+  ASSERT (Destination != NULL);
+  ASSERT (Source != NULL);
+
+  //
+  // Source and Destination should not overlap
+  //
+  ASSERT ((UINTN) ((CHAR8 *) Destination - Source) > AsciiStrLen (Source));
+  ASSERT ((UINTN) (Source - (CHAR8 *) Destination) > (AsciiStrLen (Source) * sizeof (CHAR16)));
+
+  //
+  // If PcdMaximumAsciiStringLength is not zero,
+  // length of Source should not more than PcdMaximumUnicodeStringLength
+  //
+  if (PcdGet32 (PcdMaximumAsciiStringLength) != 0) {
+    ASSERT (AsciiStrLen (Source) < PcdGet32 (PcdMaximumAsciiStringLength));
+  }
+
+  while (*Source != '\0') {
+    *(Destination++) = (CHAR16) *(Source++);
+  }
+  //
+  // End the Destination with a NULL.
+  //
+  *Destination = '\0';
+
+  return Destination;
+}
+
+/**
+  Converts an 8-bit value to an 8-bit BCD value.
+
+  Converts the 8-bit value specified by Value to BCD. The BCD value is
+  returned.
+
+  If Value >= 100, then ASSERT().
+
+  @param  Value The 8-bit value to convert to BCD. Range 0..99.
+
+  @return The BCD value
+
+**/
+UINT8
+EFIAPI
+DecimalToBcd8 (
+  IN      UINT8                     Value
+  )
+{
+  ASSERT (Value < 100);
+  return (UINT8) (((Value / 10) << 4) | (Value % 10));
+}
+
+/**
+  Converts an 8-bit BCD value to an 8-bit value.
+
+  Converts the 8-bit BCD value specified by Value to an 8-bit value. The 8-bit
+  value is returned.
+
+  If Value >= 0xA0, then ASSERT().
+  If (Value & 0x0F) >= 0x0A, then ASSERT().
+
+  @param  Value The 8-bit BCD value to convert to an 8-bit value.
+
+  @return The 8-bit value is returned.
+
+**/
+UINT8
+EFIAPI
+BcdToDecimal8 (
+  IN      UINT8                     Value
+  )
+{
+  ASSERT (Value < 0xa0);
+  ASSERT ((Value & 0xf) < 0xa);
+  return (UINT8) ((Value >> 4) * 10 + (Value & 0xf));
+}
+
+