Skip to content

fix(imm): add sign-extended imm(#2) #3

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.

Sign up for GitHub

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

Open
chaoRIOS wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(imm): add sign-extended imm(#2) #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 53 additions & 16 deletions src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ impl CsrIType {
pub struct IType(pub u32);
impl IType {
pub fn imm(&self) -> u32 {
Copy link
Copy Markdown
Owner

@fintelia fintelia Jul 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you switch this to returning an i32 now?

(self.0 >> 20)
((self.0 >> 20) & 0x0000_07ff)
| match self.0 & 0x8000_0000 {
0x8000_0000 => 0xffff_f800,
_ => 0,
}
}
pub fn rs1(&self) -> u32 {
(self.0 >> 15) & 0x1f
Expand All @@ -58,7 +62,12 @@ impl IType {
pub struct SType(pub u32);
impl SType {
pub fn imm(&self) -> u32 {
((self.0 >> 20) & 0xfe0) | ((self.0 >> 7) & 0x1f)
((self.0 >> 20) & 0xfe0)
| ((self.0 >> 7) & 0x1f)
| match self.0 & 0x8000_0000 {
0x8000_0000 => 0xffff_f000,
_ => 0,
}
}
pub fn rs1(&self) -> u32 {
(self.0 >> 15) & 0x1f
Expand All @@ -72,10 +81,13 @@ impl SType {
pub struct BType(pub u32);
impl BType {
pub fn imm(&self) -> u32 {
((self.0 & 0x8000_0000) >> 19)
| ((self.0 & 0x7e00_0000) >> 20)
| ((self.0 & 0x0000_0f00) >> 7)
| ((self.0 & 0x0000_0080) << 4)
((self.0 << 4) & 0x0000_0800)
| ((self.0 >> 20) & 0x0000_07e0)
| ((self.0 >> 7) & 0x0000_001e)
| match self.0 & 0x8000_0000 {
0x8000_0000 => 0xffff_f000,
_ => 0,
}
}
pub fn rs1(&self) -> u32 {
(self.0 >> 15) & 0x1f
Expand All @@ -89,7 +101,14 @@ impl BType {
pub struct UType(pub u32);
impl UType {
pub fn imm(&self) -> u32 {
self.0 & 0xfffff000
(
(self.0 as u64) & 0xffff_f000
// For furthur 64-bit address
// | match self.0 & 0x8000_0000 {
// 0x8000_0000 => 0xffff_ffff_0000_0000,
// _ => 0,
// }
) as u32
}
pub fn rd(&self) -> u32 {
(self.0 >> 7) & 0x1f
Expand All @@ -100,10 +119,13 @@ impl UType {
pub struct JType(pub u32);
impl JType {
pub fn imm(&self) -> u32 {
((self.0 & 0x8000_0000) >> 11)
| ((self.0 & 0x7fe0_0000) >> 20)
((self.0 & 0x7fe0_0000) >> 20)
| ((self.0 & 0x0010_0000) >> 9)
| (self.0 & 0x000f_f000)
| match self.0 & 0x8000_0000 {
0x8000_0000 => 0xfff0_0000,
_ => 0,
}
}
pub fn rd(&self) -> u32 {
(self.0 >> 7) & 0x1f
Expand Down Expand Up @@ -272,17 +294,17 @@ mod tests {
assert_eq!(IType(0x0006c703).imm(), 0); // Lbu x14,0(x13)
assert_eq!(IType(0x0007c683).imm(), 0); // Lbu x13,0(x15)
assert_eq!(IType(0x0060df03).imm(), 6); // Lhu x30,6(x1)
assert_eq!(IType(0xffe0df03).imm(), (-2i32) as u32 & 0xfff); // Lhu x30,-2(x1)
assert_eq!(IType(0xffe0df03).imm(), (-2i32) as u32); // Lhu x30,-2(x1)
assert_eq!(IType(0x0002d303).imm(), 0); // Lhu x6,0(x5)
assert_eq!(IType(0x00346303).imm(), 3); // Lwu x6,3(x8)
assert_eq!(IType(0x0080ef03).imm(), 8); // Lwu x30,8(x1)
assert_eq!(IType(0x0000ef03).imm(), 0); // Lwu x30,0(x1)
assert_eq!(IType(0x01853683).imm(), 24); // Ld x13,24(x10)
assert_eq!(IType(0x02013c03).imm(), 32); // Ld x24,32(x2)
assert_eq!(IType(0x0007b703).imm(), 0); // Ld x14,0(x15)
assert_eq!(IType(0xbff00513).imm(), -1025i32 as u32); // li a0,-1025
}


#[test]
#[allow(overflowing_literals)]
fn btype() {
Expand All @@ -291,7 +313,10 @@ mod tests {
assert_eq!(BType(0x06f58063).imm(), 0x80002648 - 0x800025e8); // beq x11,x15,80002648
assert_eq!(BType(0x00050a63).imm(), 0x800024e8 - 0x800024d4); // beq x10,x0,800024e8
assert_eq!(BType(0x03ff0663).imm(), 0x80000040 - 0x80000014); // beq x30,x31,80000040
assert_eq!(BType(0xfe069ae3).imm(), (0x800026f0i32 - 0x800026fci32) as u32 & 0x1fff); // bne x13,x0,800026f0
assert_eq!(
BType(0xfe069ae3).imm(),
(0x800026f0i32 - 0x800026fci32) as u32
); // bne x13,x0,800026f0
assert_eq!(BType(0x00f5f463).imm(), 0x80002290 - 0x80002288); // bgeu x11,x15,80002290
assert_eq!(BType(0x1e301c63).imm(), 0x800003c4 - 0x800001cc); // bne x0,x3,800003c4
assert_eq!(BType(0x13df1063).imm(), 0x800030dc - 0x80002fbc); // bne x30,x29,800030dc
Expand All @@ -318,14 +343,26 @@ mod tests {
#[test]
#[allow(overflowing_literals)]
fn jtype() {
assert_eq!(JType(0xfe1ff06f).imm(), (0x800029eci32 - 0x80002a0ci32) as u32 & 0x1fffff); // jal x0,800029ec
assert_eq!(
JType(0xfe1ff06f).imm(),
(0x800029eci32 - 0x80002a0ci32) as u32
); // jal x0,800029ec
assert_eq!(JType(0x0000006f).imm(), 0x80002258 - 0x80002258); // jal x0,80002258
assert_eq!(JType(0xf89ff06f).imm(), (0x800027aci32 - 0x80002824i32) as u32 & 0x1fffff); // jal x0,800027ac
assert_eq!(
JType(0xf89ff06f).imm(),
(0x800027aci32 - 0x80002824i32) as u32
); // jal x0,800027ac
assert_eq!(JType(0x0240006f).imm(), 0x8000215c - 0x80002138); // jal x0,8000215c
assert_eq!(JType(0xd89ff0ef).imm(), (0x80002230i32 - 0x800024a8i32) as u32 & 0x1fffff); // jal x1,80002230
assert_eq!(
JType(0xd89ff0ef).imm(),
(0x80002230i32 - 0x800024a8i32) as u32
); // jal x1,80002230
assert_eq!(JType(0x008007ef).imm(), 0x8000265c - 0x80002654); // jal x15,8000265c
assert_eq!(JType(0x0240006f).imm(), 0x80002154 - 0x80002130); // jal x0,80002154
assert_eq!(JType(0xf71ff06f).imm(), (0x80002750i32 - 0x800027e0i32) as u32 & 0x1fffff); // jal x0,80002750
assert_eq!(
JType(0xf71ff06f).imm(),
(0x80002750i32 - 0x800027e0i32) as u32
); // jal x0,80002750
assert_eq!(JType(0x00c0006f).imm(), 0x8000000c - 0x80000000); // jal x0,8000000c

assert_eq!(JType(0xfe1ff06f).rd(), 0); // jal x0,800029ec
Expand Down