Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/xml.c
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/xml.c	(revision 1114)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/xml.c	(revision 1115)
@@ -1113,7 +1113,7 @@
 {
 	if(!dict)
 	{
-		//printf("XMLCastInteger: null dict\n");
+		printf("XMLCastInteger: null dict\n");
 		return 0;
 	}
 	if(dict->type == kTagTypeInteger) return (int)(dict->string);
Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c	(revision 1114)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c	(revision 1115)
@@ -816,24 +816,24 @@
 			return -1;
 		}
 	}
-		
+	
+	// Notify modules that the kernel has been decompressed, is about to be decoded
+	execute_hook("DecodeKernel", (void*)binary, NULL, NULL, NULL);
+	
 	ret = ThinFatFile(&binary, &len);
-    if (ret == 0 && len == 0 && archCpuType==CPU_TYPE_X86_64)
-    {
-        archCpuType=CPU_TYPE_I386;
-        ret = ThinFatFile(&binary, &len);
-    }
-    
-    // Notify modules that the kernel has been decompressed and thinned, is about to be decoded
-	execute_hook("DecodeKernel", (void*)binary, NULL, NULL, NULL);
-    
-    
-    ret = DecodeMachO(binary, rentry, raddr, rsize);
-    if (ret<0 && archCpuType==CPU_TYPE_X86_64)
-    {
-        archCpuType=CPU_TYPE_I386;
-        ret = DecodeMachO(binary, rentry, raddr, rsize);
-    }
-    
-    return ret;
+	  if (ret == 0 && len == 0 && archCpuType==CPU_TYPE_X86_64)
+	  {
+		  archCpuType=CPU_TYPE_I386;
+		  ret = ThinFatFile(&binary, &len);
+	  }
+
+	  ret = DecodeMachO(binary, rentry, raddr, rsize);
+
+	  if (ret<0 && archCpuType==CPU_TYPE_X86_64)
+	  {
+		  archCpuType=CPU_TYPE_I386;
+		  ret = DecodeMachO(binary, rentry, raddr, rsize);
+	  }
+
+	  return ret;
 }
Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c	(revision 1114)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c	(revision 1115)
@@ -376,7 +376,7 @@
         bool tryresume;
         bool tryresumedefault;
         bool forceresume;
-		bool usecache = false; //true;
+		bool usecache;
 
         // additional variable for testing alternate kernel image locations on boot helper partitions.
         char     bootFileSpec[512];
@@ -485,13 +485,10 @@
 			HibernateBoot((char *)val);
 			break;
 		}
-        
-		getBoolForKey(kUseKernelCache, &usecache, &bootInfo->bootConfig);
-		if(usecache) {
+		
+		if(getBoolForKey(kUseKernelCache, &usecache, &bootInfo->bootConfig) && usecache) {
 			if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
-                //ugly hack. FIX THIS
-                if(strcmp(val, "\\kernelcache") == 0) strlcpy(gBootKernelCacheFile, "kernelcache", sizeof("kernelcache"));
-				else strlcpy(gBootKernelCacheFile, val, len+1);
+				strlcpy(gBootKernelCacheFile, val, len+1);
 			}
 			else {
 				//Lion
@@ -569,10 +566,10 @@
                 trycache = 0;
                 break;
             }
-            if (ret == 0 && kerneltime > exttime) {
+            if (kerneltime > exttime) {
                 exttime = kerneltime;
             }
-            if (ret == 0 && cachetime != (exttime + 1)) {
+            if (cachetime != (exttime + 1)) {
                 trycache = 0;
                 break;
             }
Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/modules.c
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/modules.c	(revision 1114)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/modules.c	(revision 1115)
@@ -210,6 +210,8 @@
  */
 long long add_symbol(char* symbol, long long addr, char is64)
 {
+	if(is64) return  0xFFFFFFFF; // Fixme
+
 	// This only can handle 32bit symbols 
 	symbolList_t* entry;
 	//DBG("Adding symbol %s at 0x%X\n", symbol, addr);
@@ -221,7 +223,7 @@
 	entry->addr = (UInt32)addr;
 	entry->symbol = symbol;
 	
-	if(!is64 && strcmp(symbol, "start") == 0)
+	if(strcmp(symbol, "start") == 0)
 	{
 		return addr;
 	}
Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsa/zalloc.c
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/libsa/zalloc.c	(revision 1114)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsa/zalloc.c	(revision 1115)
@@ -46,7 +46,7 @@
 
 static zmem * zalloced;
 static zmem * zavailable;
-static unsigned short  availableNodes, allocedNodes, totalNodes;
+static short  availableNodes, allocedNodes, totalNodes;
 static char * zalloc_base;
 static char * zalloc_end;
 static void   (*zerror)(char *, size_t, const char *, int);
@@ -60,7 +60,7 @@
 size_t zalloced_size;
 #endif
 
-#define ZALLOC_NODES	32768 /* was 16384 */
+#define ZALLOC_NODES	16384
 
 static void malloc_error(char *addr, size_t size, const char *file, int line)
 {

Property changes on: branches/azimutz/trunkGraphicsEnablerModules
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /trunk:r1097-1102