Changeset 46c20c8 in mainline for uspace/app/taskdump/elf_core.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/app/taskdump/elf_core.c (modified) (5 diffs)

uspace/app/taskdump/elf_core.c

@@ -62 +62 @@
 #include "include/elf_core.h"
 
-static off_t align_foff_up(off_t foff, uintptr_t vaddr, size_t page_size);
+static off64_t align_foff_up(off64_t foff, uintptr_t vaddr, size_t page_size);
 static int write_all(int fd, void *data, size_t len);
 static int write_mem_area(int fd, as_area_info_t *area, int phoneid);
@@ -79 +79 @@
  *                      ENOMEM on out of memory, EIO on write error.
  */
-int elf_core_save(const char *file_name, as_area_info_t *ainfo, int n, int phoneid)
+int elf_core_save(const char *file_name, as_area_info_t *ainfo, unsigned int n, int phoneid)
 {
         elf_header_t elf_hdr;
-        off_t foff;
+        off64_t foff;
         size_t n_ph;
         elf_word flags;
@@ -89 +89 @@
         int fd;
         int rc;
-        int i;
+        unsigned int i;
 
         n_ph = n;
@@ -184 +184 @@
 
         for (i = 0; i < n_ph; ++i) {
-                if (lseek(fd, p_hdr[i].p_offset, SEEK_SET) == (off_t) -1) {
+                if (lseek(fd, p_hdr[i].p_offset, SEEK_SET) == (off64_t) -1) {
                         printf("Failed writing memory data.\n");
                         free(p_hdr);
@@ -202 +202 @@
 
 /** Align file offset up to be congruent with vaddr modulo page size. */
-static off_t align_foff_up(off_t foff, uintptr_t vaddr, size_t page_size)
-{
-        off_t rfo, rva;
-        off_t advance;
-
-        rva = vaddr % page_size;
-        rfo = foff % page_size;
-
-        advance = (rva >= rfo) ? rva - rfo : (page_size + rva - rfo);
-        return foff + advance;
+static off64_t align_foff_up(off64_t foff, uintptr_t vaddr, size_t page_size)
+{
+        off64_t rva = vaddr % page_size;
+        off64_t rfo = foff % page_size;
+        
+        if (rva >= rfo)
+                return (foff + (rva - rfo));
+        
+        return (foff + (page_size + (rva - rfo)));
 }