diff --git a/src/bin/ld/addlibrary.c b/src/bin/ld/addlibrary.c index b41efa3..698fd55 100644 --- a/src/bin/ld/addlibrary.c +++ b/src/bin/ld/addlibrary.c @@ -2,7 +2,7 @@ #include #include "ld.h" -ldLibrary *ldAddLibrary(char *lib) { +ldLibrary *ldAddLibrary(const char *lib) { int i = 0x0; int x = 0x0; int rel = 0x0; diff --git a/src/bin/ld/findfunc.c b/src/bin/ld/findfunc.c index b17803e..13f8eda 100644 --- a/src/bin/ld/findfunc.c +++ b/src/bin/ld/findfunc.c @@ -2,9 +2,9 @@ #include #include "ld.h" -uInt32 ldFindFunc(char *func,char *lib) { - int i = 0x0; - uInt32 *funcPtr = 0x0; +uInt32 ldFindFunc(const char *func,const char *lib) { + int i = 0x0; + uInt32 *funcPtr = 0x0; ldLibrary *libPtr = 0x0; libPtr = ldFindLibrary(lib); diff --git a/src/bin/ld/findlibrary.c b/src/bin/ld/findlibrary.c index f81c8d0..79c832a 100644 --- a/src/bin/ld/findlibrary.c +++ b/src/bin/ld/findlibrary.c @@ -1,10 +1,10 @@ #include #include "ld.h" -ldLibrary *ldFindLibrary(char *lib) { +ldLibrary *ldFindLibrary(const char *lib) { ldLibrary *tmpLibs = 0x0; - for (tmpLibs = libs;tmpLibs;tmpLibs = tmpLibs->next) { + for (tmpLibs = libs;tmpLibs != 0x0;tmpLibs = tmpLibs->next) { if (!strcmp(tmpLibs->name,lib)) { return(tmpLibs); } diff --git a/src/bin/ld/ld.h b/src/bin/ld/ld.h index cce5126..aa6e698 100644 --- a/src/bin/ld/ld.h +++ b/src/bin/ld/ld.h @@ -19,12 +19,15 @@ extern ldLibrary *libs; -uInt32 ldFindFunc(char *,char *); -ldLibrary *ldFindLibrary(char *); -ldLibrary *ldAddLibrary(char *); +uInt32 ldFindFunc(const char *,const char *); +ldLibrary *ldFindLibrary(const char *); +ldLibrary *ldAddLibrary(const char *); /*** $Log$ + Revision 1.3 2004/06/17 02:58:49 reddawg + Cleaned Out Dead Code + Revision 1.2 2004/06/17 01:52:54 reddawg Maybe? diff --git a/src/bin/ld/main.c b/src/bin/ld/main.c index 8f889ba..bb62c74 100644 --- a/src/bin/ld/main.c +++ b/src/bin/ld/main.c @@ -34,12 +34,12 @@ ldLibrary *libs = 0x0; -elfHeader *binaryHeader = 0x0; -elfSectionHeader *binarySectionHeader = 0x0; -char *binaryShStr = 0x0; -char *binaryDynStr = 0x0; -elfDynSym *binaryRelSymTab = 0x0; -elfPltInfo *binaryElfRel = 0x0; +static elfHeader *binaryHeader = 0x0; +static elfSectionHeader *binarySectionHeader = 0x0; +static char *binaryShStr = 0x0; +static char *binaryDynStr = 0x0; +static elfDynSym *binaryRelSymTab = 0x0; +static elfPltInfo *binaryElfRel = 0x0; uInt32 ld(uInt32 got2,uInt32 entry) { int i = 0x0; @@ -113,6 +113,9 @@ /*** $Log$ + Revision 1.11 2004/06/17 13:05:14 reddawg + dynamic linking: fixed int6 issue problem was multiple rel's + Revision 1.10 2004/06/17 12:32:11 reddawg the machine should just hlt diff --git a/src/lib/libc_old/stdlib/malloc.c b/src/lib/libc_old/stdlib/malloc.c index 8f79edc..0e384a7 100644 --- a/src/lib/libc_old/stdlib/malloc.c +++ b/src/lib/libc_old/stdlib/malloc.c @@ -1,48 +1,27 @@ /***************************************************************************************** - Copyright (c) 2002 The UbixOS Project + Copyright (c) 2002-2004 The UbixOS Project All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are -permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this list of -conditions, the following disclaimer and the list of authors. Redistributions in binary -form must reproduce the above copyright notice, this list of conditions, the following -disclaimer and the list of authors in the documentation and/or other materials provided -with the distribution. Neither the name of the UbixOS Project nor the names of its -contributors may be used to endorse or promote products derived from this software -without specific prior written permission. + Redistributions of source code must retain the above copyright notice, this list of + conditions, the following disclaimer and the list of authors. Redistributions in binary + form must reproduce the above copyright notice, this list of conditions, the following + disclaimer and the list of authors in the documentation and/or other materials provided + with the distribution. Neither the name of the UbixOS Project nor the names of its + contributors may be used to endorse or promote products derived from this software + without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - $Log$ - Revision 1.2 2004/05/20 23:10:46 reddawg - New Userland Malloc - - Revision 1.4 2004/05/20 22:54:02 reddawg - Cleaned Up Warrnings - - Revision 1.3 2004/05/19 04:07:43 reddawg - kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been - - Revision 1.2 2004/04/20 00:53:16 reddawg - Works - - Revision 1.1.1.1 2004/04/15 12:07:10 reddawg - UbixOS v1.0 - - Revision 1.21 2004/04/13 16:36:33 reddawg - Changed our copyright, it is all now under a BSD-Style license - - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Id$ @@ -63,11 +42,11 @@ static void insertFreeDesc(struct memDescriptor *freeDesc); -struct memDescriptor *kernDesc = 0x0; -struct memDescriptor *freeKernDesc = 0x0; -struct memDescriptor *emptyKernDesc = 0x0; +static struct memDescriptor *kernDesc = 0x0; +static struct memDescriptor *freeKernDesc = 0x0; +static struct memDescriptor *emptyKernDesc = 0x0; -int mallocLock = 0x0; +static int mallocLock = 0x0; void initMalloc() { int i=0; @@ -355,6 +334,27 @@ } /*** + $Log$ + Revision 1.3 2004/05/22 02:32:41 reddawg + Fixed a typo + + Revision 1.2 2004/05/20 23:10:46 reddawg + New Userland Malloc + + Revision 1.4 2004/05/20 22:54:02 reddawg + Cleaned Up Warrnings + + Revision 1.3 2004/05/19 04:07:43 reddawg + kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been + + Revision 1.2 2004/04/20 00:53:16 reddawg + Works + + Revision 1.1.1.1 2004/04/15 12:07:10 reddawg + UbixOS v1.0 + + Revision 1.21 2004/04/13 16:36:33 reddawg + Changed our copyright, it is all now under a BSD-Style license + END ***/ -