ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-24 10:41:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 统一调用调度并安全化 IC 缓存

Browse Source
This commit is contained in:
彭俊皓
2026-06-10 16:17:35 +08:00
parent af7c591414
commit 4aaa62812a
27 changed files with 1284 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/dispatch/call.rs
+19 -5
View File
@@ -1,5 +1,5 @@
use crate::native::NativeFn;
use crate::vm::Vm;
use crate::native::{NativeFn, NativeResult};
use crate::vm::{native_fn_ptr_to_fn, FrameContinuation, Vm};
use oxide_types::object::JsObject;
use oxide_types::value::JsValue;
@@ -25,16 +25,18 @@ impl Vm {
let (args_buf, len) = Self::build_native_args(first_arg_reg, arg_count, this_reg);
let args_slice = &args_buf[..len];
let func: NativeFn = unsafe { std::mem::transmute(obj.native_fn().unwrap()) };
// SAFETY: native_fn was set via set_native_fn with a valid NativeFn pointer;
// native_fn_ptr_to_fn is the single coercion point for NativeFnPtr → NativeFn.
let func: NativeFn = unsafe { native_fn_ptr_to_fn(obj.native_fn().unwrap()) };
self.regs[254] = callee;
self.native_call_depth += 1;
match func(self, args_slice) {
Ok(val) => {
NativeResult::Ok(val) => {
self.native_call_depth -= 1;
self.regs[0] = val;
Ok(())
}
Err(err_val) => {
NativeResult::Err(err_val) => {
self.native_call_depth -= 1;
let (error, kind) = if err_val.is_object() {
(err_val, self.thrown_error_kind(err_val))
@@ -53,6 +55,18 @@ impl Vm {
self.pending_error_kind = Some(kind);
self.unwind()
}
NativeResult::TailCall { callee, this, args } => {
self.native_call_depth -= 1;
if callee.is_object() {
let obj = unsafe { &*callee.as_js_object_ptr() };
if obj.native_fn().is_some() {
let result = self.call_function_sync(callee, this, &args)?;
self.regs[0] = result;
return Ok(());
}
}
self.push_bytecode_frame(callee, this, &args, None, None, JsValue::undefined(), FrameContinuation::None)
}
}
}
}
crates/oxide_vm/src/dispatch/member.rs
+6 -12
View File
@@ -33,11 +33,9 @@ impl Vm {
}
fn member_target(&mut self, rd: usize, b: usize, error_msg: &str) -> Result<(*mut JsObject, u32), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error(error_msg)?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], error_msg)? else {
return Err(String::new());
}
};
let prop_name_si = self.property_key_si(self.regs[b]);
Ok((obj_ptr, prop_name_si))
}
@@ -71,11 +69,9 @@ impl Vm {
}
fn dispatch_dyn_member_inc(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error("DYN_MEMBER_INC on non-object")?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "DYN_MEMBER_INC on non-object")? else {
return Ok(());
}
};
let receiver = self.regs[rd];
let obj = unsafe { &mut *obj_ptr };
let prop_name_si = self.property_key_si(self.regs[a]);
@@ -88,11 +84,9 @@ impl Vm {
}
fn dispatch_dyn_member_dec(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error("DYN_MEMBER_DEC on non-object")?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "DYN_MEMBER_DEC on non-object")? else {
return Ok(());
}
};
let receiver = self.regs[rd];
let obj = unsafe { &mut *obj_ptr };
let prop_name_si = self.property_key_si(self.regs[a]);
crates/oxide_vm/src/dispatch/property.rs
+56 -63
View File
@@ -1,7 +1,6 @@
use oxide_compiler::opcode::OpCode;
use oxide_kernel::prop_forge::PropTemplate;
use oxide_types::object::JsObject;
use oxide_types::value::JsValue;
use crate::vm::Vm;
@@ -48,27 +47,35 @@ impl Vm {
self.raise_type_error("IC_GET_PROP on non-object")?;
return Ok(());
}
let addr = obj_ptr as usize;
if addr < 0x10000 || addr % std::mem::align_of::<JsObject>() != 0 {
self.raise_type_error("IC_GET_PROP on non-object")?;
return Ok(());
}
let obj = unsafe { &*obj_ptr };
let prop_name_si = self.property_key_si(self.regs[b]);
let ext0 = self.bytecode[self.pc];
let ext1 = self.bytecode[self.pc + 1];
let ext2 = self.bytecode[self.pc + 2];
let _ext2 = self.bytecode[self.pc + 2];
self.pc += 3;
if obj.has_prop_meta() {
self.regs[a] = self.ordinary_get(obj, prop_name_si, val)?;
let val = self.ordinary_get_with_target(obj, prop_name_si, val, a as u8)?;
if self.accessor_frame_target_reg.take().is_none() {
self.regs[a] = val;
}
return Ok(());
}
let cached_shape_id = ext0 & 0x00FF_FFFF;
let cached_ptr = ((ext2 as u64) << 32) | (ext1 as u64);
let cached_slot = ext1;
if cached_shape_id != 0 && cached_shape_id == obj.shape_id() && cached_ptr != 0 {
self.regs[a] = unsafe { *(cached_ptr as *const JsValue) };
if cached_shape_id != 0 && cached_shape_id == obj.shape_id() && cached_slot < obj.prop_vec_len() as u32 {
self.regs[a] = obj.get_prop_at(cached_slot);
} else if let Some(template) = self.kernel.prop_forge().get_template(obj.shape_id()) {
if template.prop_name == prop_name_si {
if let Some(ptr) = self.template_prop_ptr(obj, &template) {
self.write_ic_back(obj.shape_id(), ptr);
self.regs[a] = unsafe { *ptr };
if template.position < obj.prop_vec_len() as u32 {
self.write_ic_back(obj.shape_id(), template.position);
self.regs[a] = obj.get_prop_at(template.position);
} else {
self.regs[a] = self.ordinary_get(obj, prop_name_si, val)?;
}
@@ -78,9 +85,7 @@ impl Vm {
} else {
let resolved = self.ordinary_get(obj, prop_name_si, val)?;
if let Some(pos) = self.kernel.shape_forge().lookup_position(obj.shape_id(), prop_name_si) {
if let Some(ptr) = obj.prop_ptr_at(pos) {
self.write_ic_back(obj.shape_id(), ptr);
}
self.write_ic_back(obj.shape_id(), pos);
}
self.regs[a] = resolved;
}
@@ -89,11 +94,9 @@ impl Vm {
}
fn dispatch_ic_set_prop(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error("IC_SET_PROP on non-object")?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "IC_SET_PROP on non-object")? else {
return Ok(());
}
};
let prop_name_si = self.property_key_si(self.regs[b]);
if self.kernel.string_forge().lookup(prop_name_si).as_deref() == Some("__proto__") {
@@ -111,43 +114,37 @@ impl Vm {
let obj = unsafe { &mut *obj_ptr };
let ext0 = self.bytecode[self.pc];
let ext1 = self.bytecode[self.pc + 1];
let ext2 = self.bytecode[self.pc + 2];
let _ext2 = self.bytecode[self.pc + 2];
self.pc += 3;
let value = self.regs[a];
let receiver = self.regs[rd];
if obj.has_prop_meta() {
self.ordinary_set(obj, prop_name_si, value, receiver)?;
self.ordinary_set_dispatch(obj, prop_name_si, value, receiver)?;
return Ok(());
}
let cached_shape_id = ext0 & 0x00FF_FFFF;
let cached_ptr = ((ext2 as u64) << 32) | (ext1 as u64);
let cached_slot = ext1;
if cached_shape_id != 0 && cached_shape_id == obj.shape_id() && cached_ptr != 0 {
unsafe {
*(cached_ptr as *mut JsValue) = value;
}
if cached_shape_id != 0 && cached_shape_id == obj.shape_id() && cached_slot < obj.prop_vec_len() as u32 {
obj.set_prop_at(cached_slot, value);
} else if let Some(pos) = self.kernel.shape_forge().lookup_position(obj.shape_id(), prop_name_si) {
obj.set_prop_at(pos, value);
if let Some(ptr) = obj.prop_ptr_at(pos) {
self.write_ic_back(obj.shape_id(), ptr);
}
self.write_ic_back(obj.shape_id(), pos);
} else {
let old_shape = obj.shape_id();
self.ordinary_set(obj, prop_name_si, value, receiver)?;
self.ordinary_set_dispatch(obj, prop_name_si, value, receiver)?;
if old_shape != obj.shape_id() {
if let Some(pos) = self.kernel.shape_forge().lookup_position(obj.shape_id(), prop_name_si) {
if let Some(ptr) = obj.prop_ptr_at(pos) {
self.write_ic_back(obj.shape_id(), ptr);
self.kernel.prop_forge().upsert(
obj.shape_id(),
PropTemplate {
shape_id: obj.shape_id(),
prop_name: prop_name_si,
position: pos,
generation: obj.generation(),
},
);
}
self.write_ic_back(obj.shape_id(), pos);
self.kernel.prop_forge().upsert(
obj.shape_id(),
PropTemplate {
shape_id: obj.shape_id(),
prop_name: prop_name_si,
position: pos,
generation: obj.generation(),
},
);
}
}
}
@@ -156,23 +153,22 @@ impl Vm {
}
fn dispatch_get_prop(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error("GET_PROP on non-object")?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "GET_PROP on non-object")? else {
return Ok(());
}
};
let obj = unsafe { &*obj_ptr };
let prop_name_si = self.property_key_si(self.regs[b]);
self.regs[a] = self.ordinary_get(obj, prop_name_si, self.regs[rd])?;
let val = self.ordinary_get_with_target(obj, prop_name_si, self.regs[rd], a as u8)?;
if self.accessor_frame_target_reg.take().is_none() {
self.regs[a] = val;
}
Ok(())
}
fn dispatch_set_prop(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error("SET_PROP on non-object")?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "SET_PROP on non-object")? else {
return Ok(());
}
};
let obj = unsafe { &mut *obj_ptr };
let prop_name_si = self.property_key_si(self.regs[b]);
if self.kernel.string_forge().lookup(prop_name_si).as_deref() == Some("__proto__") {
@@ -183,28 +179,27 @@ impl Vm {
obj.set_proto(self.regs[a]).map_err(|e| e.to_string())?;
return Ok(());
}
self.ordinary_set(obj, prop_name_si, self.regs[a], self.regs[rd])?;
self.ordinary_set_dispatch(obj, prop_name_si, self.regs[a], self.regs[rd])?;
Ok(())
}
fn dispatch_get_prop_dynamic(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error("GET_PROP_DYNAMIC on non-object")?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "GET_PROP_DYNAMIC on non-object")? else {
return Ok(());
}
};
let obj = unsafe { &*obj_ptr };
let prop_name_si = self.property_key_si(self.regs[a]);
self.regs[b] = self.ordinary_get(obj, prop_name_si, self.regs[rd])?;
let val = self.ordinary_get_with_target(obj, prop_name_si, self.regs[rd], b as u8)?;
if self.accessor_frame_target_reg.take().is_none() {
self.regs[b] = val;
}
Ok(())
}
fn dispatch_set_prop_dynamic(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error("SET_PROP_DYNAMIC on non-object")?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "SET_PROP_DYNAMIC on non-object")? else {
return Ok(());
}
};
let obj = unsafe { &mut *obj_ptr };
let prop_name_si = self.property_key_si(self.regs[a]);
if self.kernel.string_forge().lookup(prop_name_si).as_deref() == Some("__proto__") {
@@ -215,16 +210,14 @@ impl Vm {
obj.set_proto(self.regs[b]).map_err(|e| e.to_string())?;
return Ok(());
}
self.ordinary_set(obj, prop_name_si, self.regs[b], self.regs[rd])?;
self.ordinary_set_dispatch(obj, prop_name_si, self.regs[b], self.regs[rd])?;
Ok(())
}
fn dispatch_set_elem(&mut self, rd: usize, a: usize, b: usize) -> Result<(), String> {
let obj_ptr = self.regs[rd].as_object_ptr() as *mut JsObject;
if obj_ptr.is_null() {
self.raise_type_error("SET_ELEM on non-object")?;
let Some(obj_ptr) = self.checked_object_ptr(self.regs[rd], "SET_ELEM on non-object")? else {
return Ok(());
}
};
let idx = self.regs[a].as_int().max(0) as u32;
let obj = unsafe { &mut *obj_ptr };
obj.set_prop_at(idx, self.regs[b]);