Changeset 3fb0fec in mainline for uspace/lib/c

Timestamp:

2011-07-26T18:29:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7eb0fed8

Parents:

efcebe1 (diff), aa865ee (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.

Location:

uspace/lib/c

Files:

• Makefile (modified) (3 diffs)
• arch/abs32le/include/elf_linux.h (added)
• arch/amd64/include/elf_linux.h (added)
• arch/arm32/include/elf_linux.h (added)
• arch/ia32/include/elf_linux.h (added)
• arch/ia64/include/elf_linux.h (added)
• arch/mips32/include/elf_linux.h (added)
• arch/mips32eb/include/elf_linux.h (added)
• arch/mips64/include/elf_linux.h (added)
• arch/ppc32/include/elf_linux.h (added)
• arch/sparc64/include/elf_linux.h (added)
• generic/elf/elf_load.c (moved) (moved from uspace/srv/loader/elf_load.c ) (9 diffs)
• generic/io/io.c (modified) (2 diffs)
• generic/rtld/elf_load.c (deleted)
• generic/rtld/module.c (modified) (7 diffs)
• generic/rtld/rtld.c (modified) (1 diff)
• generic/rtld/symbol.c (modified) (6 diffs)
• generic/vfs/vfs.c (modified) (1 diff)
• include/elf/elf.h (added)
• include/elf/elf_linux.h (added)
• include/elf/elf_load.h (moved) (moved from uspace/srv/loader/include/elf_load.h ) (3 diffs)
• include/rtld/elf_dyn.h (modified) (1 diff)
• include/rtld/rtld.h (modified) (1 diff)
• include/rtld/symbol.h (modified) (1 diff)
• include/typedefs.h (added)
• include/unistd.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -59 +59 @@
 -include arch/$(UARCH)/Makefile.inc
 
-EXTRA_CFLAGS += -I../../srv/loader/include
-
 GENERIC_SOURCES = \
         generic/libc.c \
@@ -71 +69 @@
         generic/device/hw_res.c \
         generic/device/char_dev.c \
+        generic/elf/elf_load.c \
         generic/event.c \
         generic/errno.c \
@@ -134 +133 @@
                 generic/dlfcn.c \
                 generic/rtld/rtld.c \
-                generic/rtld/elf_load.c \
                 generic/rtld/dynamic.c \
                 generic/rtld/module.c \

uspace/lib/c/generic/elf/elf_load.c

@@ -29 +29 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -49 +49 @@
 #include <assert.h>
 #include <as.h>
+#include <elf/elf.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -55 +56 @@
 #include <entry_point.h>
 
-#include "elf.h"
-#include "elf_load.h"
+#include <elf/elf_load.h>
 
 #define DPRINTF(...)
@@ -74 +74 @@
 static int load_segment(elf_ld_t *elf, elf_segment_header_t *entry);
 
-/** Read until the buffer is read in its entirety. */
-static int my_read(int fd, void *buf, size_t len)
-{
-        int cnt = 0;
-        do {
-                buf += cnt;
-                len -= cnt;
-                cnt = read(fd, buf, len);
-        } while ((cnt > 0) && ((len - cnt) > 0));
-
-        return cnt;
-}
-
 /** Load ELF binary from a file.
  *
@@ -160 +147 @@
         int i, rc;
 
-        rc = my_read(elf->fd, header, sizeof(elf_header_t));
-        if (rc < 0) {
+        rc = read_all(elf->fd, header, sizeof(elf_header_t));
+        if (rc != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
                 return EE_INVALID;
@@ -222 +209 @@
                         + i * sizeof(elf_segment_header_t), SEEK_SET);
 
-                rc = my_read(elf->fd, &segment_hdr,
+                rc = read_all(elf->fd, &segment_hdr,
                     sizeof(elf_segment_header_t));
-                if (rc < 0) {
+                if (rc != sizeof(elf_segment_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -244 +231 @@
                     + i * sizeof(elf_section_header_t), SEEK_SET);
 
-                rc = my_read(elf->fd, &section_hdr,
+                rc = read_all(elf->fd, &section_hdr,
                     sizeof(elf_section_header_t));
-                if (rc < 0) {
+                if (rc != sizeof(elf_section_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -334 +321 @@
         uintptr_t seg_addr;
         size_t mem_sz;
-        int rc;
+        ssize_t rc;
 
         bias = elf->bias;
@@ -412 +399 @@
                 if (now > left) now = left;
 
-                rc = my_read(elf->fd, dp, now);
-
-                if (rc < 0) { 
+                rc = read_all(elf->fd, dp, now);
+
+                if (rc != (ssize_t) now) { 
                         DPRINTF("Read error.\n");
                         return EE_INVALID;

uspace/lib/c/generic/io/io.c

@@ -594 +594 @@
                 }
                 
-                buf += now;
+                data += now;
                 stream->buf_head += now;
                 buf_free -= now;
                 bytes_left -= now;
                 total_written += now;
+                stream->buf_state = _bs_write;
                 
                 if (buf_free == 0) {
@@ -606 +607 @@
                 }
         }
-        
-        if (total_written > 0)
-                stream->buf_state = _bs_write;
 
         if (need_flush)

uspace/lib/c/generic/rtld/module.c

@@ -35 +35 @@
  */
 
+#include <adt/list.h>
+#include <elf/elf_load.h>
+#include <fcntl.h>
+#include <loader/pcb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <adt/list.h>
-#include <loader/pcb.h>
 
 #include <rtld/rtld.h>
@@ -47 +48 @@
 #include <rtld/rtld_arch.h>
 #include <rtld/module.h>
-#include <elf_load.h>
 
 /** (Eagerly) process all relocation tables in a module.
@@ -93 +93 @@
 module_t *module_find(const char *name)
 {
-        link_t *head = &runtime_env->modules_head;
-
-        link_t *cur;
         module_t *m;
         const char *p, *soname;
@@ -110 +107 @@
 
         /* Traverse list of all modules. Not extremely fast, but simple */
-        DPRINTF("head = %p\n", head);
-        for (cur = head->next; cur != head; cur = cur->next) {
+        list_foreach(runtime_env->modules, cur) {
                 DPRINTF("cur = %p\n", cur);
                 m = list_get_instance(cur, module_t, modules_link);
@@ -177 +173 @@
 
         /* Insert into the list of loaded modules */
-        list_append(&m->modules_link, &runtime_env->modules_head);
+        list_append(&m->modules_link, &runtime_env->modules);
 
         return m;
@@ -249 +245 @@
 void modules_process_relocs(module_t *start)
 {
-        link_t *head = &runtime_env->modules_head;
-
-        link_t *cur;
-        module_t *m;
-
-        for (cur = head->next; cur != head; cur = cur->next) {
+        module_t *m;
+
+        list_foreach(runtime_env->modules, cur) {
                 m = list_get_instance(cur, module_t, modules_link);
 
@@ -268 +261 @@
 void modules_untag(void)
 {
-        link_t *head = &runtime_env->modules_head;
-
-        link_t *cur;
-        module_t *m;
-
-        for (cur = head->next; cur != head; cur = cur->next) {
+        module_t *m;
+
+        list_foreach(runtime_env->modules, cur) {
                 m = list_get_instance(cur, module_t, modules_link);
                 m->bfs_tag = false;

uspace/lib/c/generic/rtld/rtld.c

@@ -44 +44 @@
 {
         runtime_env = &rt_env_static;
-        list_initialize(&runtime_env->modules_head);
+        list_initialize(&runtime_env->modules);
         runtime_env->next_bias = 0x2000000;
         runtime_env->program = NULL;

uspace/lib/c/generic/rtld/symbol.c

@@ -38 +38 @@
 #include <stdlib.h>
 
+#include <elf/elf.h>
 #include <rtld/rtld.h>
 #include <rtld/rtld_debug.h>
 #include <rtld/symbol.h>
-#include <elf.h>
 
 /*
@@ -118 +118 @@
         module_t *m, *dm;
         elf_symbol_t *sym, *s;
-        link_t queue_head;
+        list_t queue;
         size_t i;
 
@@ -132 +132 @@
 
         /* Insert root (the program) into the queue and tag it */
-        list_initialize(&queue_head);
+        list_initialize(&queue);
         start->bfs_tag = true;
-        list_append(&start->queue_link, &queue_head);
+        list_append(&start->queue_link, &queue);
 
         /* If the symbol is found, it will be stored in 'sym' */
@@ -140 +140 @@
 
         /* While queue is not empty */
-        while (!list_empty(&queue_head)) {
+        while (!list_empty(&queue)) {
                 /* Pop first element from the queue */
-                m = list_get_instance(queue_head.next, module_t, queue_link);
+                m = list_get_instance(list_first(&queue), module_t, queue_link);
                 list_remove(&m->queue_link);
 
@@ -162 +162 @@
                         if (dm->bfs_tag == false) {
                                 dm->bfs_tag = true;
-                                list_append(&dm->queue_link, &queue_head);
+                                list_append(&dm->queue_link, &queue);
                         }
                 }
@@ -168 +168 @@
 
         /* Empty the queue so that we leave it in a clean state */
-        while (!list_empty(&queue_head))
-                list_remove(queue_head.next);
+        while (!list_empty(&queue))
+                list_remove(list_first(&queue));
 
         if (!sym) {

uspace/lib/c/generic/vfs/vfs.c

@@ -417 +417 @@
 }
 
+/** Read entire buffer.
+ *
+ * In face of short reads this function continues reading until either
+ * the entire buffer is read or no more data is available (at end of file).
+ *
+ * @param fildes        File descriptor
+ * @param buf           Buffer, @a nbytes bytes long
+ * @param nbytes        Number of bytes to read
+ *
+ * @return              On success, positive number of bytes read.
+ *                      On failure, negative error code from read().
+ */
+ssize_t read_all(int fildes, void *buf, size_t nbyte)
+{
+        ssize_t cnt = 0;
+        size_t nread = 0;
+        uint8_t *bp = (uint8_t *) buf;
+
+        do {
+                bp += cnt;
+                nread += cnt;
+                cnt = read(fildes, bp, nbyte - nread);
+        } while (cnt > 0 && (nbyte - nread - cnt) > 0);
+
+        if (cnt < 0)
+                return cnt;
+
+        return nread + cnt;
+}
+
+/** Write entire buffer.
+ *
+ * This function fails if it cannot write exactly @a len bytes to the file.
+ *
+ * @param fildes        File descriptor
+ * @param buf           Data, @a nbytes bytes long
+ * @param nbytes        Number of bytes to write
+ *
+ * @return              EOK on error, return value from write() if writing
+ *                      failed.
+ */
+ssize_t write_all(int fildes, const void *buf, size_t nbyte)
+{
+        ssize_t cnt = 0;
+        ssize_t nwritten = 0;
+        const uint8_t *bp = (uint8_t *) buf;
+
+        do {
+                bp += cnt;
+                nwritten += cnt;
+                cnt = write(fildes, bp, nbyte - nwritten);
+        } while (cnt > 0 && ((ssize_t )nbyte - nwritten - cnt) > 0);
+
+        if (cnt < 0)
+                return cnt;
+
+        if ((ssize_t)nbyte - nwritten - cnt > 0)
+                return EIO;
+
+        return nbyte;
+}
+
 int fsync(int fildes)
 {

uspace/lib/c/include/elf/elf_load.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2006 Sergey Bondari
  * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
@@ -38 +39 @@
 
 #include <arch/elf.h>
+#include <elf/elf.h>
 #include <sys/types.h>
 #include <loader/pcb.h>
 
-#include "elf.h"
+/**
+ * ELF error return codes
+ */
+#define EE_OK                   0       /* No error */
+#define EE_INVALID              1       /* Invalid ELF image */
+#define EE_MEMORY               2       /* Cannot allocate address space */
+#define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
+#define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */
+#define EE_LOADER               5       /* The image is actually a program loader. */
+#define EE_IRRECOVERABLE        6
 
 typedef enum {
@@ -82 +93 @@
 } elf_ld_t;
 
-int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags,
-    elf_info_t *info);
-void elf_create_pcb(elf_info_t *info, pcb_t *pcb);
+extern const char *elf_error(unsigned int);
+extern int elf_load_file(const char *, size_t, eld_flags_t, elf_info_t *);
+extern void elf_create_pcb(elf_info_t *, pcb_t *);
 
 #endif

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

@@ -39 +39 @@
 #include <sys/types.h>
 
-#include <elf.h>
+#include <elf/elf.h>
 #include <libarch/rtld/elf_dyn.h>
 

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

@@ -49 +49 @@
 
         /** List of all loaded modules including rtld and the program */
-        link_t modules_head;
+        list_t modules;
 
         /** Temporary hack to place each module at different address. */

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

@@ -36 +36 @@
 #define LIBC_RTLD_SYMBOL_H_
 
+#include <elf/elf.h>
 #include <rtld/rtld.h>
-#include <elf.h>
 
 elf_symbol_t *symbol_bfs_find(const char *name, module_t *start, module_t **mod);

uspace/lib/c/include/unistd.h

@@ -63 +63 @@
 extern ssize_t read(int, void *, size_t);
 
+extern ssize_t read_all(int, void *, size_t);
+extern ssize_t write_all(int, const void *, size_t);
+
 extern off64_t lseek(int, off64_t, int);
 extern int ftruncate(int, aoff64_t);