Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3868 → Rev 3869

/branches/dynload/uspace/app/dltest/dltest.c
60,7 → 60,7
*/
}
 
typedef void (*fptr_t)(void);
typedef int (*fptr_t)(void);
 
int main(int argc, char *argv[])
{
67,6 → 67,7
void *a;
void *s;
fptr_t fun;
int i;
 
char *lib_name;
char *sym_name;
87,8 → 88,8
 
printf("Run dynamically-resolved function '%s'...\n", sym_name);
fun = (fptr_t) s;
(*fun)();
printf("OK\n");
i = (*fun)();
printf("Done. (returned 0x%x)\n", i);
return 0;
}
/branches/dynload/uspace/app/dltest2/dltest2.c
0,0 → 1,99
/*
* 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 <stdio.h>
#include <stdlib.h>
#include <dlfcn.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 */
// );
/*
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;
 
char *lib_name;
char *sym_name;
 
// 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);
}
 
printf("Run dynamically-resolved function '%s'...\n", sym_name);
fun = (fptr_t) s;
i = (*fun)();
printf("Done. (returned 0x%x)\n", i);
return 0;
}
 
/** @}
*/
 
/branches/dynload/uspace/app/dltest2/Makefile
0,0 → 1,84
#
# Copyright (c) 2005 Martin Decky
# 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.
#
 
include ../../../version
include ../../Makefile.config
 
## Setup toolchain
#
 
LIBC_PREFIX = ../../lib/libc
SOFTINT_PREFIX = ../../lib/softint
RTLD_PREFIX = ../../lib/rtld
include $(LIBC_PREFIX)/Makefile.toolchain
 
CFLAGS += -D__32_BITS__ -I../../srv/loader/include -I../../lib/rtld/include -I../../lib/libc -O0
#LFLAGS := -Bdynamic -I/lib/rtld -rpath-link $(RTLD_PREFIX)
LFLAGS := --whole-archive $(RTLD_PREFIX)/librtld.a --no-whole-archive
 
#LIBS = $(LIBC_PREFIX)/shared/libc.so.0
#LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a ../../lib/libtest/libtest.so.0
LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
#
 
## Sources
#
 
OUTPUT = dltest2
SOURCES = \
dltest2.c
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
.PHONY: all clean depend disasm
 
all: $(OUTPUT) disasm
 
-include Makefile.depend
 
clean:
-rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(ARCH)/_link.ld
 
depend:
$(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 
$(OUTPUT): $(OBJECTS) $(LIBS)
$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
# $(LD) -T $(LIBC_PREFIX)/shared/arch/$(ARCH)/_link2.ld $(OBJECTS) $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
 
disasm:
$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
 
%.o: %.S
$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
 
%.o: %.s
$(AS) $(AFLAGS) $< -o $@
 
%.o: %.c
$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
/branches/dynload/uspace/lib/rtld/include/rtld.h
66,6 → 66,8
 
extern runtime_env_t *runtime_env;
 
extern void rtld_init_static(void);
 
#endif
 
/** @}
/branches/dynload/uspace/lib/rtld/module.c
58,12 → 58,20
/* Do not relocate twice. */
if (m->relocated) return;
 
module_process_pre_arch(m);
 
if (m->dyn.plt_rel == DT_REL) {
if (m->dyn.rel != NULL)
DPRINTF("table type DT_REL\n");
if (m->dyn.rel != NULL) {
DPRINTF("non-empty\n");
rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
}
/* FIXME: this seems wrong */
if (m->dyn.jmp_rel != NULL)
if (m->dyn.jmp_rel != NULL) {
DPRINTF("table type jmp-rel\n");
DPRINTF("non-empty\n");
rel_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
}
} else { /* (m->dyn.plt_rel == DT_RELA) */
DPRINTF("table type DT_RELA\n");
if (m->dyn.rela != NULL) {
142,6 → 150,7
runtime_env->next_bias += 0x100000;
 
DPRINTF("filename:'%s'\n", name_buf);
printf("load '%s' at 0x%x\n", name_buf, m->bias);
 
rc = elf_load_file(name_buf, m->bias, ELDF_RW, &info);
if (rc != EE_OK) {
/branches/dynload/uspace/lib/rtld/rtld.c
37,6 → 37,16
#include <rtld.h>
 
runtime_env_t *runtime_env;
static runtime_env_t rt_env_static;
 
/** Initialize the loder for use in a statically-linked binary. */
void rtld_init_static(void)
{
runtime_env = &rt_env_static;
list_initialize(&runtime_env->modules_head);
runtime_env->next_bias = 0x2000000;
runtime_env->program = NULL;
}
 
/** @}
*/
/branches/dynload/uspace/lib/libtest/libtest.c
34,7 → 34,7
* @file
*/
 
#include <stdio.h>
//#include <stdio.h>
#include "libtest.h"
 
static void kputint(unsigned i)
49,11 → 49,22
// );
}
 
void test_func(void)
int number = 137;
 
int test_fun2(void);
 
int test_fun2(void)
{
printf("Hello, this is 'test_func()' in libtest.so!\n");
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();
}
 
/** @}
/branches/dynload/uspace/lib/libtest/libtest.h
35,7 → 35,7
#ifndef LIBTEST_H_
#define LIBTEST_H_
 
void test_func(void);
int test_func(void);
 
#endif
 
/branches/dynload/uspace/lib/libtest/Makefile
43,7 → 43,8
-shared --no-undefined -soname libtest.so.0 \
-Bdynamic -I/app/dload
 
LIBS = $(LIBC_PREFIX)/shared/libc.so.0
#LIBS = $(LIBC_PREFIX)/shared/libc.so.0
LIBS =
 
DEFS += -DRELEASE=\"$(RELEASE)\"
 
/branches/dynload/uspace/lib/libc/generic/dlfcn.c
46,6 → 46,11
{
module_t *m;
 
if (runtime_env == NULL) {
printf("Dynamic linker not set up -- initializing.\n");
rtld_init_static();
}
 
printf("dlopen(\"%s\", %d)\n", path, flag);
 
printf("module_find('%s')\n", path);
/branches/dynload/uspace/Makefile
53,6 → 53,7
app/tetris \
app/tester \
app/dltest \
app/dltest2 \
app/dload \
app/trace \
app/klog \
/branches/dynload/boot/arch/mips32/loader/Makefile
108,6 → 108,7
$(USPACEDIR)/app/tester/tester \
$(USPACEDIR)/app/dload/dload \
$(USPACEDIR)/app/dltest/dltest \
$(USPACEDIR)/app/dltest2/dltest2 \
$(USPACEDIR)/app/trace/trace \
$(USPACEDIR)/app/bdsh/bdsh \
$(USPACEDIR)/app/klog/klog