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

Remove usage of MemoryAllocationLib, and use a simplistic allocation 

routine which makes use of the decompression scratch buffer.

This resolves a potential issue where the usage of the LZMA library
in the PEI phase may not have enough memory for the AllocatePool
function call.  (Some platforms may be extremely constrained in
heap space for the PEI phase.)

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8242 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jljusten 2009-05-05 19:46:28 +00:00
parent de29c94afc
commit 57cca89e0a
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
View File

@ -49,6 +49,5 @@
BaseLib
DebugLib
BaseMemoryLib
MemoryAllocationLib
ExtractGuidedSectionLib

41
IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c
View File

@ -20,7 +20,6 @@
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiDecompressLib.h>
#include <Library/ExtractGuidedSectionLib.h>
#include <Guid/LzmaDecompress.h>
@ -29,6 +28,17 @@
#include "Sdk/C/7zVersion.h"
#include "Sdk/C/LzmaDec.h"
//
// Global data
//
STATIC CONST VOID *mSourceLastUsedWithGetInfo;
STATIC UINT32 mSizeOfLastSource;
STATIC UINT32 mDecompressedSizeForLastSource;
STATIC VOID *mScratchBuffer;
STATIC UINTN mScratchBufferSize;
#define SCRATCH_BUFFER_REQUEST_SIZE SIZE_64KB
/**
Allocation routine used by LZMA decompression.
@ -44,7 +54,17 @@ SzAlloc (
size_t size
)
{
return AllocatePool (size);
VOID *addr;
if (mScratchBufferSize >= size) {
addr = mScratchBuffer;
mScratchBuffer = (VOID*) ((UINT8*)addr + size);
mScratchBufferSize -= size;
return addr;
} else {
ASSERT (FALSE);
return NULL;
}
}
/**
@ -60,9 +80,11 @@ SzFree (
void *address
)
{
if (address != NULL) {
FreePool (address);
}
//
// We use the 'scratch buffer' for allocations, so there is no free
// operation required. The scratch buffer will be freed by the caller
// of the decompression code.
//
}
STATIC ISzAlloc g_Alloc = { SzAlloc, SzFree };
@ -90,10 +112,6 @@ GetDecodedSizeOfBuf(
// LZMA functions and data as defined in local LzmaDecompress.h
//
STATIC CONST VOID *mSourceLastUsedWithGetInfo;
STATIC UINT32 mSizeOfLastSource;
STATIC UINT32 mDecompressedSizeForLastSource;
/**
The internal implementation of *_DECOMPRESS_PROTOCOL.GetInfo().
@ -124,7 +142,7 @@ LzmaUefiDecompressGetInfo (
mSizeOfLastSource = SourceSize;
mDecompressedSizeForLastSource = (UInt32)DecodedSize;
*DestinationSize = mDecompressedSizeForLastSource;
*ScratchSize = 0x10;
*ScratchSize = SCRATCH_BUFFER_REQUEST_SIZE;
return RETURN_SUCCESS;
}
@ -159,6 +177,9 @@ LzmaUefiDecompress (
decodedBufSize = (SizeT)mDecompressedSizeForLastSource;
encodedDataSize = (SizeT)(mSizeOfLastSource - LZMA_HEADER_SIZE);
mScratchBuffer = Scratch;
mScratchBufferSize = SCRATCH_BUFFER_REQUEST_SIZE;
lzmaResult = LzmaDecode(
Destination,
&decodedBufSize,