RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-23 15:25:08 +00:00
Code Issues Activity Actions

LibJS/JIT: Resolve the GlobalVariableCache pointers at JIT time

Browse source
This commit is contained in:
Andreas Kling 2023-11-05 14:37:54 +01:00
parent f03d4a1ffe
commit a616a682fe
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibJS/Bytecode/CommonImplementations.cpp
View file

@ -89,12 +89,11 @@ ThrowCompletionOr<Value> get_by_value(VM& vm, Value base_value, Value property_k
return TRY(object->internal_get(property_key, base_value)); return TRY(object->internal_get(property_key, base_value));
} }
ThrowCompletionOr<Value> get_global(Bytecode::Interpreter& interpreter, DeprecatedFlyString const& identifier, u32 cache_index) ThrowCompletionOr<Value> get_global(Bytecode::Interpreter& interpreter, DeprecatedFlyString const& identifier, GlobalVariableCache& cache)
{ {
auto& vm = interpreter.vm(); auto& vm = interpreter.vm();
auto& realm = *vm.current_realm(); auto& realm = *vm.current_realm();
auto& cache = interpreter.current_executable().global_variable_caches[cache_index];
auto& binding_object = realm.global_environment().object_record().binding_object(); auto& binding_object = realm.global_environment().object_record().binding_object();
auto& declarative_record = realm.global_environment().declarative_record(); auto& declarative_record = realm.global_environment().declarative_record();

2
Userland/Libraries/LibJS/Bytecode/CommonImplementations.h
View file

@ -15,7 +15,7 @@ namespace JS::Bytecode {
ThrowCompletionOr<NonnullGCPtr<Object>> base_object_for_get(VM&, Value base_value); ThrowCompletionOr<NonnullGCPtr<Object>> base_object_for_get(VM&, Value base_value);
ThrowCompletionOr<Value> get_by_id(VM&, DeprecatedFlyString const& property, Value base_value, Value this_value, PropertyLookupCache&); ThrowCompletionOr<Value> get_by_id(VM&, DeprecatedFlyString const& property, Value base_value, Value this_value, PropertyLookupCache&);
ThrowCompletionOr<Value> get_by_value(VM&, Value base_value, Value property_key_value); ThrowCompletionOr<Value> get_by_value(VM&, Value base_value, Value property_key_value);
ThrowCompletionOr<Value> get_global(Bytecode::Interpreter&, DeprecatedFlyString const& identifier, u32 cache_index); ThrowCompletionOr<Value> get_global(Bytecode::Interpreter&, DeprecatedFlyString const& identifier, GlobalVariableCache&);
ThrowCompletionOr<void> put_by_property_key(VM&, Value base, Value this_value, Value value, PropertyKey name, Op::PropertyKind kind); ThrowCompletionOr<void> put_by_property_key(VM&, Value base, Value this_value, Value value, PropertyKey name, Op::PropertyKind kind);
ThrowCompletionOr<Value> perform_call(Interpreter&, Value this_value, Op::CallType, Value callee, MarkedVector<Value> argument_values); ThrowCompletionOr<Value> perform_call(Interpreter&, Value this_value, Op::CallType, Value callee, MarkedVector<Value> argument_values);
ThrowCompletionOr<void> throw_if_needed_for_call(Interpreter&, Value callee, Op::CallType, Optional<StringTableIndex> const& expression_string); ThrowCompletionOr<void> throw_if_needed_for_call(Interpreter&, Value callee, Op::CallType, Optional<StringTableIndex> const& expression_string);

5
Userland/Libraries/LibJS/Bytecode/Interpreter.cpp
View file

@ -697,7 +697,10 @@ ThrowCompletionOr<void> GetCalleeAndThisFromEnvironment::execute_impl(Bytecode::
ThrowCompletionOr<void> GetGlobal::execute_impl(Bytecode::Interpreter& interpreter) const ThrowCompletionOr<void> GetGlobal::execute_impl(Bytecode::Interpreter& interpreter) const
{ {
interpreter.accumulator() = TRY(get_global(interpreter, interpreter.current_executable().get_identifier(m_identifier), m_cache_index)); interpreter.accumulator() = TRY(get_global(
interpreter,
interpreter.current_executable().get_identifier(m_identifier),
interpreter.current_executable().global_variable_caches[m_cache_index]));
return {}; return {};
} }

6
Userland/Libraries/LibJS/JIT/Compiler.cpp
View file

@ -952,9 +952,9 @@ void Compiler::compile_get_by_value(Bytecode::Op::GetByValue const& op)
check_exception(); check_exception();
} }
static Value cxx_get_global(VM& vm, DeprecatedFlyString const& identifier, u32 cache_index) static Value cxx_get_global(VM& vm, DeprecatedFlyString const& identifier, Bytecode::GlobalVariableCache& cache)
{ {
return TRY_OR_SET_EXCEPTION(Bytecode::get_global(vm.bytecode_interpreter(), identifier, cache_index)); return TRY_OR_SET_EXCEPTION(Bytecode::get_global(vm.bytecode_interpreter(), identifier, cache));
} }
void Compiler::compile_get_global(Bytecode::Op::GetGlobal const& op) void Compiler::compile_get_global(Bytecode::Op::GetGlobal const& op)
@ -964,7 +964,7 @@ void Compiler::compile_get_global(Bytecode::Op::GetGlobal const& op)
Assembler::Operand::Imm(bit_cast<u64>(&m_bytecode_executable.get_identifier(op.identifier())))); Assembler::Operand::Imm(bit_cast<u64>(&m_bytecode_executable.get_identifier(op.identifier()))));
m_assembler.mov( m_assembler.mov(
Assembler::Operand::Register(ARG2), Assembler::Operand::Register(ARG2),
Assembler::Operand::Imm(op.cache_index())); Assembler::Operand::Imm(bit_cast<u64>(&m_bytecode_executable.global_variable_caches[op.cache_index()])));
native_call((void*)cxx_get_global); native_call((void*)cxx_get_global);
store_accumulator(RET); store_accumulator(RET);
check_exception(); check_exception();