X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fbinary.c;h=8b7e7448325974ca267618cf0abbfb7a015203d9;hb=c865bd1ebd2e33f0477f3f0145acb98786b1cc41;hp=94c347ff7f8d52917d271f35b49000749f46e4eb;hpb=d82586eccb8bc74aec2b2d6cf4ee2b4ed844e957;p=tpg%2Facess2.git

diff --git a/Kernel/binary.c b/Kernel/binary.c
index 94c347ff..8b7e7448 100644
--- a/Kernel/binary.c
+++ b/Kernel/binary.c
@@ -28,7 +28,6 @@ extern char	*Threads_GetName(int ID);
 extern tKernelSymbol	gKernelSymbols[];
 extern tKernelSymbol	gKernelSymbolsEnd[];
 extern tBinaryType	gELF_Info;
-extern void	MM_DumpTables(tVAddr, tVAddr);
 
 // === PROTOTYPES ===
  int	Proc_Execve(const char *File, const char **ArgV, const char **EnvP);
@@ -171,7 +170,7 @@ int Proc_Execve(const char *File, const char **ArgV, const char **EnvP)
 	
 	LOG("entry = 0x%x, bases[0] = 0x%x", entry, bases[0]);
 
-	MM_DumpTables(0, KERNEL_BASE);
+//	MM_DumpTables(0, KERNEL_BASE);
 
 	LEAVE('-');
 	// --- And... Jump to it
@@ -365,10 +364,12 @@ tVAddr Binary_MapIn(tBinary *Binary, const char *Path, tVAddr LoadMin, tVAddr Lo
 				protflags, MMAP_MAP_PRIVATE|mapflags,
 				0, 0
 				);
+//			memset((void*)(addr + sect->FileSize), 0, sect->MemSize - sect->FileSize);
 		}
 	}
 	
 	Log_Debug("Binary", "PID %i - Mapped '%s' to 0x%x", Threads_GetPID(), Path, base);
+	VFS_Close(fd);
 	
 	//LOG("*0x%x = 0x%x\n", binary->Pages[0].Virtual, *(Uint*)binary->Pages[0].Virtual);
 	
@@ -413,7 +414,7 @@ tBinary *Binary_DoLoad(tMount MountID, tInode Inode, const char *Path)
 {
 	tBinary	*pBinary;
 	 int	fp;
-	Uint	ident;
+	Uint32	ident;
 	tBinaryType	*bt = gRegBinTypes;
 	
 	ENTER("iMountID XInode sPath", MountID, Inode, Path);
@@ -425,19 +426,26 @@ tBinary *Binary_DoLoad(tMount MountID, tInode Inode, const char *Path)
 		LEAVE('n');
 		return NULL;
 	}
+
+	LOG("fp = 0x%x", fp);
 	
 	// Read File Type
 	VFS_Read(fp, 4, &ident);
 	VFS_Seek(fp, 0, SEEK_SET);
 
+	LOG("ident = 0x%x", ident);
+
 	// Determine the type	
 	for(; bt; bt = bt->Next)
 	{
-		if( (ident & bt->Mask) != (Uint)bt->Ident )
+		if( (ident & bt->Mask) != (Uint32)bt->Ident )
 			continue;
+		LOG("bt = %p (%s)", bt, bt->Name);
 		pBinary = bt->Load(fp);
 		break;
 	}
+
+	LOG("pBinary = %p", pBinary);
 	
 	// Close File
 	VFS_Close(fp);