提交 c4bf4285 编写于 作者: Z Zihao Yu

Merge branch 'riscv64-noop-mainargs' into 'master'

riscv64-noop,trm: support mainargs

See merge request projectn/nexus-am!32
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
......
......@@ -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);
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册