Changeset 08c9f7d in mainline

Timestamp:

2009-06-16T20:09:52Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

0471786

Parents:

a624cbfd

Message:

Suppress warnings in loader.

Location:

uspace/srv/loader

Files:

• arch/ia32/ia32.s (modified) (1 diff)
• elf_load.c (modified) (7 diffs)
• main.c (modified) (1 diff)

uspace/srv/loader/arch/ia32/ia32.s

@@ -47 +47 @@
         pop %ebp
 
-        jmp %eax
+        jmp *%eax

uspace/srv/loader/elf_load.c

@@ -75 +75 @@
 
 /** Read until the buffer is read in its entirety. */
-static int my_read(int fd, char *buf, size_t len)
+static int my_read(int fd, void *buf, size_t len)
 {
         int cnt = 0;
@@ -332 +332 @@
         uintptr_t bias;
         uintptr_t base;
+        void *seg_ptr;
+        uintptr_t seg_addr;
         size_t mem_sz;
         int rc;
 
-        DPRINTF("Load segment at addr 0x%x, size 0x%x\n", entry->p_vaddr,
-                entry->p_memsz);
-        
         bias = elf->bias;
+
+        seg_addr = entry->p_vaddr + bias;
+        seg_ptr = (void *) seg_addr;
+
+        DPRINTF("Load segment at addr 0x%x, size 0x%x\n", seg_addr,
+                entry->p_memsz);        
 
         if (entry->p_align > 1) {
                 if ((entry->p_offset % entry->p_align) !=
-                    (entry->p_vaddr % entry->p_align)) {
+                    (seg_addr % entry->p_align)) {
                         DPRINTF("Align check 1 failed offset%%align=%d, "
                             "vaddr%%align=%d\n",
                             entry->p_offset % entry->p_align,
-                            entry->p_vaddr % entry->p_align
+                            seg_addr % entry->p_align
                         );
                         return EE_INVALID;
@@ -365 +370 @@
         mem_sz = entry->p_memsz + (entry->p_vaddr - base);
 
-        DPRINTF("Map to p_vaddr=0x%x-0x%x.\n", entry->p_vaddr + bias,
+        DPRINTF("Map to seg_addr=0x%x-0x%x.\n", seg_addr,
         entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE));
 
@@ -380 +385 @@
 
         DPRINTF("as_area_create(0x%lx, 0x%x, %d) -> 0x%lx\n",
-                entry->p_vaddr+bias, entry->p_memsz, flags, (uintptr_t)a);
+                base + bias, mem_sz, flags, (uintptr_t)a);
 
         /*
@@ -400 +405 @@
 
         left = entry->p_filesz;
-        dp = (uint8_t *)(entry->p_vaddr + bias);
+        dp = seg_ptr;
 
         while (left > 0) {
@@ -417 +422 @@
         }
 
-        rc = as_area_change_flags((uint8_t *)entry->p_vaddr + bias, flags);
+        rc = as_area_change_flags(seg_ptr, flags);
         if (rc != 0) {
                 DPRINTF("Failed to set memory area flags.\n");
@@ -425 +430 @@
         if (flags & AS_AREA_EXEC) {
                 /* Enforce SMC coherence for the segment */
-                if (smc_coherence(entry->p_vaddr + bias, entry->p_filesz))
+                if (smc_coherence(seg_ptr, entry->p_filesz))
                         return EE_MEMORY;
         }

uspace/srv/loader/main.c

@@ -80 +80 @@
 static int filc = 0;
 /** Preset files vector */
-static char **filv = NULL;
+static fdi_node_t **filv = NULL;
 /** Buffer holding all preset files */
 static fdi_node_t *fil_buf = NULL;