Changeset 427

Legend:

Unmodified

Added

Removed

• EcnlProtoTool/trunk/ntshell/Debug/Makefile

  r424	r427
  187	187	CDEFS := $(CDEFS) -DFD_SETSIZE=32
  188	188	INCLUDES := -I. -I$(SRCDIR)/include $(INCLUDES) -I$(SRCDIR)
  189	LDFLAGS := $(LDFLAGS) -L.(削除) -Wl,-Map=$(OBJNAME).map,--cref (削除ここまで)
  189	LDFLAGS := $(LDFLAGS) -L.(追記) (追記ここまで)
  190	190	LIBS := $(LIBS) $(CXXLIBS)
  191	191	CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
  …	…
  446	446	$(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
  447	447	$(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
  448	(追記) -Wl,-Map=$(OBJNAME).map,--cref -Wl,--gc-sections -Wl,-e_kernel__start,--gc-keep-exported=_kernel_istk \ (追記ここまで)
  448	449	$(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
  449	450	$(ALL_LIBS) $(END_OBJS)

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

  r331	r427
  131	131	int argc;
  132	132	char argv[NTOPT_TEXT_MAXLEN];
  133	char *argvp[1 + NTOPT_TEXT_MAXARGS(削除) (削除ここまで)];
  133	char *argvp[1 + NTOPT_TEXT_MAXARGS(追記) + 4 (追記ここまで)];
  134	134	int i;
  135	135	int total;
  …	…
  157	157	}
  158	158	argvp[0] = (char *)argc;
  159	(追記) // envp (追記ここまで)
  160	(追記) argvp[argc + 2] = "TZ=JST-9"; (追記ここまで)
  161	(追記) // envp + 1: null (追記ここまで)
  162	(追記) // auxv: null (追記ここまで)
  159	163
  160	164	return func((long *)&argvp[0], extobj);

• EcnlProtoTool/trunk/ntshell/src/main.c

  r424	r427
  425	425	}
  426	426	if (setjmp(process_exit) == 0) {
  427	(*((PowerOn_Reset_t *)0x182(削除) 0 (削除ここまで)0000))(args);
  427	(*((PowerOn_Reset_t *)0x182(追記) 2 (追記ここまで)0000))(args);
  428	428	}
  429	429	clean_fd();

• EcnlProtoTool/trunk/prototool/.cproject

  r426	r427
  16	16	<option id="toolchain.id" value="gcc-arm-embedded"/>
  17	17	<option id="toolchain.version" value="6.3.1.20170620"/>
  18	(追記) <option id="toolchain.enable" value="false"/> (追記ここまで)
  18	19	</storageModule>
  19	20	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

• EcnlProtoTool/trunk/prototool/src/linker_scriptDebug.ld

  r426	r427
  8	8
  9	9	MEMORY {
  10	ROM (rx) : ORIGIN = 0x18000000, LENGTH = 0x07FFC000
  11	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10M
  10	BOOT_LOADER : ORIGIN = 0x18000000, LENGTH = 0x00220000
  11	ROM (rx) : ORIGIN = 0x18220000, LENGTH = 0x005E0000
  12	RAM (xrw) : ORIGIN = 0x20100000, LENGTH = 8M
  12	13	}
  13	14
  …	…
  19	20	.boot : {
  20	21	KEEP(*(.boot))
  21	} > (削除) ROM (削除ここまで)
  22	} > (追記) BOOT_LOADER (追記ここまで)
  22	23
  23	24	.text : {
  24	25	__start_text = .;
  25	(削除) *(.vector (削除ここまで))
  26	*(.text(削除) (削除ここまで))
  26	(追記) KEEP(*(.vector) (追記ここまで))
  27	*(.text(追記) * (追記ここまで))
  27	28	*(.glue_7t)
  28	29	*(.glue_7)
  30	(追記) KEEP(*(.init)) (追記ここまで)
  31	(追記) KEEP(*(.fini)) (追記ここまで)
  29	32	__end_kernel = .;
  30	33	} > ROM
  …	…
  34	37	.rodata ALIGN(4) : {
  35	38	__start_rodata = .;
  36	*(.rodata(削除) (削除ここまで))
  39	*(.rodata(追記) * (追記ここまで))
  37	40	__end_rodata = .;
  38	41	} > ROM
  …	…
  62	65	.data : ALIGN(4) {
  63	66	__start_data = .;
  64	*(.data)
  67	*(.data*)
  68	*(.got*)
  65	69	__end_data = .;
  66	70	} > RAM AT > ROM
  …	…
  72	76	.bss ALIGN(4) : {
  73	77	__start_bss = .;
  74	*(.bss(削除) (削除ここまで))
  78	*(.bss(追記) * (追記ここまで))
  75	79	*(COMMON)
  76	80	__end_bss = .;

• EcnlProtoTool/trunk/prototool/src/main.c

  r331	r427
  514	514
  515	515	void _start_c(long *p);
  516	(削除) int _data, _mdata, _e (削除ここまで)data;
  517	(削除) int _bss, _e (削除ここまで)bss;
  516	(追記) extern int __start_idata, __start_data, __end_ (追記ここまで)data;
  517	(追記) extern int __start_bss, __end_ (追記ここまで)bss;
  518	518
  519	519	void _PowerON_Reset(long *args)
  520	520	{
  521	memcpy(&_(削除) data, &_mdata, (size_t)&_edata - (size_t)& (削除ここまで)_data);
  522	memset(&_(削除) bss, 0, (size_t)&_ebss - (size_t)& (削除ここまで)_bss);
  521	memcpy(&_(追記) _start_data, &__start_idata, (size_t)&__end_data - (size_t)&__start (追記ここまで)_data);
  522	memset(&_(追記) _start_bss, 0, (size_t)&__end_bss - (size_t)&__start (追記ここまで)_bss);
  523	523
  524	524	_start_c(args);
  525	525	}
  526	526
  527	#define FVECT_SECT __attribute__ ((section (".(削除) fvectors (削除ここまで)")))
  527	#define FVECT_SECT __attribute__ ((section (".(追記) vector (追記ここまで)")))
  528	528	const void *HardwareVectors[] FVECT_SECT = {
  529	529	_PowerON_Reset,
  530	530	mrdb_break,
  531	531	};
  532	(削除) (削除ここまで)
  533	(削除) char stack_space[0x100000] __attribute__ ((section (".stack"))); (削除ここまで)

Note: See TracChangeset for help on using the changeset viewer.