Changeset 443

Timestamp:

Jul 14, 2020, 7:49:28 PM (3 years ago)

Author:

coas-nagasima

Message:

prototoolにelfファイルヘッダーを付けてntshellで必要な情報を読み取れるよう変更

Location:

EcnlProtoTool/trunk

Files:

• ntshell/src/main.c (modified) (5 diffs)
• ntshell/src/main.cfg (modified) (1 diff)
• ntshell/src/main.h (modified) (2 diffs)
• prototool/src/elf.c (added)
• prototool/src/linker_scriptDebug.ld (modified) (3 diffs)
• prototool/src/main.c (modified) (1 diff)

EcnlProtoTool/trunk/ntshell/src/main.c

@@ -75 +75 @@
 #include "netcmd.h"
 #endif
+#include "../musl-1.1.18/include/elf.h"
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
@@ -122 +123 @@
 static void main_timeout(struct main_obj_t *obj, bool_t wakeup);
 static int execute_command(struct main_obj_t *obj, int wait);
+static const Elf32_Ehdr *load_elf(const uint8_t *file);
+static void execute_elf(const Elf32_Ehdr *, long *args);
 static int usrcmd_ntopt_callback(long *args, void *extobj);
 #ifndef NTSHELL_NO_SOCKET
@@ -134 +137 @@
 int shellcmd_exit_code;
 volatile int shellcmd_state;
-typedef void (*PowerOn_Reset_t)(long *args);
+typedef void (*elf_entry_t)(long *args);
 jmp_buf shellcmd_exit;
 
@@ -549 +552 @@
 
         if ((found == 0) && setjmp(shellcmd_exit) == 0) {
-                found = 1;
-                (*((PowerOn_Reset_t *)0x18200000))(args);
+                const Elf32_Ehdr *elf = load_elf((const uint8_t *)0x18200000);
+                if (elf != NULL) {
+                        found = 1;
+                        execute_elf(elf, args);
+                }
         }
 
@@ -643 +649 @@
 }
 
+const Elf32_Ehdr *load_elf(const uint8_t *file)
+{
+        Elf32_Ehdr Ehdr;
+
+        memcpy(&Ehdr, &file[0], sizeof(Elf32_Ehdr));
+
+        // Magic
+        if ((Ehdr.e_ident[EI_MAG0] != ELFMAG0)
+                || (Ehdr.e_ident[EI_MAG1] != ELFMAG1)
+                || (Ehdr.e_ident[EI_MAG2] != ELFMAG2)
+                || (Ehdr.e_ident[EI_MAG3] != ELFMAG3))
+                return NULL;
+
+        // Class
+        if (Ehdr.e_ident[EI_CLASS] != ELFCLASS32)
+                return NULL;
+
+        // Byte order
+        if (Ehdr.e_ident[EI_DATA] != ELFDATA2LSB)
+                return NULL;
+
+        // ELF Version
+        if (Ehdr.e_ident[EI_VERSION] != EV_CURRENT)
+                return NULL;
+
+        // type
+        if (Ehdr.e_type != ET_EXEC)
+                return NULL;
+
+        // Machine
+        if (Ehdr.e_machine != EM_ARM)
+                return NULL;
+
+        if (Ehdr.e_version != EV_CURRENT)
+                return NULL;
+
+        return (const Elf32_Ehdr *)file;
+}
+
+void execute_elf(const Elf32_Ehdr *Ehdr, long *args)
+{
+        const uint8_t *file = (const uint8_t *)Ehdr;
+        Elf32_Shdr StringShdr;
+        memcpy(&StringShdr, &file[Ehdr->e_shoff + (Ehdr->e_shstrndx * Ehdr->e_shentsize)], sizeof(StringShdr));
+
+        if (Ehdr->e_shoff > 0) {
+                Elf32_Shdr Shdr;
+                for (int i = 0; i < Ehdr->e_shnum; i++) {
+                        memcpy(&Shdr, (Elf32_Shdr *)&file[Ehdr->e_shoff + (i * Ehdr->e_shentsize)], sizeof(Elf32_Shdr));
+                        Shdr.sh_size -= Shdr.sh_addr;
+
+                        char *name;
+                        if (Shdr.sh_name > 0) {
+                                name = (char *)&file[StringShdr.sh_offset + Shdr.sh_name];
+                        }
+                        else {
+                                name = NULL;
+                        }
+
+                        if ((Shdr.sh_flags & SHF_ALLOC) == 0) {
+                                // skip
+                        }
+                        else if (Shdr.sh_type == SHT_PROGBITS) {
+                                if ((Shdr.sh_flags & SHF_WRITE) == 0) {
+                                        // inplace
+                                }
+                                else {
+                                        memcpy(Shdr.sh_addr, Shdr.sh_offset, Shdr.sh_size);
+                                }
+                        }
+                        else if (Shdr.sh_type == SHT_NOBITS) {
+                                memset(Shdr.sh_addr, 0, Shdr.sh_size);
+                        }
+                        else {
+                                // skip
+                        }
+                }
+        }
+
+        ((elf_entry_t)Ehdr->e_entry)(args);
+}

EcnlProtoTool/trunk/ntshell/src/main.cfg

@@ -80 +80 @@
 CRE_DTQ(MAIN_DATAQUEUE, { TA_TFIFO, NUM_MAIN_DATAQUEUE, NULL });
 
-CRE_TSK(SHELLCMD_TASK, { TA_FPU, 0, shellcmd_task, SHELLCMD_PRIORITY, SHELLCMD_STACK_SIZE, (void *)0x20100000 });
+CRE_TSK(SHELLCMD_TASK, { TA_FPU, 0, shellcmd_task, SHELLCMD_PRIORITY, SHELLCMD_STACK_SIZE, SHELLCMD_STACK_ADDR });
 CRE_FLG(FLG_SELECT_WAIT, { TA_WMUL, 0x00 });
 CRE_SEM(SEM_FILEDESC, { TA_TPRI, 1, 1 });

EcnlProtoTool/trunk/ntshell/src/main.h

@@ -60 +60 @@
 #define MAIN_STACK_SIZE 2048            /* メインタスクのスタック領域のサイズ */
 #define SHELLCMD_STACK_SIZE     0x00800000      /* shellcmdタスクのスタック領域のサイズ */
+#define SHELLCMD_STACK_ADDR     ((void *)&__CmdBase)
 
 #define NUM_MAIN_DATAQUEUE      1               /* メインタスクで待ち受けているデータキューのサイズ */
@@ -68 +69 @@
  */
 #ifndef TOPPERS_MACRO_ONLY
+
+extern uint8_t __CmdBase;
+extern uint8_t __CmdLimit;
 
 typedef struct task_base_t {

EcnlProtoTool/trunk/prototool/src/linker_scriptDebug.ld

@@ -22 +22 @@
         } > BOOT_LOADER
 
+        .proginf : {
+                KEEP(*(.proginf))
+        } > ROM
+
         .text : {
                 __start_text = .;
-                KEEP(*(.vector))
                 *(.text*)
                 *(.glue_7t)
@@ -30 +33 @@
                 KEEP(*(.init))
                 KEEP(*(.fini))
-                __end_kernel = .;
+                __end_text = .;
         } > ROM
         _etext = .;
@@ -40 +43 @@
                 __end_rodata = .;
         } > ROM
+
         .preinit_array ALIGN(4) : {
                 PROVIDE_HIDDEN (__preinit_array_start = .);

EcnlProtoTool/trunk/prototool/src/main.c

@@ -521 +521 @@
         return (&__start_rodata <= p && p < &__end_rodata);
 }
-
-void _start_c(long *p);
-extern int __start_idata, __start_data, __end_data;
-extern int __start_bss, __end_bss;
-
-void _PowerON_Reset(long *args)
-{
-        memcpy(&__start_data, &__start_idata, (size_t)&__end_data - (size_t)&__start_data);
-        memset(&__start_bss, 0, (size_t)&__end_bss - (size_t)&__start_bss);
-
-        _start_c(args);
-}
-
-#define FVECT_SECT          __attribute__ ((section (".vector")))
-const void *HardwareVectors[] FVECT_SECT = {
-        _PowerON_Reset,
-        mrdb_break,
-};