浏览代码

LibJS/JIT: Resolve the GlobalVariableCache pointers at JIT time

Andreas Kling 1 年之前
父节点
当前提交
a616a682fe

+ 1 - 2
Userland/Libraries/LibJS/Bytecode/CommonImplementations.cpp

@@ -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));
 }
 
-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& 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& declarative_record = realm.global_environment().declarative_record();
 

+ 1 - 1
Userland/Libraries/LibJS/Bytecode/CommonImplementations.h

@@ -15,7 +15,7 @@ namespace JS::Bytecode {
 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_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<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);

+ 4 - 1
Userland/Libraries/LibJS/Bytecode/Interpreter.cpp

@@ -697,7 +697,10 @@ ThrowCompletionOr<void> GetCalleeAndThisFromEnvironment::execute_impl(Bytecode::
 
 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 {};
 }
 

+ 3 - 3
Userland/Libraries/LibJS/JIT/Compiler.cpp

@@ -952,9 +952,9 @@ void Compiler::compile_get_by_value(Bytecode::Op::GetByValue const& op)
     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)
@@ -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()))));
     m_assembler.mov(
         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);
     store_accumulator(RET);
     check_exception();