Changeset 446 for EcnlProtoTool/trunk/prototool/src/elf.c

Timestamp:

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

Author:

coas-nagasima

Message:

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

File:

• EcnlProtoTool/trunk/prototool/src/elf.c (modified) (4 diffs)

EcnlProtoTool/trunk/prototool/src/elf.c

@@ -38 +38 @@
 #include <string.h>
 #include <elf.h>
+#include <ntshell/usrcmd.h>
+
+extern int mrbc_main(int argc, char **argv);
+extern int mrdb_main(int argc, char **argv);
+extern int mruby_main(int argc, char **argv);
+extern int mirb_main(int argc, char **argv);
+extern int curl_main(int argc, char **argv);
+extern int tcc_main(int argc, char **argv);
+extern int vi_main(int argc, char **argv);
+extern int openssl_main(int argc, char *argv[]);
+extern int onitest_main(int argc, char **argv);
+extern int tcp_echo_main(int argc, char **argv);
+
+static const cmd_table_t cmdlist[] = {
+        {"mrbc", "mruby compiler executable", mrbc_main},
+        {"mrdb","mruby debugger command", mrdb_main},
+        {"mruby","mruby command", mruby_main},
+        {"mirb", "Embeddable Interactive Ruby Shell", mirb_main},
+        {"curl", "Command lines or scripts to transfer data", curl_main},
+        {"tcc", "Tiny C compiler", tcc_main},
+        {"vi", "Text editor", vi_main},
+        {"openssl", "Cryptography and SSL/TLS Toolkit", openssl_main},
+        {"onitest", "Onigumo Test", onitest_main},
+        {"tcp_echo", "TCP echo server/client", tcp_echo_main},
+};
+const cmd_table_info_t cmd_table_info = { &cmdlist, sizeof(cmdlist) / sizeof(cmdlist[0]) };
 
 #define FVECT_SECT          __attribute__ ((section (".proginf")))
@@ -50 +76 @@
         Elf32_Ehdr ehdr;
         Elf32_Phdr phdr[3];
-        Elf32_Shdr shdr[4];
+        Elf32_Shdr shdr[5];
         Elf32_Shdr str_shdr;
-        char shstrtab[sizeof("\0.text\0.rodata\0.data\0.bss\0.shstrtab")];
+        char shstrtab[sizeof("\0.text\0.rodata\0.data\0.bss\0.cmdlist\0.shstrtab")];
 } TProgInf;
 
@@ -152 +178 @@
                         .sh_addralign = (Elf32_Word)8,
                         .sh_entsize = (Elf32_Word)0,
+                },
+                {
+                        .sh_name = (Elf32_Word)26,
+                        .sh_type = (Elf32_Word)SHT_PROGBITS,
+                        .sh_flags = (Elf32_Word)(SHF_ALLOC),
+                        .sh_addr = (Elf32_Addr)&cmdlist,
+                        .sh_offset = (Elf32_Off)&cmdlist/* - (Elf32_Off)&ProgInf*/,
+                        .sh_size = (Elf32_Word)&cmdlist[sizeof(cmdlist) / sizeof(cmdlist[0])]/* - (Elf32_Off)&cmdlist*/,
+                        .sh_link = (Elf32_Word)0,
+                        .sh_info = (Elf32_Word)0,
+                        .sh_addralign = (Elf32_Word)8,
+                        .sh_entsize = (Elf32_Word)0,
                 }
         },
         {
-                .sh_name = (Elf32_Word)26,
+                .sh_name = (Elf32_Word)35,
                 .sh_type = (Elf32_Word)SHT_STRTAB,
                 .sh_flags = (Elf32_Word)0,
@@ -166 +204 @@
                 .sh_entsize = (Elf32_Word)0,
         },
-        "\0.text\0.rodata\0.data\0.bss\0.shstrtab"
+        "\0.text\0.rodata\0.data\0.bss\0.cmdlist\0.shstrtab"
 };