Index: defaults/amd64/Makefile.config =================================================================== --- defaults/amd64/Makefile.config (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ defaults/amd64/Makefile.config (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -3,5 +3,5 @@ # Ramdisk format -RDFMT = tmpfs +RDFMT = fat # Compiler @@ -59,7 +59,4 @@ CONFIG_VESA_BPP = 16 -# Build shared libraries -CONFIG_BUILD_SHARED_LIBS = n - # Load disk drivers on startup CONFIG_START_BD = n Index: defaults/arm32/Makefile.config =================================================================== --- defaults/arm32/Makefile.config (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ defaults/arm32/Makefile.config (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -3,5 +3,5 @@ # Ramdisk format -RDFMT = tmpfs +RDFMT = fat # Compiler @@ -35,7 +35,4 @@ CONFIG_HID_OUT = generic -# Build shared libraries -CONFIG_BUILD_SHARED_LIBS = n - # Load disk drivers on startup CONFIG_START_BD = n Index: defaults/ia32/Makefile.config =================================================================== --- defaults/ia32/Makefile.config (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ defaults/ia32/Makefile.config (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -6,5 +6,5 @@ # Ramdisk format -RDFMT = tmpfs +RDFMT = fat # Compiler Index: defaults/ia64/Makefile.config =================================================================== --- defaults/ia64/Makefile.config (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ defaults/ia64/Makefile.config (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -3,5 +3,5 @@ # Ramdisk format -RDFMT = tmpfs +RDFMT = fat # Compiler @@ -47,7 +47,4 @@ CONFIG_HID_OUT = generic -# Build shared libraries -CONFIG_BUILD_SHARED_LIBS = n - # Load disk drivers on startup CONFIG_START_BD = n Index: defaults/mips32/Makefile.config =================================================================== --- defaults/mips32/Makefile.config (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ defaults/mips32/Makefile.config (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -3,5 +3,5 @@ # Ramdisk format -RDFMT = tmpfs +RDFMT = fat # Compiler Index: defaults/ppc32/Makefile.config =================================================================== --- defaults/ppc32/Makefile.config (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ defaults/ppc32/Makefile.config (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -3,5 +3,5 @@ # Ramdisk format -RDFMT = tmpfs +RDFMT = fat # Compiler Index: defaults/sparc64/Makefile.config =================================================================== --- defaults/sparc64/Makefile.config (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ defaults/sparc64/Makefile.config (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -56,7 +56,4 @@ CONFIG_AOUT_ISOFS_B = y -# Build shared libraries -CONFIG_BUILD_SHARED_LIBS = n - # Load disk drivers on startup CONFIG_START_BD = n Index: defaults/special/Makefile.config =================================================================== --- defaults/special/Makefile.config (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ defaults/special/Makefile.config (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -29,7 +29,4 @@ CONFIG_TEST = y -# Build shared libraries -CONFIG_BUILD_SHARED_LIBS = n - # Load disk drivers on startup CONFIG_START_BD = n Index: kernel/generic/include/syscall/syscall.h =================================================================== --- kernel/generic/include/syscall/syscall.h (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ kernel/generic/include/syscall/syscall.h (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -90,5 +90,4 @@ SYS_SYSINFO_GET_DATA, - SYS_DEBUG_PUTINT, SYS_DEBUG_ENABLE_CONSOLE, SYS_DEBUG_DISABLE_CONSOLE, Index: kernel/generic/src/syscall/syscall.c =================================================================== --- kernel/generic/src/syscall/syscall.c (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ kernel/generic/src/syscall/syscall.c (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -55,11 +55,4 @@ #include #include - -/** Print a hex integer into klog */ -static sysarg_t sys_debug_putint(sysarg_t i) -{ - printf("[task:0x%x]", (unsigned) i); - return 0; -} /** Dispatch system call */ @@ -187,5 +180,4 @@ /* Debug calls */ - (syshandler_t) sys_debug_putint, (syshandler_t) sys_debug_enable_console, (syshandler_t) sys_debug_disable_console Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ uspace/Makefile (revision 3f10d92504416018dd0bd013a958a450fb9e490c) @@ -92,11 +92,4 @@ drv/test2 -## Shared libraries -ifeq ($(CONFIG_BUILD_SHARED_LIBS), y) - DIRS += \ - app/dltest \ - app/dltest2 -endif - ## Networking # @@ -153,5 +146,4 @@ lib/softint \ lib/softfloat \ - lib/test \ lib/drv \ lib/packet \ Index: pace/app/dltest/Makefile =================================================================== --- uspace/app/dltest/Makefile (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,35 +1,0 @@ -# -# Copyright (c) 2011 Jiri Svoboda -# All rights reserved. -# -# 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 and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -# - -USPACE_PREFIX = ../.. -BINARY = dltest - -SOURCES = \ - dltest.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/app/dltest/dltest.c =================================================================== --- uspace/app/dltest/dltest.c (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,100 +1,0 @@ -/* - * Copyright (c) 2008 Jiri Svoboda - * All rights reserved. - * - * 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 and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup rtld - * @brief Test dynamic linking capabilities. - * @{ - */ -/** - * @file - */ - -#include -#include -#include - -static void kputint(unsigned i) -{ -// unsigned dummy; -// asm volatile ( -// "movl $30, %%eax;" -// "int $0x30" -// : "=d" (dummy) /* output - %edx clobbered */ -// : "d" (i) /* input */ -// : "%eax","%ecx" /* all scratch registers clobbered */ -// ); -/* - asm volatile ( - "mr %%r3, %0\n" - "li %%r9, 32\n" - "sc\n" - : - : "r" (i) - : "%r3","%r9" - ); -*/ -} - -typedef int (*fptr_t)(void); - -int main(int argc, char *argv[]) -{ - void *a; - void *s; - fptr_t fun; - int i; - - const char *lib_name; - const char *sym_name; - - if (0) kputint(-1); - printf("Hello from dltest!\n"); - - lib_name = "libtest.so.0"; - sym_name = "test_func"; - - a = dlopen(lib_name, 0); - if (a != NULL) { - s = dlsym(a, sym_name); - printf("symbol '%s' = 0x%lx\n", sym_name, (long) s); - } else { - printf("failed to dlopen() library '%s'\n", lib_name); - return -1; - } - - printf("Run dynamically-resolved function '%s'...\n", sym_name); - fun = (fptr_t) s; - i = (*fun)(); - printf("Done. (returned 0x%x)\n", i); - - return 0; -} - -/** @} - */ - Index: pace/app/dltest2/Makefile =================================================================== --- uspace/app/dltest2/Makefile (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,35 +1,0 @@ -# -# Copyright (c) 2011 Jiri Svoboda -# All rights reserved. -# -# 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 and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -# - -USPACE_PREFIX = ../.. -BINARY = dltest2 - -SOURCES = \ - dltest2.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/app/dltest2/dltest2.c =================================================================== --- uspace/app/dltest2/dltest2.c (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,100 +1,0 @@ -/* - * Copyright (c) 2008 Jiri Svoboda - * All rights reserved. - * - * 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 and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup rtld - * @brief Test dynamic linking capabilities. - * @{ - */ -/** - * @file - */ - -#include -#include -#include - -static void kputint(unsigned i) -{ -// unsigned dummy; -// asm volatile ( -// "movl $30, %%eax;" -// "int $0x30" -// : "=d" (dummy) /* output - %edx clobbered */ -// : "d" (i) /* input */ -// : "%eax","%ecx" /* all scratch registers clobbered */ -// ); -/* - asm volatile ( - "mr %%r3, %0\n" - "li %%r9, 32\n" - "sc\n" - : - : "r" (i) - : "%r3","%r9" - ); -*/ -} - -typedef int (*fptr_t)(void); - -int main(int argc, char *argv[]) -{ - void *a; - void *s; - fptr_t fun; - int i; - - const char *lib_name; - const char *sym_name; - - if (0) kputint(-1); - printf("Hello from dltest!\n"); - - lib_name = "libtest.so.0"; - sym_name = "test_func"; - - a = dlopen(lib_name, 0); - if (a != NULL) { - s = dlsym(a, sym_name); - printf("symbol '%s' = 0x%lx\n", sym_name, (long) s); - } else { - printf("failed to dlopen() library '%s'\n", lib_name); - return -1; - } - - printf("Run dynamically-resolved function '%s'...\n", sym_name); - fun = (fptr_t) s; - i = (*fun)(); - printf("Done. (returned 0x%x)\n", i); - - return 0; -} - -/** @} - */ - Index: pace/lib/test/Makefile =================================================================== --- uspace/lib/test/Makefile (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2011 Jiri Svoboda -# All rights reserved. -# -# 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 and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -# - -USPACE_PREFIX = ../.. -LIBRARY = libtest -SLIBRARY = libtest.so.0.0 -LSONAME = libtest.so.0 - -SOURCES = \ - libtest.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/lib/test/arch/ia32/_link.ld.in =================================================================== --- uspace/lib/test/arch/ia32/_link.ld.in (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,85 +1,0 @@ -ENTRY(__entry) - -PHDRS { - text PT_LOAD FLAGS(5); - interp PT_INTERP; - data PT_LOAD FLAGS(6); - dynamic PT_DYNAMIC; -} - -SECTIONS { - . = 0x1000 + SIZEOF_HEADERS; - - .init : { - *(.init); - } :text - .text : { - *(.text); - *(.text.*); - *(.rodata*); - } :text - - .rel.plt : { - *(.rel.plt); - } - /* - *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt - * without alignment gap or DT_REL will be broken - */ - .rel.dyn : { - *(.rel.*); - } :text - - .plt : { - *(.plt); - } :text - - .dynamic : { - *(.dynamic); - } :text :dynamic - - .dynsym : { - *(.dynsym); - } :text - - .dynstr : { - *(.dynstr); - } :text - - . = . + 0x1000; - - .data : { - *(.data); - } :data - - .data.rel : { - *(.data.rel); - } :data - - .got : { - *(.got); - } :data - .got.plt : { - *(.got.plt); - } :data - - .bss : { - *(COMMON); - *(.bss); - } :data -/* - .tdata : { - _tdata_start = .; - *(.tdata); - _tdata_end = .; - } :data - .tbss : { - _tbss_start = .; - *(.tbss); - _tbss_end = .; - } :data - _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)); -*/ - . = ALIGN(0x1000); - _heap = .; -} Index: pace/lib/test/arch/mips32/_link.ld.in =================================================================== --- uspace/lib/test/arch/mips32/_link.ld.in (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,91 +1,0 @@ -ENTRY(__entry) - -PHDRS { - text PT_LOAD FLAGS(5); - data PT_LOAD FLAGS(6); - dynamic PT_DYNAMIC; -} - -SECTIONS { - . = 0x4000 + SIZEOF_HEADERS; - - .init : { - *(.init); - } :text - .text : { - *(.text); - *(.rodata*); - *(.MIPS.stubs); - } :text - - .rel.plt : { - *(.rel.plt); - } - /* - *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt - * without alignment gap or DT_REL will be broken - */ - .rel.dyn : { - *(.rel.*); - } :text - - .plt : { - *(.plt); - } :text - - .hash : { - *(.hash); - } :text - - .dynsym : { - *(.dynsym); - } :text - - .dynstr : { - *(.dynstr); - } :text - - .dynamic : { - *(.dynamic); - } :text :dynamic - - . = . + 0x4000; - - .data : { - *(.data); - *(.data.rel*); - } :data - - .got : { - _gp = .; - *(.got); - } :data -/* - .tdata : { - _tdata_start = .; - *(.tdata); - _tdata_end = .; - } :data - .tbss : { - _tbss_start = .; - *(.tbss); - _tbss_end = .; - } :data - _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)); -*/ - .sbss : { - *(.scommon); - *(.sbss); - } - .bss : { - *(.bss); - *(COMMON); - } :data - - . = ALIGN(0x4000); - _heap = .; - - /DISCARD/ : { - *(*); - } -} Index: pace/lib/test/arch/ppc32/_link.ld.in =================================================================== --- uspace/lib/test/arch/ppc32/_link.ld.in (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,85 +1,0 @@ -ENTRY(__entry) - -PHDRS { - text PT_LOAD FLAGS(5); - data PT_LOAD FLAGS(6); - dynamic PT_DYNAMIC; -} - -SECTIONS { - . = 0x1000 + SIZEOF_HEADERS; - - .init : { - *(.init); - } :text - .text : { - *(.text); - *(.text.*); - *(.rodata*); - } :text - - .rel.plt : { - *(.rel.plt); - } - /* - *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt - * without alignment gap or DT_REL will be broken - */ - .rel.dyn : { - *(.rel.*); - } :text - - .dynsym : { - *(.dynsym); - } :text - - .dynstr : { - *(.dynstr); - } :text - - . = . + 0x1000; - - .dynamic : { - *(.dynamic); - } :data :dynamic - - .data : { - *(.data); - *(.sdata); - } :data - - .data.rel : { - *(.data.rel); - } :data - - .got : { - *(.got); - } :data - .got.plt : { - *(.got.plt); - } :data -/* - .tdata : { - _tdata_start = .; - *(.tdata); - _tdata_end = .; - } :data - .tbss : { - _tbss_start = .; - *(.tbss); - _tbss_end = .; - } :data - _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)); - .bss : { - *(.sbss); - *(COMMON); - *(.bss); - } :data -*/ - .plt : { - *(.plt); - } :data - - . = ALIGN(0x1000); - _heap = .; -} Index: pace/lib/test/libtest.c =================================================================== --- uspace/lib/test/libtest.c (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,74 +1,0 @@ -/* - * Copyright (c) 2008 Jiri Svoboda - * All rights reserved. - * - * 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 and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup rtld - * @brief - * @{ - */ -/** - * @file - */ - -#include -#include "libtest.h" - -//static void kputint(unsigned i) -//{ -// unsigned dummy; -// asm volatile ( -// "movl $30, %%eax;" -// "int $0x30" -// : "=d" (dummy) /* output - %edx clobbered */ -// : "d" (i) /* input */ -// : "%eax","%ecx" /* all scratch registers clobbered */ -// ); -//} - -int number = 137; - -int test_fun2(void); - -int test_fun2(void) -{ - return 42; -// return number; -} - -int test_func(void) -{ -// printf("Hello, this is 'test_func()' in libtest.so!\n"); -// kputint(42); -// return 42; -// while(1); -// return test_fun2(); - printf("Hello from libtest/test_func()!\n"); - return 42; -} - -/** @} - */ Index: pace/lib/test/libtest.h =================================================================== --- uspace/lib/test/libtest.h (revision 326d86e6124919cb09a44a3d7180e2a5b919a32d) +++ (revision ) @@ -1,43 +1,0 @@ -/* - * Copyright (c) 2008 Jiri Svoboda - * All rights reserved. - * - * 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 and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup generic - * @{ - */ -/** @file - */ - -#ifndef LIBTEST_H_ -#define LIBTEST_H_ - -int test_func(void); - -#endif - -/** @} - */