Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle misalignment properly in jump-link instruction #20

Merged
merged 1 commit into from
Jul 22, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions riscv.c
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,12 @@ static void do_jump(vm_t *vm, uint32_t addr)

static void op_jump_link(vm_t *vm, uint32_t insn, uint32_t addr)
{
/* TODO: If the jump fails (misalign), shall rd have to be updated? */
set_dest(vm, insn, vm->pc);
do_jump(vm, addr);
if (unlikely(addr & 0b11)) {
vm_set_exception(vm, RV_EXC_PC_MISALIGN, addr);
} else {
set_dest(vm, insn, vm->pc);
vm->pc = addr;
}
}

#define AMO_OP(STORED_EXPR) \
Expand Down