koniifer/ableos
1
1
Fork 1
forked from AbleOS/ableos
Code Pull requests Activity

fixed imm shl/r

Browse source
This commit is contained in:
Erin 2023-07-24 16:48:13 +02:00
parent 4ca4e81ac3
commit fce3fa5210
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
hbvm/src/vm/mod.rs
View file

@ -48,19 +48,16 @@ macro_rules! binary_op {
), ),
); );
}}; }};
}
/// Parform bitshift operations ($self:expr, $ty:ident, $handler:expr, $con:ty) => {{
macro_rules! binary_op_sh {
($self:expr, $ty:ident, $handler:expr) => {{
let ParamBBB(tg, a0, a1) = param!($self, ParamBBB); let ParamBBB(tg, a0, a1) = param!($self, ParamBBB);
$self.write_reg( $self.write_reg(
tg, tg,
$handler( $handler(
Value::$ty(&$self.read_reg(a0)), Value::$ty(&$self.read_reg(a0)),
$self.read_reg(a1).as_u64() as u32, Value::$ty(&$self.read_reg(a1)) as $con,
) ),
) );
}}; }};
} }
@ -73,6 +70,14 @@ macro_rules! binary_op_imm {
$handler(Value::$ty(&$self.read_reg(a0)), Value::$ty(&imm.into())), $handler(Value::$ty(&$self.read_reg(a0)), Value::$ty(&imm.into())),
); );
}}; }};
($self:expr, $ty:ident, $handler:expr, $con:ty) => {{
let ParamBBD(tg, a0, imm) = param!($self, ParamBBD);
$self.write_reg(
tg,
$handler(Value::$ty(&$self.read_reg(a0)), Value::$ty(&imm.into()) as $con),
);
}};
} }
/// Jump at `#3` if ordering on `#0 <=> #1` is equal to expected /// Jump at `#3` if ordering on `#0 <=> #1` is equal to expected
@ -182,9 +187,9 @@ impl<'a, PfHandler: HandlePageFault, const TIMER_QUOTIENT: usize>
AND => binary_op!(self, as_u64, ops::BitAnd::bitand), AND => binary_op!(self, as_u64, ops::BitAnd::bitand),
OR => binary_op!(self, as_u64, ops::BitOr::bitor), OR => binary_op!(self, as_u64, ops::BitOr::bitor),
XOR => binary_op!(self, as_u64, ops::BitXor::bitxor), XOR => binary_op!(self, as_u64, ops::BitXor::bitxor),
SL => binary_op_sh!(self, as_u64, u64::wrapping_shl), SL => binary_op!(self, as_u64, u64::wrapping_shl, u32),
SR => binary_op_sh!(self, as_u64, u64::wrapping_shr), SR => binary_op!(self, as_u64, u64::wrapping_shr, u32),
SRS => binary_op_sh!(self, as_i64, i64::wrapping_shr), SRS => binary_op!(self, as_i64, i64::wrapping_shr, u32),
CMP => { CMP => {
// Compare a0 <=> a1 // Compare a0 <=> a1
// < → -1 // < → -1
@ -234,9 +239,9 @@ impl<'a, PfHandler: HandlePageFault, const TIMER_QUOTIENT: usize>
ANDI => binary_op_imm!(self, as_u64, ops::BitAnd::bitand), ANDI => binary_op_imm!(self, as_u64, ops::BitAnd::bitand),
ORI => binary_op_imm!(self, as_u64, ops::BitOr::bitor), ORI => binary_op_imm!(self, as_u64, ops::BitOr::bitor),
XORI => binary_op_imm!(self, as_u64, ops::BitXor::bitxor), XORI => binary_op_imm!(self, as_u64, ops::BitXor::bitxor),
SLI => binary_op_imm!(self, as_u64, ops::Shl::shl), SLI => binary_op_imm!(self, as_u64, u64::wrapping_shl, u32),
SRI => binary_op_imm!(self, as_u64, ops::Shr::shr), SRI => binary_op_imm!(self, as_u64, u64::wrapping_shr, u32),
SRSI => binary_op_imm!(self, as_i64, ops::Shr::shr), SRSI => binary_op_imm!(self, as_i64, i64::wrapping_shr, u32),
CMPI => { CMPI => {
let ParamBBD(tg, a0, imm) = param!(self, ParamBBD); let ParamBBD(tg, a0, imm) = param!(self, ParamBBD);
self.write_reg( self.write_reg(