Changeset 1affcdf3 in mainline for uspace/lib/c/include/rtld/rtld.h

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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:

Merge mainline changes

File:

• uspace/lib/c/include/rtld/rtld.h (moved) (moved from uspace/lib/c/include/async_sess.h ) (2 diffs)

uspace/lib/c/include/rtld/rtld.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jakub Jermar
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#ifndef LIBC_ASYNC_SESS_H_
-#define LIBC_ASYNC_SESS_H_
+#ifndef LIBC_RTLD_H_
+#define LIBC_RTLD_H_
 
+#include <sys/types.h>
 #include <adt/list.h>
 
+#include <rtld/dynamic.h>
+#include <rtld/module.h>
+
 typedef struct {
-        int sess_phone;         /**< Phone for cloning off the connections. */
-        sysarg_t connect_arg1;  /**< Argument for CONNECT_ME_TO. */
-        link_t conn_head;       /**< List of open data connections. */
-        link_t sess_link;       /**< Link in global list of open sessions. */
-} async_sess_t;
+        elf_dyn_t *rtld_dynamic;
+        module_t rtld;
 
-extern void async_session_create(async_sess_t *, int, sysarg_t);
-extern void async_session_destroy(async_sess_t *);
-extern int async_exchange_begin(async_sess_t *);
-extern void async_exchange_end(async_sess_t *, int);
+        module_t *program;
+
+        /** List of all loaded modules including rtld and the program */
+        link_t modules_head;
+
+        /** Temporary hack to place each module at different address. */
+        uintptr_t next_bias;
+} runtime_env_t;
+
+extern runtime_env_t *runtime_env;
+
+extern void rtld_init_static(void);
 
 #endif