fix: 修复同步调用参数限制与内建语义错误
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
use crate::coercion;
|
||||
use crate::vm::Vm;
|
||||
use oxide_types::value::JsValue;
|
||||
|
||||
@@ -13,92 +12,98 @@ impl Vm {
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_bit_and(&mut self, rd: usize, a: usize, b: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
self.regs[rd] = JsValue::int(coercion::to_int32(self.regs[a], sf) & coercion::to_int32(self.regs[b], sf));
|
||||
pub(crate) fn dispatch_bit_and(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
|
||||
self.regs[rd] =
|
||||
JsValue::int(self.coerce_int32_bounded(self.regs[a])? & self.coerce_int32_bounded(self.regs[b])?);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_bit_or(&mut self, rd: usize, a: usize, b: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
self.regs[rd] = JsValue::int(coercion::to_int32(self.regs[a], sf) | coercion::to_int32(self.regs[b], sf));
|
||||
pub(crate) fn dispatch_bit_or(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
|
||||
self.regs[rd] =
|
||||
JsValue::int(self.coerce_int32_bounded(self.regs[a])? | self.coerce_int32_bounded(self.regs[b])?);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_bit_xor(&mut self, rd: usize, a: usize, b: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
self.regs[rd] = JsValue::int(coercion::to_int32(self.regs[a], sf) ^ coercion::to_int32(self.regs[b], sf));
|
||||
pub(crate) fn dispatch_bit_xor(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
|
||||
self.regs[rd] =
|
||||
JsValue::int(self.coerce_int32_bounded(self.regs[a])? ^ self.coerce_int32_bounded(self.regs[b])?);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_shl(&mut self, rd: usize, a: usize, b: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
let lhs = coercion::to_int32(self.regs[a], sf);
|
||||
let shift = coercion::to_uint32(self.regs[b], sf) & 0x1F;
|
||||
pub(crate) fn dispatch_shl(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
|
||||
let lhs = self.coerce_int32_bounded(self.regs[a])?;
|
||||
let shift = self.coerce_uint32_bounded(self.regs[b])? & 0x1F;
|
||||
self.regs[rd] = JsValue::int(lhs.wrapping_shl(shift));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_shr(&mut self, rd: usize, a: usize, b: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
let lhs = coercion::to_int32(self.regs[a], sf);
|
||||
let shift = coercion::to_uint32(self.regs[b], sf) & 0x1F;
|
||||
pub(crate) fn dispatch_shr(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
|
||||
let lhs = self.coerce_int32_bounded(self.regs[a])?;
|
||||
let shift = self.coerce_uint32_bounded(self.regs[b])? & 0x1F;
|
||||
self.regs[rd] = JsValue::int(lhs >> shift);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_ushr(&mut self, rd: usize, a: usize, b: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
let lhs = coercion::to_uint32(self.regs[a], sf);
|
||||
let shift = coercion::to_uint32(self.regs[b], sf) & 0x1F;
|
||||
pub(crate) fn dispatch_ushr(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
|
||||
let lhs = self.coerce_uint32_bounded(self.regs[a])?;
|
||||
let shift = self.coerce_uint32_bounded(self.regs[b])? & 0x1F;
|
||||
self.write_ushr_result(rd, lhs >> shift);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_bit_not(&mut self, rd: usize, a: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
self.regs[rd] = JsValue::int(!coercion::to_int32(self.regs[a], sf));
|
||||
pub(crate) fn dispatch_bit_not(&mut self, rd: usize, a: usize) -> Result<(), String> {
|
||||
self.regs[rd] = JsValue::int(!self.coerce_int32_bounded(self.regs[a])?);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_compound_bit_and(&mut self, rd: usize, a: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
self.regs[rd] = JsValue::int(coercion::to_int32(self.regs[rd], sf) & coercion::to_int32(self.regs[a], sf));
|
||||
pub(crate) fn dispatch_compound_bit_and(&mut self, rd: usize, a: usize) -> Result<(), String> {
|
||||
self.regs[rd] =
|
||||
JsValue::int(self.coerce_int32_bounded(self.regs[rd])? & self.coerce_int32_bounded(self.regs[a])?);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_compound_bit_or(&mut self, rd: usize, a: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
self.regs[rd] = JsValue::int(coercion::to_int32(self.regs[rd], sf) | coercion::to_int32(self.regs[a], sf));
|
||||
pub(crate) fn dispatch_compound_bit_or(&mut self, rd: usize, a: usize) -> Result<(), String> {
|
||||
self.regs[rd] =
|
||||
JsValue::int(self.coerce_int32_bounded(self.regs[rd])? | self.coerce_int32_bounded(self.regs[a])?);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_compound_bit_xor(&mut self, rd: usize, a: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
self.regs[rd] = JsValue::int(coercion::to_int32(self.regs[rd], sf) ^ coercion::to_int32(self.regs[a], sf));
|
||||
pub(crate) fn dispatch_compound_bit_xor(&mut self, rd: usize, a: usize) -> Result<(), String> {
|
||||
self.regs[rd] =
|
||||
JsValue::int(self.coerce_int32_bounded(self.regs[rd])? ^ self.coerce_int32_bounded(self.regs[a])?);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_compound_shl(&mut self, rd: usize, a: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
let lhs = coercion::to_int32(self.regs[rd], sf);
|
||||
let shift = coercion::to_uint32(self.regs[a], sf) & 0x1F;
|
||||
pub(crate) fn dispatch_compound_shl(&mut self, rd: usize, a: usize) -> Result<(), String> {
|
||||
let lhs = self.coerce_int32_bounded(self.regs[rd])?;
|
||||
let shift = self.coerce_uint32_bounded(self.regs[a])? & 0x1F;
|
||||
self.regs[rd] = JsValue::int(lhs.wrapping_shl(shift));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_compound_shr(&mut self, rd: usize, a: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
let lhs = coercion::to_int32(self.regs[rd], sf);
|
||||
let shift = coercion::to_uint32(self.regs[a], sf) & 0x1F;
|
||||
pub(crate) fn dispatch_compound_shr(&mut self, rd: usize, a: usize) -> Result<(), String> {
|
||||
let lhs = self.coerce_int32_bounded(self.regs[rd])?;
|
||||
let shift = self.coerce_uint32_bounded(self.regs[a])? & 0x1F;
|
||||
self.regs[rd] = JsValue::int(lhs >> shift);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub(crate) fn dispatch_compound_ushr(&mut self, rd: usize, a: usize) {
|
||||
let sf = self.kernel_core.string_forge().as_ref();
|
||||
let lhs = coercion::to_uint32(self.regs[rd], sf);
|
||||
let shift = coercion::to_uint32(self.regs[a], sf) & 0x1F;
|
||||
pub(crate) fn dispatch_compound_ushr(&mut self, rd: usize, a: usize) -> Result<(), String> {
|
||||
let lhs = self.coerce_uint32_bounded(self.regs[rd])?;
|
||||
let shift = self.coerce_uint32_bounded(self.regs[a])? & 0x1F;
|
||||
self.write_ushr_result(rd, lhs >> shift);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user