diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 110048b..430cce6 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -428,9 +428,8 @@ for (i=0;i<12;i++) { if (elfDynamicS[i].dynVal == 0x3) { tmp = (uInt32 *)elfDynamicS[i].dynPtr; - tmp[2] = ldAddr; - tmp[1] = (uInt32)tmpFd;//0xDEADBEEF;//elfDynamicS[i].dynPtr; - // kprintf("[0x%X][0x%X]\n",argv,argc); + tmp[2] = (uInt32)ldAddr; + tmp[1] = (uInt32)tmpFd; } } @@ -457,6 +456,9 @@ /*** $Log$ + Revision 1.28 2004/06/16 17:04:13 reddawg + ld.so: rest of the commit + Revision 1.25 2004/06/15 23:46:05 reddawg Nig Nog diff --git a/src/sys/kernel/ld.c b/src/sys/kernel/ld.c index 9e607ad..683c60a 100644 --- a/src/sys/kernel/ld.c +++ b/src/sys/kernel/ld.c @@ -55,6 +55,10 @@ ldFd = fopen("ld.so","rb"); + if (ldFd == 0x0) { + printf("Can not open ld.so\n"); + } + fseek(ldFd,0x0,0x0); binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader)); fread(binaryHeader,sizeof(elfHeader),1,ldFd); @@ -107,7 +111,6 @@ rel = i; break; case 11: - //kprintf("Dynamic Sym\n"); relSymTab = (elfDynSym *)kmalloc(sectionHeader[i].shSize); fseek(ldFd,sectionHeader[i].shOffset,0x0); fread(relSymTab,sectionHeader[i].shSize,1,ldFd); @@ -142,7 +145,6 @@ i = binaryHeader->eEntry + LD_START; - //kprintf("ld: [0x%X]\n",i); fclose(ldFd); kfree(dynStr); @@ -157,6 +159,9 @@ /*** $Log$ + Revision 1.10 2004/06/16 17:32:14 reddawg + Removed Dead LD Code now part of ld.so + Revision 1.9 2004/06/16 17:04:13 reddawg ld.so: rest of the commit