Changeset 1ea99cc in mainline for uspace/srv/loader/main.c

Timestamp:

2009-08-20T20:47:35Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b50b5af2

Parents:

24edc18

Message:

Merge changes from original Subversion dynload branch.

File:

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

uspace/srv/loader/main.c

@@ -66 +66 @@
 #define DPRINTF(...)
 
+void program_run(void *entry, pcb_t *pcb);
+
 /** Pathname of the file that will be loaded */
 static char *pathname = NULL;
@@ -304 +306 @@
         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);
@@ -326 +328 @@
         }
         
-        rc = elf_load_file(prog_info.interp, 0, &interp_info);
+        printf("Load ELF interpreter '%s'\n", prog_info.interp);
+        rc = elf_load_file(prog_info.interp, 0, 0, &interp_info);
         if (rc != EE_OK) {
                 DPRINTF("Failed to load interpreter '%s.'\n",
@@ -334 +337 @@
         }
         
+        printf("Run interpreter.\n");
+        printf("entry point: 0x%lx\n", interp_info.entry);
+        printf("pcb address: 0x%lx\n", &pcb);
+        printf("prog dynamic: 0x%lx\n", prog_info.dynamic);
+
         is_dyn_linked = true;
         ipc_answer_0(rid, EOK);
@@ -362 +370 @@
                 
                 ipc_answer_0(rid, EOK);
-                elf_run(&interp_info, &pcb);
+                program_run(interp_info.entry, &pcb);
         } else {
                 /* Statically linked program */
                 ipc_answer_0(rid, EOK);
-                elf_run(&prog_info, &pcb);
+                program_run(prog_info.entry, &pcb);
         }