提交 0f4b689b 编写于 作者: Z Zihao Yu

rtl: remove the DecodeExecState argument in rtl_exit()

上级 4beb0698
......@@ -139,7 +139,7 @@ static inline make_rtl(jrelop, uint32_t relop,
s->is_jmp = is_jmp;
}
make_rtl(exit, int state, vaddr_t halt_pc, uint32_t halt_ret);
void rtl_exit(int state, vaddr_t halt_pc, uint32_t halt_ret);
/* RTL pseudo instructions */
......
......@@ -20,7 +20,7 @@ make_EHelper(inv) {
display_inv_msg(cpu.pc);
rtl_exit(s, NEMU_ABORT, cpu.pc, -1);
rtl_exit(NEMU_ABORT, cpu.pc, -1);
print_asm("invalid opcode");
}
......@@ -28,7 +28,7 @@ make_EHelper(inv) {
make_EHelper(nemu_trap) {
difftest_skip_ref();
rtl_exit(s, NEMU_END, cpu.pc, cpu.eax);
rtl_exit(NEMU_END, cpu.pc, cpu.eax);
print_asm("nemu trap");
return;
......
......@@ -117,7 +117,7 @@ int run_vm(struct vm *vm, struct vcpu *vcpu, size_t sz) {
assert(0);
}
rtl_exit(NULL, NEMU_END, regs.rip, regs.rax);
rtl_exit(NEMU_END, regs.rip, regs.rax);
return 0;
case KVM_EXIT_IO: {
......
......@@ -25,7 +25,7 @@ int goodtrap(void) {
return (nemu_state.state == NEMU_END && nemu_state.halt_ret == 0);
}
void rtl_exit(DecodeExecState *s, int state, vaddr_t halt_pc, uint32_t halt_ret) {
void rtl_exit(int state, vaddr_t halt_pc, uint32_t halt_ret) {
nemu_state = (NEMUState) { .state = state, .halt_pc = halt_pc, .halt_ret = halt_ret };
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册