tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some more 64-bit fixes. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10653 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2010-07-15 03:29:53 +00:00
parent d5cdd257e4
commit d34689b44a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
UnixPkg/Sec/SecMain.c
View File

@ -236,7 +236,7 @@ Returns:
InitialStackMemorySize = STACK_SIZE; InitialStackMemorySize = STACK_SIZE;
InitialStackMemory = (UINTN)MapMemory(0, InitialStackMemory = (UINTN)MapMemory(0,
(UINT32) InitialStackMemorySize, (UINT32) InitialStackMemorySize,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_ANONYMOUS | MAP_PRIVATE); MAP_ANONYMOUS | MAP_PRIVATE);
if (InitialStackMemory == 0) { if (InitialStackMemory == 0) {
printf ("ERROR : Can not open SecStack Exiting\n"); printf ("ERROR : Can not open SecStack Exiting\n");
@ -716,18 +716,26 @@ Returns:
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
// //
// Allocate space in UNIX (not emulator) memory. Extra space is for alignment // Allocate space in UNIX (not emulator) memory. Extra space is for alignment
// //
ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) malloc ((UINTN) (ImageContext.ImageSize + (ImageContext.SectionAlignment * 2))); ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) MapMemory (
0,
(UINT32) (ImageContext.ImageSize + (ImageContext.SectionAlignment * 2)),
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_ANONYMOUS | MAP_PRIVATE
);
if (ImageContext.ImageAddress == 0) { if (ImageContext.ImageAddress == 0) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
// //
// Align buffer on section boundry // Align buffer on section boundry
// //
ImageContext.ImageAddress += ImageContext.SectionAlignment - 1; ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;
ImageContext.ImageAddress &= ~(ImageContext.SectionAlignment - 1); ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1));
Status = PeCoffLoaderLoadImage (&ImageContext); Status = PeCoffLoaderLoadImage (&ImageContext);
@ -1123,7 +1131,7 @@ SecPeCoffRelocateImageExtraAction (
// //
GdbTempFile = fopen (gGdbWorkingFileName, "w"); GdbTempFile = fopen (gGdbWorkingFileName, "w");
if (GdbTempFile != NULL) { if (GdbTempFile != NULL) {
fprintf (GdbTempFile, "add-symbol-file %s 0x%x\n", ImageContext->PdbPointer, (unsigned int)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders)); fprintf (GdbTempFile, "add-symbol-file %s 0x%08lx\n", ImageContext->PdbPointer, (long unsigned int)(ImageContext->ImageAddress + ImageContext->SizeOfHeaders));
fclose (GdbTempFile); fclose (GdbTempFile);
// //