Noratrieb/rustv32i
1
0
Fork 0
mirror of https://github.com/Noratrieb/rustv32i.git synced 2026-01-14 21:35:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix c.addi16sp

Browse source
This commit is contained in:
nora 2025-03-10 19:48:09 +01:00
parent 377c8412a7
commit 4965493a0e
4 changed files with 46 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/inst.rs
View file

@ -224,7 +224,11 @@ impl Display for Inst {
}
}
Inst::Jalr { offset, base, dest } => {
write!(f, "jalr {dest}, {}({base})", offset as i32)
if dest == Reg::ZERO && offset == 0 && base == Reg::RA {
write!(f, "ret")
} else {
write!(f, "jalr {dest}, {}({base})", offset as i32)
}
}
Inst::Beq { offset, src1, src2 } => write!(f, "beq {src1}, {src2}, {}", offset as i32),
Inst::Bne { offset, src1, src2 } => write!(f, "bne {src1}, {src2}, {}", offset as i32),
@ -554,7 +558,6 @@ impl Inst {
if code.0 == 0 {
return Err(Status::IllegalInstruction(code.into(), "null instruction"));
}
let inst = match code.quadrant() {
// C0
0b00 => match code.funct3() {
@ -695,7 +698,7 @@ impl Inst {
// C.ADDI16SP -> addi sp, sp, \imm
2 => Inst::Addi {
imm: code.immediate_s(&[
(2..=2, 2),
(2..=2, 5),
(3..=4, 7),
(5..=5, 6),
(6..=6, 4),