[WIP] Fix information of segments

Author: DrXiao

src/elf.c

@@ -209,49 +209,51 @@ void elf_generate_program_headers(void)
     phdr.p_memsz = elf_code->size + elf_data->size + elf_rodata->size +
                    elf_bss_size; /* size in memory */
     phdr.p_flags = 7;            /* flags */
-    phdr.p_align = 4;            /* alignment */
+    phdr.p_align = 0x1000;       /* alignment */
     elf_write_blk(elf_program_header, &phdr, sizeof(elf32_phdr_t));
     if (dynlink) {
         /* program header - all dynamic sections combined */
         phdr.p_type = 1; /* PT_LOAD */
         phdr.p_offset = elf_header_len + elf_code->size + elf_data->size +
-                        elf_rodata->size;         /* offset of segment */
-        phdr.p_vaddr = ELF_START + phdr.p_offset; /* virtual address */
-        phdr.p_paddr = ELF_START + phdr.p_offset; /* physical address */
+                        elf_rodata->size; /* offset of segment */
+        phdr.p_vaddr = elf_interp_start;  /* virtual address */
+        phdr.p_paddr = elf_interp_start;  /* physical address */
         phdr.p_filesz = elf_interp->size + elf_relplt->size + elf_plt->size +
                         elf_got->size + elf_dynstr->size + elf_dynsym->size +
                         elf_dynamic->size; /* size in file */
         phdr.p_memsz = elf_interp->size + elf_relplt->size + elf_plt->size +
                        elf_got->size + elf_dynstr->size + elf_dynsym->size +
                        elf_dynamic->size; /* size in memory */
         phdr.p_flags = 7;                 /* flags */
-        phdr.p_align = 4;                 /* alignment */
+        phdr.p_align = 0x1000;            /* alignment */
         elf_write_blk(elf_program_header, &phdr, sizeof(elf32_phdr_t));
 
         /* program header - program interpreter (.interp section) */
         phdr.p_type = 3; /* PT_INTERP */
         phdr.p_offset = elf_header_len + elf_code->size + elf_data->size +
-                        elf_rodata->size;         /* offset of segment */
-        phdr.p_vaddr = ELF_START + phdr.p_offset; /* virtual address */
-        phdr.p_paddr = ELF_START + phdr.p_offset; /* physical address */
-        phdr.p_filesz = strlen(DYN_LINKER) + 1;   /* size in file */
-        phdr.p_memsz = strlen(DYN_LINKER) + 1;    /* size in memory */
-        phdr.p_flags = 4;                         /* flags */
-        phdr.p_align = 1;                         /* alignment */
+                        elf_rodata->size;       /* offset of segment */
+        phdr.p_vaddr = elf_interp_start;        /* virtual address */
+        phdr.p_paddr = elf_interp_start;        /* physical address */
+        phdr.p_filesz = strlen(DYN_LINKER) + 1; /* size in file */
+        phdr.p_memsz = strlen(DYN_LINKER) + 1;  /* size in memory */
+        phdr.p_flags = 4;                       /* flags */
+        phdr.p_align = 1;                       /* alignment */
         elf_write_blk(elf_program_header, &phdr, sizeof(elf32_phdr_t));
 
         /* program header - .dynamic section */
         phdr.p_type = 2; /* PT_DYNAMIC */
         phdr.p_offset = elf_header_len + elf_code->size + elf_data->size +
                         elf_rodata->size + elf_interp->size + elf_relplt->size +
                         elf_plt->size + elf_got->size + elf_dynstr->size +
-                        elf_dynsym->size;         /* offset of segment */
-        phdr.p_vaddr = ELF_START + phdr.p_offset; /* virtual address */
-        phdr.p_paddr = ELF_START + phdr.p_offset; /* physical address */
-        phdr.p_filesz = elf_dynamic->size;        /* size in file */
-        phdr.p_memsz = elf_dynamic->size;         /* size in memory */
-        phdr.p_flags = 6;                         /* flags */
-        phdr.p_align = 4;                         /* alignment */
+                        elf_dynsym->size; /* offset of segment */
+        phdr.p_vaddr = elf_got_start + elf_got->size + elf_dynstr->size +
+                       elf_dynsym->size; /* virtual address */
+        phdr.p_paddr = elf_got_start + elf_got->size + elf_dynstr->size +
+                       elf_dynsym->size;   /* physical address */
+        phdr.p_filesz = elf_dynamic->size; /* size in file */
+        phdr.p_memsz = elf_dynamic->size;  /* size in memory */
+        phdr.p_flags = 6;                  /* flags */
+        phdr.p_align = 4;                  /* alignment */
         elf_write_blk(elf_program_header, &phdr, sizeof(elf32_phdr_t));
     }
 }
@@ -587,7 +589,7 @@ void elf_generate_sections(void)
         got_size += PTR_SIZE;
 
         /* Get the starting points of the sections. */
-        elf_interp_start = elf_bss_start + elf_bss_size;
+        elf_interp_start = elf_bss_start + elf_bss_size + 0x1000;
         elf_relplt_start = elf_interp_start + elf_interp->size;
         elf_plt_start = elf_relplt_start + relplt_size;
         elf_got_start = elf_plt_start + plt_size;