From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/llint/LLIntEntrypoints.cpp | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'Source/JavaScriptCore/llint/LLIntEntrypoints.cpp') diff --git a/Source/JavaScriptCore/llint/LLIntEntrypoints.cpp b/Source/JavaScriptCore/llint/LLIntEntrypoints.cpp index be79134b7..c044568b5 100644 --- a/Source/JavaScriptCore/llint/LLIntEntrypoints.cpp +++ b/Source/JavaScriptCore/llint/LLIntEntrypoints.cpp @@ -29,7 +29,7 @@ #if ENABLE(LLINT) #include "JITCode.h" -#include "JSGlobalData.h" +#include "VM.h" #include "JSObject.h" #include "LLIntThunks.h" #include "LowLevelInterpreter.h" @@ -37,9 +37,9 @@ namespace JSC { namespace LLInt { -void getFunctionEntrypoint(JSGlobalData& globalData, CodeSpecializationKind kind, JITCode& jitCode, MacroAssemblerCodePtr& arityCheck) +void getFunctionEntrypoint(VM& vm, CodeSpecializationKind kind, JITCode& jitCode, MacroAssemblerCodePtr& arityCheck) { - if (!globalData.canUseJIT()) { + if (!vm.canUseJIT()) { if (kind == CodeForCall) { jitCode = JITCode(MacroAssemblerCodeRef::createLLIntCodeRef(llint_function_for_call_prologue), JITCode::InterpreterThunk); arityCheck = MacroAssemblerCodePtr::createLLIntCodePtr(llint_function_for_call_arity_check); @@ -54,36 +54,36 @@ void getFunctionEntrypoint(JSGlobalData& globalData, CodeSpecializationKind kind #if ENABLE(JIT) if (kind == CodeForCall) { - jitCode = JITCode(globalData.getCTIStub(functionForCallEntryThunkGenerator), JITCode::InterpreterThunk); - arityCheck = globalData.getCTIStub(functionForCallArityCheckThunkGenerator).code(); + jitCode = JITCode(vm.getCTIStub(functionForCallEntryThunkGenerator), JITCode::InterpreterThunk); + arityCheck = vm.getCTIStub(functionForCallArityCheckThunkGenerator).code(); return; } ASSERT(kind == CodeForConstruct); - jitCode = JITCode(globalData.getCTIStub(functionForConstructEntryThunkGenerator), JITCode::InterpreterThunk); - arityCheck = globalData.getCTIStub(functionForConstructArityCheckThunkGenerator).code(); + jitCode = JITCode(vm.getCTIStub(functionForConstructEntryThunkGenerator), JITCode::InterpreterThunk); + arityCheck = vm.getCTIStub(functionForConstructArityCheckThunkGenerator).code(); #endif // ENABLE(JIT) } -void getEvalEntrypoint(JSGlobalData& globalData, JITCode& jitCode) +void getEvalEntrypoint(VM& vm, JITCode& jitCode) { - if (!globalData.canUseJIT()) { + if (!vm.canUseJIT()) { jitCode = JITCode(MacroAssemblerCodeRef::createLLIntCodeRef(llint_eval_prologue), JITCode::InterpreterThunk); return; } #if ENABLE(JIT) - jitCode = JITCode(globalData.getCTIStub(evalEntryThunkGenerator), JITCode::InterpreterThunk); + jitCode = JITCode(vm.getCTIStub(evalEntryThunkGenerator), JITCode::InterpreterThunk); #endif } -void getProgramEntrypoint(JSGlobalData& globalData, JITCode& jitCode) +void getProgramEntrypoint(VM& vm, JITCode& jitCode) { - if (!globalData.canUseJIT()) { + if (!vm.canUseJIT()) { jitCode = JITCode(MacroAssemblerCodeRef::createLLIntCodeRef(llint_program_prologue), JITCode::InterpreterThunk); return; } #if ENABLE(JIT) - jitCode = JITCode(globalData.getCTIStub(programEntryThunkGenerator), JITCode::InterpreterThunk); + jitCode = JITCode(vm.getCTIStub(programEntryThunkGenerator), JITCode::InterpreterThunk); #endif } -- cgit v1.2.1