Changeset 446 for EcnlProtoTool/trunk/ntshell/src/main.c

Timestamp:

Jul 21, 2020, 8:38:44 AM (4 years ago)

Author:

coas-nagasima

Message:

プログラムテーブルのセクションを追加しntshellで読みだしてHELPを表示するよう変更

File:

• EcnlProtoTool/trunk/ntshell/src/main.c (modified) (6 diffs)

EcnlProtoTool/trunk/ntshell/src/main.c

@@ -125 +125 @@
 static const Elf32_Ehdr *load_elf(const uint8_t *file);
 static void execute_elf(const Elf32_Ehdr *, long *args);
+static void read_cmdlist_from_elf(const Elf32_Ehdr *Ehdr);
 static int usrcmd_ntopt_callback(long *args, void *extobj);
 #ifndef NTSHELL_NO_SOCKET
@@ -527 +528 @@
         {"info", "This is a description text string for info command.", usrcmd_info},
         {"exit", "Exit Natural Tiny Shell", usrcmd_exit},
+        {"help", "This is a description text string for help command.", usrcmd_help},
 };
-cmd_table_info_t cmd_table_info = { cmdlist, sizeof(cmdlist) / sizeof(cmdlist[0]) };
+const cmd_table_info_t cmd_table_info = { cmdlist, sizeof(cmdlist) / sizeof(cmdlist[0]) };
+cmd_table_info_t elf_cmd_table_info;
 
 static int usrcmd_ntopt_callback(long *args, void *extobj)
@@ -540 +543 @@
 
         if (strcmp((const char *)args[1], "help") == 0) {
+                found = 1;
                 result = usrcmd_help(args[0], (char **)&args[1]);
         }
@@ -567 +571 @@
 int usrcmd_help(int argc, char **argv)
 {
-        const cmd_table_t *p = cmd_table_info.table;
-        for (int i = 0; i < cmd_table_info.count; i++) {
-                printf(p->cmd);
-                printf("\t:");
-                puts(p->desc);
-                p++;
+        const cmd_table_t *p, *q;
+        const Elf32_Ehdr *elf = load_elf((const uint8_t *)0x18200000);
+        if (elf != NULL) {
+                read_cmdlist_from_elf(elf);
+        }
+        else {
+                elf_cmd_table_info.count = 0;
+        }
+        p = cmd_table_info.table;
+        for (int i = 0; i < cmd_table_info.count - 3; i++, p++) {
+                printf("%s\t:%s\n", p->cmd, p->desc);
+        }
+        p = elf_cmd_table_info.table;
+        for (int i = 0; i < elf_cmd_table_info.count; i++, p++) {
+                printf("%s\t:%s\n", p->cmd, p->desc);
+        }
+        p = &cmd_table_info.table[cmd_table_info.count - 3];
+        for (int i = cmd_table_info.count - 3; i < cmd_table_info.count; i++, p++) {
+                printf("%s\t:%s\n", p->cmd, p->desc);
         }
         return 0;
@@ -700 +717 @@
                         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
@@ -730 +739 @@
         ((elf_entry_t)Ehdr->e_entry)(args);
 }
+
+void read_cmdlist_from_elf(const Elf32_Ehdr *Ehdr)
+{
+        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 ((name != NULL) && (strcmp(name, ".cmdlist") == 0)) {
+                                elf_cmd_table_info.table = (const cmd_table_t *)Shdr.sh_addr;
+                                elf_cmd_table_info.count = Shdr.sh_size / sizeof(cmd_table_t);
+                        }
+                }
+        }
+}