riscv64-noop,trm: support mainargs

This commit is contained in:
Zihao Yu 2020-03-07 21:12:53 +08:00
parent fc1833a390
commit f766872d7d
2 changed files with 6 additions and 2 deletions

View File

@ -1,6 +1,7 @@
include $(AM_HOME)/am/arch/isa/riscv64.mk
AM_SRCS := noop/isa/riscv/trm.c \
nemu/common/mainargs.S \
noop/isa/riscv/perf.c \
noop/common/uartlite.c \
nemu/isa/riscv/cte.c \
@ -18,6 +19,9 @@ AM_SRCS := noop/isa/riscv/trm.c \
CFLAGS += -I$(AM_HOME)/am/src/nemu/include -DISA_H=\"riscv.h\"
ASFLAGS += -DMAINARGS=\"$(mainargs)\"
.PHONY: $(AM_HOME)/am/src/nemu/common/mainargs.S
LDFLAGS += -L $(AM_HOME)/am/src/nemu/ldscript
LDFLAGS += -T $(AM_HOME)/am/src/nemu/isa/riscv/boot/loader64.ld

View File

@ -29,7 +29,7 @@ void _halt(int code) {
void _trm_init() {
__am_init_uartlite();
const char *mainargs = "";
int ret = main(mainargs);
extern const char __am_mainargs;
int ret = main(&__am_mainargs);
_halt(ret);
}