fixed critical but in ELF loader and finally got tput etc.. (ncurses) working

2 files changed, 11 insertions, 6 deletions

diff --git a/fs/elf.c b/fs/elf.c
index dc5f472..73570d9 100644
--- a/fs/elf.c
+++ b/fs/elf.c
@@ -81,7 +81,7 @@ uint32_t load_elf(char *name, uint32_t *alloc)
 
     log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"loading %s",name);
     ext2_check(ext2_ramimage);
-    ext2_inode_content(ext2_ramimage,inode_nr,vaddr,0x100000); // load 1mb;
+    ext2_inode_content(ext2_ramimage,inode_nr,vaddr,0x100000); // max ignored??
 
     log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"ELF File loaded to final destination.");
 
@@ -144,15 +144,20 @@ uint32_t load_elf(char *name, uint32_t *alloc)
 	    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"bss: 0x%08X-0x%08X",phdr->p_vaddr+phdr->p_filesz,phdr->p_vaddr+phdr->p_memsz);
 
 	    // let's copy the rw- data block
-	    uint32_t *data=vaddr+phdr->p_offset;
-	    for(uint32_t *addr=phdr->p_vaddr; addr<=phdr->p_vaddr+phdr->p_filesz; addr++)
+	    // from right to left so we not overwrite ourselves!!
+	    
+	    //for(uint8_t *addr=phdr->p_vaddr; addr<=phdr->p_vaddr+phdr->p_filesz; addr++) // this was wrong!
+	    //uint8_t *data=vaddr+phdr->p_offset;
+	    uint8_t *data=vaddr+phdr->p_offset+phdr->p_filesz-1;
+	    
+	    for(uint8_t *addr=phdr->p_vaddr+phdr->p_filesz-1; addr>=phdr->p_vaddr; addr--)
 	    {
 		*addr=*data;
-		data++;
+		data--;
 	    }
 
 	    // let's zero init bss and set alloc (heap) just right after it! 
-	    for(uint32_t *addr=phdr->p_vaddr+phdr->p_filesz; addr<=phdr->p_vaddr+phdr->p_memsz; addr++)
+	    for(uint8_t *addr=phdr->p_vaddr+phdr->p_filesz; addr<=phdr->p_vaddr+phdr->p_memsz; addr++)
 	    {
 		*addr=0;
 	    }
@@ -162,6 +167,7 @@ uint32_t load_elf(char *name, uint32_t *alloc)
 
 
     }
+    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"heap starts at: 0x%08X",*alloc);
 
     return elf->e_entry;
 
diff --git a/fs/ext2.c b/fs/ext2.c
index 1f4d04e..c313775 100644
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -184,7 +184,6 @@ void* ext2_get_indirectstart_double(void *start, uint32_t block_size, uint32_t i
     int idx=block_idx%(block_size/4);
 
     //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"bl: %d : %d / %d",block_idx,indirect1_idx, idx);
-
     return ext2_get_indirectstart(start,block_size,dil[indirect1_idx],idx);
 }