Changeset eb522e8 in mainline for uspace/srv/loader/main.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Huuuuuge merge from development - all the work actually

File:

• uspace/srv/loader/main.c (modified) (21 diffs)

uspace/srv/loader/main.c

@@ -50 +50 @@
 #include <fcntl.h>
 #include <sys/types.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/loader.h>
@@ -56 +55 @@
 #include <macros.h>
 #include <loader/pcb.h>
+#include <entry_point.h>
 #include <errno.h>
 #include <async.h>
@@ -63 +63 @@
 #include <elf.h>
 #include <elf_load.h>
+
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#include <rtld/dynamic.h>
+#include <rtld/module.h>
+
+static int ldr_load_dyn_linked(elf_info_t *p_info);
+#endif
 
 #define DPRINTF(...)
@@ -90 +98 @@
 
 static elf_info_t prog_info;
-static elf_info_t interp_info;
-
-static bool is_dyn_linked;
 
 /** Used to limit number of connections to one. */
-static bool connected;
+static bool connected = false;
+
+#ifdef CONFIG_RTLD
+/** State structure of the dynamic linker. */
+runtime_env_t dload_re;
+static module_t prog_mod;
+#endif
 
 static void ldr_get_taskid(ipc_callid_t rid, ipc_call_t *request)
@@ -106 +117 @@
         
         if (!async_data_read_receive(&callid, &len)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -115 +126 @@
         
         async_data_read_finalize(callid, &task_id, len);
-        ipc_answer_0(rid, EOK);
+        async_answer_0(rid, EOK);
 }
 
@@ -135 +146 @@
         }
         
-        ipc_answer_0(rid, rc);
+        async_answer_0(rid, rc);
 }
 
@@ -155 +166 @@
         }
         
-        ipc_answer_0(rid, rc);
+        async_answer_0(rid, rc);
 }
 
@@ -188 +199 @@
                 if (_argv == NULL) {
                         free(buf);
-                        ipc_answer_0(rid, ENOMEM);
+                        async_answer_0(rid, ENOMEM);
                         return;
                 }
@@ -220 +231 @@
         }
         
-        ipc_answer_0(rid, rc);
+        async_answer_0(rid, rc);
 }
 
@@ -244 +255 @@
                 if (_filv == NULL) {
                         free(buf);
-                        ipc_answer_0(rid, ENOMEM);
+                        async_answer_0(rid, ENOMEM);
                         return;
                 }
@@ -271 +282 @@
         }
         
-        ipc_answer_0(rid, EOK);
+        async_answer_0(rid, EOK);
 }
 
@@ -284 +295 @@
         int rc;
         
-        rc = elf_load_file(pathname, 0, &prog_info);
+        rc = elf_load_file(pathname, 0, 0, &prog_info);
         if (rc != EE_OK) {
                 DPRINTF("Failed to load executable '%s'.\n", pathname);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return 1;
         }
@@ -303 +314 @@
         if (prog_info.interp == NULL) {
                 /* Statically linked program */
-                is_dyn_linked = false;
-                ipc_answer_0(rid, EOK);
+                async_answer_0(rid, EOK);
                 return 0;
         }
         
-        rc = elf_load_file(prog_info.interp, 0, &interp_info);
-        if (rc != EE_OK) {
-                DPRINTF("Failed to load interpreter '%s.'\n",
-                    prog_info.interp);
-                ipc_answer_0(rid, EINVAL);
-                return 1;
-        }
-        
-        is_dyn_linked = true;
-        ipc_answer_0(rid, EOK);
-        
+        DPRINTF("Binary is dynamically linked.\n");
+#ifdef CONFIG_RTLD
+        DPRINTF(" - pcb address: %p\n", &pcb);
+        DPRINTF( "- prog dynamic: %p\n", prog_info.dynamic);
+
+        rc = ldr_load_dyn_linked(&prog_info);
+#else
+        rc = ENOTSUP;
+#endif
+        async_answer_0(rid, rc);
         return 0;
 }
 
+#ifdef CONFIG_RTLD
+
+static int ldr_load_dyn_linked(elf_info_t *p_info)
+{
+        runtime_env = &dload_re;
+
+        DPRINTF("Load dynamically linked program.\n");
+
+        /*
+         * First we need to process dynamic sections of the executable
+         * program and insert it into the module graph.
+         */
+
+        DPRINTF("Parse program .dynamic section at %p\n", p_info->dynamic);
+        dynamic_parse(p_info->dynamic, 0, &prog_mod.dyn);
+        prog_mod.bias = 0;
+        prog_mod.dyn.soname = "[program]";
+
+        /* Initialize list of loaded modules */
+        list_initialize(&runtime_env->modules_head);
+        list_append(&prog_mod.modules_link, &runtime_env->modules_head);
+
+        /* Pointer to program module. Used as root of the module graph. */
+        runtime_env->program = &prog_mod;
+
+        /* Work around non-existent memory space allocation. */
+        runtime_env->next_bias = 0x1000000;
+
+        /*
+         * Now we can continue with loading all other modules.
+         */
+
+        DPRINTF("Load all program dependencies\n");
+        module_load_deps(&prog_mod);
+
+        /*
+         * Now relocate/link all modules together.
+         */
+
+        /* Process relocations in all modules */
+        DPRINTF("Relocate all modules\n");
+        modules_process_relocs(&prog_mod);
+
+        /* Pass runtime evironment pointer through PCB. */
+        pcb.rtld_runtime = (void *) runtime_env;
+
+        return 0;
+}
+#endif
 
 /** Run the previously loaded program.
@@ -333 +391 @@
         const char *cp;
         
+        DPRINTF("Set task name\n");
+
         /* Set the task name. */
         cp = str_rchr(pathname, '/');
@@ -338 +398 @@
         task_set_name(cp);
         
-        if (is_dyn_linked == true) {
-                /* Dynamically linked program */
-                DPRINTF("Run ELF interpreter.\n");
-                DPRINTF("Entry point: %p\n", interp_info.entry);
-                
-                ipc_answer_0(rid, EOK);
-                elf_run(&interp_info, &pcb);
-        } else {
-                /* Statically linked program */
-                ipc_answer_0(rid, EOK);
-                elf_run(&prog_info, &pcb);
-        }
+        /* Run program */
+        DPRINTF("Reply OK\n");
+        async_answer_0(rid, EOK);
+        DPRINTF("Jump to entry point at %p\n", pcb.entry);
+        entry_point_jmp(prog_info.entry, &pcb);
         
         /* Not reached */
@@ -367 +420 @@
         /* Already have a connection? */
         if (connected) {
-                ipc_answer_0(iid, ELIMIT);
+                async_answer_0(iid, ELIMIT);
                 return;
         }
@@ -374 +427 @@
         
         /* Accept the connection */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         /* Ignore parameters, the connection is already open */
@@ -383 +436 @@
                 callid = async_get_call(&call);
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         exit(0);
@@ -408 +461 @@
                         /* Not reached */
                 default:
-                        retval = ENOENT;
+                        retval = EINVAL;
                         break;
                 }
-                if ((callid & IPC_CALLID_NOTIFICATION) == 0 &&
-                    IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
-                        DPRINTF("Responding EINVAL to method %d.\n",
-                            IPC_GET_METHOD(call));
-                        ipc_answer_0(callid, EINVAL);
-                }
+                
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
+                        async_answer_0(callid, retval);
         }
 }
@@ -424 +474 @@
 int main(int argc, char *argv[])
 {
-        ipcarg_t phonead;
-        task_id_t id;
-        int rc;
-
-        connected = false;
-
+        /* Set a handler of incomming connections. */
+        async_set_client_connection(ldr_connection);
+        
         /* Introduce this task to the NS (give it our task ID). */
-        id = task_get_id();
-        rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id));
+        task_id_t id = task_get_id();
+        int rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id));
         if (rc != EOK)
                 return -1;
-
-        /* Set a handler of incomming connections. */
-        async_set_client_connection(ldr_connection);
         
         /* Register at naming service. */
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_LOAD, 0, 0, &phonead) != 0) 
+        if (service_register(SERVICE_LOAD) != EOK)
                 return -2;
-
+        
         async_manager();