Changeset 427 for EcnlProtoTool/trunk/ntshell

Timestamp:

Jun 1, 2020, 6:25:09 PM (4 years ago)

Author:

coas-nagasima

Message:

メモリ割り当てが悪く動かないのを修正

Location:

EcnlProtoTool/trunk/ntshell

Files:

• Debug/Makefile (modified) (2 diffs)
• ntshell/util/ntopt.c (modified) (2 diffs)
• src/main.c (modified) (1 diff)

EcnlProtoTool/trunk/ntshell/Debug/Makefile

@@ -187 +187 @@
 CDEFS := $(CDEFS) -DFD_SETSIZE=32
 INCLUDES := -I. -I$(SRCDIR)/include $(INCLUDES) -I$(SRCDIR)
-LDFLAGS := $(LDFLAGS) -L. -Wl,-Map=$(OBJNAME).map,--cref
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -446 +446 @@
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
         $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+                        -Wl,-Map=$(OBJNAME).map,--cref -Wl,--gc-sections -Wl,-e_kernel__start,--gc-keep-exported=_kernel_istk \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         $(ALL_LIBS) $(END_OBJS)

EcnlProtoTool/trunk/ntshell/ntshell/util/ntopt.c

@@ -131 +131 @@
         int argc;
         char argv[NTOPT_TEXT_MAXLEN];
-        char *argvp[1 + NTOPT_TEXT_MAXARGS];
+        char *argvp[1 + NTOPT_TEXT_MAXARGS + 4];
         int i;
         int total;
@@ -157 +157 @@
         }
         argvp[0] = (char *)argc;
+        // envp
+        argvp[argc + 2] = "TZ=JST-9";
+        // envp + 1: null
+        // auxv: null
 
         return func((long *)&argvp[0], extobj);

EcnlProtoTool/trunk/ntshell/src/main.c

@@ -425 +425 @@
         }
         if (setjmp(process_exit) == 0) {
-                (*((PowerOn_Reset_t *)0x18200000))(args);
+                (*((PowerOn_Reset_t *)0x18220000))(args);
         }
         clean_fd();