drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't fetch command line options without semi-hosting 

Nowadays, the code fetching command line options via semi-hosting are
unconditionally pulled in, so that the semi-hosting code is still
there even I compile with option --specs=nosys.specs.

gdb ./aarch64-none-elf/libgloss/aarch64/crt0.o

(gdb) disassemble _start

   0x0000000000000050 <+80>:	ldr	x1, 0x128 <_cpu_init_hook+48>
   0x0000000000000054 <+84>:	mov	w0, #0x15
   0x0000000000000058 <+88>:	hlt	#0xf000

This patch fixes this problem by wrapping the code by ARM_RDI_MONITOR.
When semi-hosting is not used, set command line options to NULL.
This commit is contained in:
Yao Qi 2017-08-09 15:37:57 +01:00 committed by Corinna Vinschen
parent 61ddc7a436
commit 32ca315312
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgloss/aarch64/crt0.S
View File

@ -157,6 +157,7 @@
bl FUNCTION (_init) bl FUNCTION (_init)
#ifdef ARM_RDI_MONITOR
/* Fetch and parse the command line. */ /* Fetch and parse the command line. */
ldr x1, .Lcmdline /* Command line descriptor. */ ldr x1, .Lcmdline /* Command line descriptor. */
mov w0, #AngelSVC_Reason_GetCmdLine mov w0, #AngelSVC_Reason_GetCmdLine
@ -219,6 +220,11 @@
and x4, x1, ~15 and x4, x1, ~15
mov sp, x4 mov sp, x4
#else
mov x0, #0 /* argc = 0 */
mov x1, #0 /* argv = NULL */
#endif
bl FUNCTION (main) bl FUNCTION (main)
b FUNCTION (exit) /* Cannot return. */ b FUNCTION (exit) /* Cannot return. */