AcessNative - Clean up ELF loader code

diff --git a/AcessNative/ld-acess_src/elf_load.c b/AcessNative/ld-acess_src/elf_load.c
index c5edc4a..76d9251 100644 (file)
--- a/AcessNative/ld-acess_src/elf_load.c
+++ b/AcessNative/ld-acess_src/elf_load.c
@@ -64,13 +64,6 @@ void *Elf_Load(int FD)
 \r
 void *Elf32Load(int FD, Elf32_Ehdr *hdr)\r
 {\r
-       Elf32_Phdr      *phtab;\r
-        int    i;\r
-        int    iPageCount;\r
-       uint32_t        max, base;\r
-       uint32_t        addr;\r
-       uint32_t        baseDiff = 0;\r
-       \r
        ENTER("iFD", FD);\r
        \r
        // Check for a program header\r
@@ -83,7 +76,7 @@ void *Elf32Load(int FD, Elf32_Ehdr *hdr)
        }\r
        \r
        // Read Program Header Table\r
-       phtab = malloc( sizeof(Elf32_Phdr) * hdr->e_phnum );\r
+       Elf32_Phdr* phtab = malloc( sizeof(Elf32_Phdr) * hdr->e_phnum );\r
        if( !phtab ) {\r
                LEAVE('n');\r
                return NULL;\r
@@ -93,9 +86,9 @@ void *Elf32Load(int FD, Elf32_Ehdr *hdr)
        acess__SysRead(FD, phtab, sizeof(Elf32_Phdr) * hdr->e_phnum);\r
        \r
        // Count Pages\r
-       iPageCount = 0;\r
+       unsigned int iPageCount = 0;\r
        LOG("hdr.e_phnum = %i\n", hdr->e_phnum);\r
-       for( i = 0; i < hdr->e_phnum; i++ )\r
+       for( unsigned int i = 0; i < hdr->e_phnum; i++ )\r
        {\r
                // Ignore Non-LOAD types\r
                if(phtab[i].p_type != PT_LOAD)\r
@@ -115,9 +108,9 @@ void *Elf32Load(int FD, Elf32_Ehdr *hdr)
        //ret->Interpreter = NULL;\r
 \r
        // Prescan for base and size\r
-       max = 0;\r
-       base = 0xFFFFFFFF;\r
-       for( i = 0; i < hdr->e_phnum; i ++)\r
+       uint32_t        max = 0;\r
+       uint32_t        base = UINT32_MAX;\r
+       for( unsigned int i = 0; i < hdr->e_phnum; i ++)\r
        {\r
                if( phtab[i].p_type != PT_LOAD )\r
                        continue;\r
@@ -129,6 +122,7 @@ void *Elf32Load(int FD, Elf32_Ehdr *hdr)
 \r
        LOG("base = %08x, max = %08x\n", base, max);\r
 \r
+       uint32_t        baseDiff = 0;\r
        if( base == 0 ) {\r
                // Find a nice space (47 address bits allowed)\r
                base = FindFreeRange( max, 47 );\r
@@ -138,7 +132,7 @@ void *Elf32Load(int FD, Elf32_Ehdr *hdr)
        }\r
        \r
        // Load Pages\r
-       for( i = 0; i < hdr->e_phnum; i++ )\r
+       for( unsigned int i = 0; i < hdr->e_phnum; i++ )\r
        {\r
                // Get Interpreter Name\r
                if( phtab[i].p_type == PT_INTERP )\r
@@ -159,10 +153,10 @@ void *Elf32Load(int FD, Elf32_Ehdr *hdr)
                LOG("phtab[%i] = PT_LOAD {Adj p_vaddr:0x%x, p_offset:0x%x, p_filesz:0x%x, p_memsz:0x%x}\n",\r
                        i, phtab[i].p_vaddr+baseDiff, phtab[i].p_offset, phtab[i].p_filesz, phtab[i].p_memsz);\r
                \r
-               addr = phtab[i].p_vaddr + baseDiff;\r
+               uint64_t addr = phtab[i].p_vaddr + baseDiff;\r
 \r
                if( AllocateMemory( addr, phtab[i].p_memsz ) ) {\r
-                       fprintf(stderr, "Elf_Load: Unable to map memory at %x (0x%x bytes)\n",\r
+                       fprintf(stderr, "Elf_Load: Unable to map memory at 0x%"PRIx64" (0x%x bytes)\n",\r
                                addr, phtab[i].p_memsz);\r
                        free( phtab );\r
                        return NULL;\r
@@ -182,13 +176,6 @@ void *Elf32Load(int FD, Elf32_Ehdr *hdr)
 \r
 void *Elf64Load(int FD, Elf64_Ehdr *hdr)\r
 {\r
-       Elf64_Phdr      *phtab;\r
-        int    i;\r
-        int    iPageCount;\r
-       uint64_t        max, base;\r
-       uint64_t        addr;\r
-       uint64_t        baseDiff = 0;\r
-       \r
        ENTER("iFD", FD);\r
        \r
        if( sizeof(void*) == 4) {\r
@@ -205,7 +192,7 @@ void *Elf64Load(int FD, Elf64_Ehdr *hdr)
        }\r
        \r
        // Read Program Header Table\r
-       phtab = malloc( sizeof(Elf64_Phdr) * hdr->e_phnum );\r
+       Elf64_Phdr* phtab = malloc( sizeof(Elf64_Phdr) * hdr->e_phnum );\r
        if( !phtab ) {\r
                LEAVE('n');\r
                return NULL;\r
@@ -215,9 +202,9 @@ void *Elf64Load(int FD, Elf64_Ehdr *hdr)
        acess__SysRead(FD, phtab, sizeof(Elf64_Phdr) * hdr->e_phnum);\r
        \r
        // Count Pages\r
-       iPageCount = 0;\r
+       unsigned int iPageCount = 0;\r
        LOG("hdr.e_phnum = %i\n", hdr->e_phnum);\r
-       for( i = 0; i < hdr->e_phnum; i++ )\r
+       for( unsigned int i = 0; i < hdr->e_phnum; i++ )\r
        {\r
                // Ignore Non-LOAD types\r
                if(phtab[i].p_type != PT_LOAD)\r
@@ -238,9 +225,9 @@ void *Elf64Load(int FD, Elf64_Ehdr *hdr)
        //ret->Interpreter = NULL;\r
 \r
        // Prescan for base and size\r
-       max = 0;\r
-       base = 0xFFFFFFFF;\r
-       for( i = 0; i < hdr->e_phnum; i ++)\r
+       uint64_t max = 0;\r
+       uint64_t base = UINT64_MAX;\r
+       for( unsigned int i = 0; i < hdr->e_phnum; i ++)\r
        {\r
                if( phtab[i].p_type != PT_LOAD )\r
                        continue;\r
@@ -252,16 +239,18 @@ void *Elf64Load(int FD, Elf64_Ehdr *hdr)
 \r
        LOG("base = %08lx, max = %08lx\n", base, max);\r
 \r
+       uint64_t        baseDiff = 0;\r
        if( base == 0 ) {\r
                // Find a nice space (31 address bits allowed)\r
                base = FindFreeRange( max, 31 );\r
                LOG("new base = %08lx\n", base);\r
-               if( base == 0 ) return NULL;\r
+               if( base == 0 )\r
+                       goto _err;\r
                baseDiff = base;\r
        }\r
        \r
        // Load Pages\r
-       for( i = 0; i < hdr->e_phnum; i++ )\r
+       for( unsigned int i = 0; i < hdr->e_phnum; i++ )\r
        {\r
                // Get Interpreter Name\r
                if( phtab[i].p_type == PT_INTERP )\r
@@ -286,13 +275,12 @@ void *Elf64Load(int FD, Elf64_Ehdr *hdr)
                        (long long)phtab[i].p_filesz, (long long)phtab[i].p_memsz\r
                        );\r
                \r
-               addr = phtab[i].p_vaddr + baseDiff;\r
+               uint64_t addr = phtab[i].p_vaddr + baseDiff;\r
 \r
                if( AllocateMemory( addr, phtab[i].p_memsz ) ) {\r
                        fprintf(stderr, "Elf_Load: Unable to map memory at %"PRIx64" (0x%"PRIx64" bytes)\n",\r
                                (uint64_t)addr, (uint64_t)phtab[i].p_memsz);\r
-                       free( phtab );\r
-                       return NULL;\r
+                       goto _err;\r
                }\r
                \r
                acess__SysSeek(FD, phtab[i].p_offset, ACESS_SEEK_SET);\r
@@ -305,5 +293,9 @@ void *Elf64Load(int FD, Elf64_Ehdr *hdr)
        // Return\r
        LEAVE('p', base);\r
        return PTRMK(void, base);\r
+_err:\r
+       free(phtab);\r
+       LEAVE('n');\r
+       return NULL;\r
 }\r
 \r