[coreboot] r684 - coreboot-v3/lib

svn at coreboot.org svn at coreboot.org
Fri May 23 21:56:50 CEST 2008


Author: hailfinger
Date: 2008-05-23 21:56:50 +0200 (Fri, 23 May 2008)
New Revision: 684

Modified:
   coreboot-v3/lib/lzma.c
Log:
Print current and wanted LZMA scratchpad size in the decompression
routine. That allows people to either adjust compression parameters
or scratchpad size.
Having a similar check during build time would be nice.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Myles Watson <mylesgw at gmail.com>


Modified: coreboot-v3/lib/lzma.c
===================================================================
--- coreboot-v3/lib/lzma.c	2008-05-22 15:52:33 UTC (rev 683)
+++ coreboot-v3/lib/lzma.c	2008-05-23 19:56:50 UTC (rev 684)
@@ -14,6 +14,7 @@
 #include "string.h"
 #include "console.h"
 
+#define LZMA_SCRATCHPAD_SIZE 15980
 
 unsigned long ulzma(u8 *src, u8 *dst)
 {
@@ -24,7 +25,7 @@
 	int res;
 	CLzmaDecoderState state;
 	SizeT mallocneeds;
-	unsigned char scratchpad[15980];
+	unsigned char scratchpad[LZMA_SCRATCHPAD_SIZE];
 
 	memcpy(properties, src, LZMA_PROPERTIES_SIZE);
 	outSize = *(UInt32 *)(src + LZMA_PROPERTIES_SIZE);
@@ -32,8 +33,9 @@
 		printk(BIOS_WARNING, "Incorrect stream properties\n");
 	}
 	mallocneeds = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
-	if (mallocneeds > 15980) {
-		printk(BIOS_WARNING, "Decoder scratchpad too small!\n");
+	if (mallocneeds > LZMA_SCRATCHPAD_SIZE) {
+		printk(BIOS_WARNING,("Decoder scratchpad too small, have %i, need %i!\n",
+				LZMA_SCRATCHPAD_SIZE, mallocneeds);
 	}
 	state.Probs = (CProb *)scratchpad;
 	res = LzmaDecode(&state, src + LZMA_PROPERTIES_SIZE + 8, (SizeT)0xffffffff, &inProcessed,





More information about the coreboot mailing list