#include "Debug.h"\r
#include "Support.h"\r
\r
-STATIC\r
EFI_STATUS\r
EfiLdrPeCoffLoadPeRelocate (\r
IN EFILDR_LOADED_IMAGE *Image,\r
IN EFI_MEMORY_DESCRIPTOR *EfiMemoryDescriptor\r
);\r
\r
-STATIC\r
EFI_STATUS\r
EfiLdrPeCoffImageRead (\r
IN VOID *FHand,\r
OUT VOID *Buffer\r
);\r
\r
-STATIC\r
VOID *\r
EfiLdrPeCoffImageAddress (\r
IN EFILDR_LOADED_IMAGE *Image,\r
return Status;\r
}\r
\r
-STATIC\r
EFI_STATUS\r
EfiLdrPeCoffLoadPeRelocate (\r
IN EFILDR_LOADED_IMAGE *Image,\r
\r
case EFI_IMAGE_REL_BASED_LOW:\r
F16 = (UINT16 *) Fixup;\r
- *F16 = *F16 + (UINT16) Adjust;\r
+ *F16 = (UINT16) (*F16 + (UINT16) Adjust);\r
if (FixupData != NULL) {\r
*(UINT16 *) FixupData = *F16;\r
FixupData = FixupData + sizeof(UINT16);\r
return EFI_SUCCESS;\r
}\r
\r
-STATIC\r
EFI_STATUS\r
EfiLdrPeCoffImageRead (\r
IN VOID *FHand,\r
return EFI_SUCCESS;\r
}\r
\r
-STATIC\r
VOID *\r
EfiLdrPeCoffImageAddress (\r
IN EFILDR_LOADED_IMAGE *Image,\r
\r
Status = EFI_UNSUPPORTED;\r
\r
-#if EFI32\r
+#ifdef MDE_CPU_IA32\r
if (MachineType == EFI_IMAGE_MACHINE_IA32) {\r
Status = EFI_SUCCESS;\r
}\r
#endif\r
\r
-#if EFIX64\r
+#ifdef MDE_CPU_X64\r
if (MachineType == EFI_IMAGE_MACHINE_X64) {\r
Status = EFI_SUCCESS;\r
}\r
#endif\r
\r
-#if EFI64\r
+#ifdef MDE_CPU_IPF\r
if (MachineType == EFI_IMAGE_MACHINE_IA64) {\r
Status = EFI_SUCCESS;\r
}\r