Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (229477 => 229478)
--- trunk/Source/_javascript_Core/ChangeLog 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-03-09 21:04:03 UTC (rev 229478)
@@ -1,3 +1,41 @@
+2018-03-09 Mark Lam <[email protected]>
+
+ Remove unused LLINT_STATS feature.
+ https://bugs.webkit.org/show_bug.cgi?id=183522
+ <rdar://problem/38313139>
+
+ Rubber-stamped by Keith Miller.
+
+ We haven't used this in a while, and it is one more option that makes offlineasm
+ build slower. We can always re-introduce this later if we need it.
+
+ * jsc.cpp:
+ * llint/LLIntCommon.h:
+ * llint/LLIntData.cpp:
+ (JSC::LLInt::initialize):
+ (JSC::LLInt::Data::finalizeStats): Deleted.
+ (JSC::LLInt::compareStats): Deleted.
+ (JSC::LLInt::Data::dumpStats): Deleted.
+ (JSC::LLInt::Data::ensureStats): Deleted.
+ (JSC::LLInt::Data::loadStats): Deleted.
+ (JSC::LLInt::Data::resetStats): Deleted.
+ (JSC::LLInt::Data::saveStats): Deleted.
+ * llint/LLIntData.h:
+ (): Deleted.
+ (JSC::LLInt::Data::opcodeStats): Deleted.
+ * llint/LLIntOfflineAsmConfig.h:
+ * llint/LLIntSlowPaths.cpp:
+ * llint/LLIntSlowPaths.h:
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/Options.cpp:
+ (JSC::Options::isAvailable):
+ (JSC::recomputeDependentOptions):
+ * runtime/Options.h:
+ * runtime/TestRunnerUtils.cpp:
+ (JSC::finalizeStatsAtEndOfTesting):
+
2018-03-09 Michael Saboff <[email protected]>
Relanding "testmasm crashes in testBranchTruncateDoubleToInt32() on ARM64"
Modified: trunk/Source/_javascript_Core/jsc.cpp (229477 => 229478)
--- trunk/Source/_javascript_Core/jsc.cpp 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/jsc.cpp 2018-03-09 21:04:03 UTC (rev 229478)
@@ -54,7 +54,6 @@
#include "JSTypedArrays.h"
#include "JSWebAssemblyInstance.h"
#include "JSWebAssemblyMemory.h"
-#include "LLIntData.h"
#include "LLIntThunks.h"
#include "ObjectConstructor.h"
#include "ParserError.h"
Modified: trunk/Source/_javascript_Core/llint/LLIntCommon.h (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LLIntCommon.h 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LLIntCommon.h 2018-03-09 21:04:03 UTC (rev 229478)
@@ -25,9 +25,6 @@
#pragma once
-// Enables LLINT stats collection.
-#define ENABLE_LLINT_STATS 0
-
// Print every instruction executed.
#define LLINT_EXECUTION_TRACING 0
Modified: trunk/Source/_javascript_Core/llint/LLIntData.cpp (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LLIntData.cpp 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LLIntData.cpp 2018-03-09 21:04:03 UTC (rev 229478)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,18 +30,14 @@
#include "BytecodeConventions.h"
#include "CodeBlock.h"
#include "CodeType.h"
-#include "InitializeThreading.h"
#include "Instruction.h"
#include "JSScope.h"
#include "LLIntCLoop.h"
-#include "LLIntCommon.h"
#include "MaxFrameExtentForSlowPathCall.h"
#include "Opcode.h"
#include "PropertyOffset.h"
#include "ShadowChicken.h"
#include "WriteBarrier.h"
-#include <string>
-#include <wtf/NeverDestroyed.h>
#define STATIC_ASSERT(cond) static_assert(cond, "LLInt assumes " #cond)
@@ -49,7 +45,6 @@
Instruction Data::s_exceptionInstructions[maxOpcodeLength + 1] = { };
Opcode Data::s_opcodeMap[numOpcodeIDs] = { };
-OpcodeStatsArray* Data::s_opcodeStatsArray = nullptr;
#if ENABLE(JIT)
extern "C" void llint_entry(void*);
@@ -67,10 +62,6 @@
Data::s_exceptionInstructions[i].u.pointer =
LLInt::getCodePtr(llint_throw_from_slow_path_trampoline);
#endif // ENABLE(JIT)
-
-#if ENABLE(LLINT_STATS)
- Data::ensureStats();
-#endif
}
#if COMPILER(CLANG)
@@ -209,138 +200,4 @@
#pragma clang diagnostic pop
#endif
-void Data::finalizeStats()
-{
-#if ENABLE(LLINT_STATS)
- if (!Options::reportLLIntStats())
- return;
-
- if (Options::llintStatsFile())
- saveStats();
-
- dumpStats();
-#endif
-}
-
-#if ENABLE(LLINT_STATS)
-namespace LLIntDataInternal {
-static const bool verboseStats = false;
-}
-
-static bool compareStats(const OpcodeStats& a, const OpcodeStats& b)
-{
- if (a.count > b.count)
- return true;
- if (a.count < b.count)
- return false;
- return a.slowPathCount > b.slowPathCount;
-}
-
-void Data::dumpStats()
-{
- ASSERT(Options::reportLLIntStats());
- auto statsCopy = *s_opcodeStatsArray;
- std::sort(statsCopy.begin(), statsCopy.end(), compareStats);
-
- dataLog("Opcode stats:\n");
- unsigned i = 0;
- for (auto& stats : statsCopy) {
- if (stats.count || stats.slowPathCount)
- dataLog(" [", i++, "]: fast:", stats.count, " slow:", stats.slowPathCount, " ", opcodeNames[stats.id], "\n");
- }
-}
-
-void Data::ensureStats()
-{
- static std::once_flag initializeOptionsOnceFlag;
- std::call_once(initializeOptionsOnceFlag, [] {
- s_opcodeStatsArray = new OpcodeStatsArray();
- resetStats();
- });
-}
-
-void Data::loadStats()
-{
- static NeverDestroyed<std::string> installedStatsFile;
- if (!Options::llintStatsFile() || !installedStatsFile.get().compare(Options::llintStatsFile()))
- return;
-
- Options::reportLLIntStats() = true; // Force stats collection.
- installedStatsFile.get() = Options::llintStatsFile();
-
- ensureStats();
-
- const char* filename = Options::llintStatsFile();
- FILE* file = fopen(filename, "r");
- if (!file) {
- dataLogF("Failed to open file %s. Did you add the file-read-write-data entitlement to WebProcess.sb?\n", filename);
- return;
- }
-
- resetStats();
-
- OpcodeStats loaded;
- unsigned index;
- char opcodeName[100];
- while (fscanf(file, "[%u]: fast:%zu slow:%zu id:%u %s\n", &index, &loaded.count, &loaded.slowPathCount, &loaded.id, opcodeName) != EOF) {
- if (LLIntDataInternal::verboseStats)
- dataLogF("loaded [%u]: fast %zu slow %zu id:%u %s\n", index, loaded.count, loaded.slowPathCount, loaded.id, opcodeName);
-
- OpcodeStats& stats = opcodeStats(loaded.id);
- stats.count = loaded.count;
- stats.slowPathCount = loaded.slowPathCount;
- }
-
- if (LLIntDataInternal::verboseStats) {
- dataLogF("After loading from %s, ", filename);
- dumpStats();
- }
-
- int result = fclose(file);
- if (result)
- dataLogF("Failed to close file %s: %s\n", filename, strerror(errno));
-}
-
-void Data::resetStats()
-{
- unsigned i = 0;
- for (auto& stats : *s_opcodeStatsArray) {
- stats.id = static_cast<OpcodeID>(i++);
- stats.count = 0;
- stats.slowPathCount = 0;
- }
-}
-
-void Data::saveStats()
-{
- ASSERT(Options::reportLLIntStats() && Options::llintStatsFile());
- const char* filename = Options::llintStatsFile();
-
- FILE* file = fopen(filename, "w");
- if (!file) {
- dataLogF("Failed to open file %s. Did you add the file-read-write-data entitlement to WebProcess.sb?\n", filename);
- return;
- }
-
- auto statsCopy = *s_opcodeStatsArray;
- std::sort(statsCopy.begin(), statsCopy.end(), compareStats);
-
- int index = 0;
- for (auto& stats : statsCopy) {
- if (!stats.count && !stats.slowPathCount)
- break; // stats are sorted. If we encountered 0 counts, then there are no more non-zero counts.
-
- if (LLIntDataInternal::verboseStats)
- dataLogF("saved [%u]: fast:%zu slow:%zu id:%u %s\n", index, stats.count, stats.slowPathCount, stats.id, opcodeNames[stats.id]);
-
- fprintf(file, "[%u]: fast:%zu slow:%zu id:%u %s\n", index, stats.count, stats.slowPathCount, stats.id, opcodeNames[stats.id]);
- index++;
- }
-
- int result = fclose(file);
- if (result)
- dataLogF("Failed to close file %s: %s\n", filename, strerror(errno));
-}
-#endif
-
} } // namespace JSC::LLInt
Modified: trunk/Source/_javascript_Core/llint/LLIntData.h (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LLIntData.h 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LLIntData.h 2018-03-09 21:04:03 UTC (rev 229478)
@@ -27,7 +27,6 @@
#include "JSCJSValue.h"
#include "Opcode.h"
-#include <array>
#include <wtf/PointerPreparations.h>
namespace JSC {
@@ -43,32 +42,13 @@
namespace LLInt {
-struct OpcodeStats {
- OpcodeID id;
- size_t count { 0 };
- size_t slowPathCount { 0 };
-};
-typedef std::array<OpcodeStats, numOpcodeIDs> OpcodeStatsArray;
-
class Data {
public:
-
static void performAssertions(VM&);
- static OpcodeStats& opcodeStats(OpcodeID id) { return (*s_opcodeStatsArray)[id]; }
- JS_EXPORT_PRIVATE static void finalizeStats();
-
- static void dumpStats();
- static void loadStats();
-
private:
- static void ensureStats();
- static void resetStats();
- static void saveStats();
-
static Instruction s_exceptionInstructions[maxOpcodeLength + 1];
static Opcode s_opcodeMap[numOpcodeIDs];
- static OpcodeStatsArray* s_opcodeStatsArray;
friend void initialize();
Modified: trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h 2018-03-09 21:04:03 UTC (rev 229478)
@@ -161,12 +161,6 @@
#define OFFLINE_ASM_BIG_ENDIAN 0
#endif
-#if ENABLE(LLINT_STATS)
-#define OFFLINE_ASM_COLLECT_STATS 1
-#else
-#define OFFLINE_ASM_COLLECT_STATS 0
-#endif
-
#if LLINT_EXECUTION_TRACING
#define OFFLINE_ASM_EXECUTION_TRACING 1
#else
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2018-03-09 21:04:03 UTC (rev 229478)
@@ -1803,22 +1803,4 @@
CRASH();
}
-#if ENABLE(LLINT_STATS)
-
-LLINT_SLOW_PATH_DECL(count_opcode)
-{
- OpcodeID opcodeID = Interpreter::getOpcodeID(pc[0].u.opcode);
- Data::opcodeStats(opcodeID).count++;
- LLINT_END_IMPL();
-}
-
-LLINT_SLOW_PATH_DECL(count_opcode_slow_path)
-{
- OpcodeID opcodeID = Interpreter::getOpcodeID(pc[0].u.opcode);
- Data::opcodeStats(opcodeID).slowPathCount++;
- LLINT_END_IMPL();
-}
-
-#endif // ENABLE(LLINT_STATS)
-
} } // namespace JSC::LLInt
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.h 2018-03-09 21:04:03 UTC (rev 229478)
@@ -53,8 +53,6 @@
LLINT_SLOW_PATH_HIDDEN_DECL(trace_arityCheck_for_construct);
LLINT_SLOW_PATH_HIDDEN_DECL(trace);
LLINT_SLOW_PATH_HIDDEN_DECL(special_trace);
-LLINT_SLOW_PATH_HIDDEN_DECL(count_opcode);
-LLINT_SLOW_PATH_HIDDEN_DECL(count_opcode_slow_path);
LLINT_SLOW_PATH_HIDDEN_DECL(entry_osr);
LLINT_SLOW_PATH_HIDDEN_DECL(entry_osr_function_for_call);
LLINT_SLOW_PATH_HIDDEN_DECL(entry_osr_function_for_construct);
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2018-03-09 21:04:03 UTC (rev 229478)
@@ -829,25 +829,11 @@
end
macro traceExecution()
- if COLLECT_STATS
- callSlowPath(_llint_count_opcode)
- end
if EXECUTION_TRACING
callSlowPath(_llint_trace)
end
end
-macro traceSlowPathExecution()
- if COLLECT_STATS
- callSlowPath(_llint_count_opcode_slow_path)
- end
-end
-
-macro callOpcodeSlowPath(slowPath)
- traceSlowPathExecution()
- callSlowPath(slowPath)
-end
-
macro callTargetFunction(callee)
if C_LOOP
cloopCallJSFunction callee
@@ -912,7 +898,6 @@
end
macro slowPathForCall(slowPath, prepareCall)
- traceSlowPathExecution()
callCallSlowPath(
slowPath,
# Those are r0 and r1
@@ -955,7 +940,7 @@
checkSwitchToJIT(
10,
macro ()
- callOpcodeSlowPath(_llint_replace)
+ callSlowPath(_llint_replace)
end)
end
@@ -1333,43 +1318,43 @@
# Value-representation-agnostic code.
_llint_op_create_direct_arguments:
traceExecution()
- callOpcodeSlowPath(_slow_path_create_direct_arguments)
+ callSlowPath(_slow_path_create_direct_arguments)
dispatch(constexpr op_create_direct_arguments_length)
_llint_op_create_scoped_arguments:
traceExecution()
- callOpcodeSlowPath(_slow_path_create_scoped_arguments)
+ callSlowPath(_slow_path_create_scoped_arguments)
dispatch(constexpr op_create_scoped_arguments_length)
_llint_op_create_cloned_arguments:
traceExecution()
- callOpcodeSlowPath(_slow_path_create_cloned_arguments)
+ callSlowPath(_slow_path_create_cloned_arguments)
dispatch(constexpr op_create_cloned_arguments_length)
_llint_op_create_this:
traceExecution()
- callOpcodeSlowPath(_slow_path_create_this)
+ callSlowPath(_slow_path_create_this)
dispatch(constexpr op_create_this_length)
_llint_op_new_object:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_new_object)
+ callSlowPath(_llint_slow_path_new_object)
dispatch(constexpr op_new_object_length)
_llint_op_new_func:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_new_func)
+ callSlowPath(_llint_slow_path_new_func)
dispatch(constexpr op_new_func_length)
_llint_op_new_generator_func:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_new_generator_func)
+ callSlowPath(_llint_slow_path_new_generator_func)
dispatch(constexpr op_new_generator_func_length)
_llint_op_new_async_generator_func:
@@ -1390,61 +1375,61 @@
_llint_op_new_array:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_new_array)
+ callSlowPath(_llint_slow_path_new_array)
dispatch(constexpr op_new_array_length)
_llint_op_new_array_with_spread:
traceExecution()
- callOpcodeSlowPath(_slow_path_new_array_with_spread)
+ callSlowPath(_slow_path_new_array_with_spread)
dispatch(constexpr op_new_array_with_spread_length)
_llint_op_spread:
traceExecution()
- callOpcodeSlowPath(_slow_path_spread)
+ callSlowPath(_slow_path_spread)
dispatch(constexpr op_spread_length)
_llint_op_new_array_with_size:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_new_array_with_size)
+ callSlowPath(_llint_slow_path_new_array_with_size)
dispatch(constexpr op_new_array_with_size_length)
_llint_op_new_array_buffer:
traceExecution()
- callOpcodeSlowPath(_slow_path_new_array_buffer)
+ callSlowPath(_slow_path_new_array_buffer)
dispatch(constexpr op_new_array_buffer_length)
_llint_op_new_regexp:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_new_regexp)
+ callSlowPath(_llint_slow_path_new_regexp)
dispatch(constexpr op_new_regexp_length)
_llint_op_less:
traceExecution()
- callOpcodeSlowPath(_slow_path_less)
+ callSlowPath(_slow_path_less)
dispatch(constexpr op_less_length)
_llint_op_lesseq:
traceExecution()
- callOpcodeSlowPath(_slow_path_lesseq)
+ callSlowPath(_slow_path_lesseq)
dispatch(constexpr op_lesseq_length)
_llint_op_greater:
traceExecution()
- callOpcodeSlowPath(_slow_path_greater)
+ callSlowPath(_slow_path_greater)
dispatch(constexpr op_greater_length)
_llint_op_greatereq:
traceExecution()
- callOpcodeSlowPath(_slow_path_greatereq)
+ callSlowPath(_slow_path_greatereq)
dispatch(constexpr op_greatereq_length)
@@ -1462,102 +1447,102 @@
_llint_op_mod:
traceExecution()
- callOpcodeSlowPath(_slow_path_mod)
+ callSlowPath(_slow_path_mod)
dispatch(constexpr op_mod_length)
_llint_op_pow:
traceExecution()
- callOpcodeSlowPath(_slow_path_pow)
+ callSlowPath(_slow_path_pow)
dispatch(constexpr op_pow_length)
_llint_op_typeof:
traceExecution()
- callOpcodeSlowPath(_slow_path_typeof)
+ callSlowPath(_slow_path_typeof)
dispatch(constexpr op_typeof_length)
_llint_op_is_object_or_null:
traceExecution()
- callOpcodeSlowPath(_slow_path_is_object_or_null)
+ callSlowPath(_slow_path_is_object_or_null)
dispatch(constexpr op_is_object_or_null_length)
_llint_op_is_function:
traceExecution()
- callOpcodeSlowPath(_slow_path_is_function)
+ callSlowPath(_slow_path_is_function)
dispatch(constexpr op_is_function_length)
_llint_op_in:
traceExecution()
- callOpcodeSlowPath(_slow_path_in)
+ callSlowPath(_slow_path_in)
dispatch(constexpr op_in_length)
_llint_op_try_get_by_id:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_try_get_by_id)
+ callSlowPath(_llint_slow_path_try_get_by_id)
dispatch(constexpr op_try_get_by_id_length)
_llint_op_del_by_id:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_del_by_id)
+ callSlowPath(_llint_slow_path_del_by_id)
dispatch(constexpr op_del_by_id_length)
_llint_op_del_by_val:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_del_by_val)
+ callSlowPath(_llint_slow_path_del_by_val)
dispatch(constexpr op_del_by_val_length)
_llint_op_put_by_index:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_put_by_index)
+ callSlowPath(_llint_slow_path_put_by_index)
dispatch(constexpr op_put_by_index_length)
_llint_op_put_getter_by_id:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_put_getter_by_id)
+ callSlowPath(_llint_slow_path_put_getter_by_id)
dispatch(constexpr op_put_getter_by_id_length)
_llint_op_put_setter_by_id:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_put_setter_by_id)
+ callSlowPath(_llint_slow_path_put_setter_by_id)
dispatch(constexpr op_put_setter_by_id_length)
_llint_op_put_getter_setter_by_id:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_put_getter_setter_by_id)
+ callSlowPath(_llint_slow_path_put_getter_setter_by_id)
dispatch(constexpr op_put_getter_setter_by_id_length)
_llint_op_put_getter_by_val:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_put_getter_by_val)
+ callSlowPath(_llint_slow_path_put_getter_by_val)
dispatch(constexpr op_put_getter_by_val_length)
_llint_op_put_setter_by_val:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_put_setter_by_val)
+ callSlowPath(_llint_slow_path_put_setter_by_val)
dispatch(constexpr op_put_setter_by_val_length)
_llint_op_define_data_property:
traceExecution()
- callOpcodeSlowPath(_slow_path_define_data_property)
+ callSlowPath(_slow_path_define_data_property)
dispatch(constexpr op_define_data_property_length)
_llint_op_define_accessor_property:
traceExecution()
- callOpcodeSlowPath(_slow_path_define_accessor_property)
+ callSlowPath(_slow_path_define_accessor_property)
dispatch(constexpr op_define_accessor_property_length)
@@ -1691,30 +1676,30 @@
_llint_op_super_sampler_begin:
- callOpcodeSlowPath(_llint_slow_path_super_sampler_begin)
+ callSlowPath(_llint_slow_path_super_sampler_begin)
dispatch(constexpr op_super_sampler_begin_length)
_llint_op_super_sampler_end:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_super_sampler_end)
+ callSlowPath(_llint_slow_path_super_sampler_end)
dispatch(constexpr op_super_sampler_end_length)
_llint_op_switch_string:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_switch_string)
+ callSlowPath(_llint_slow_path_switch_string)
dispatch(0)
_llint_op_new_func_exp:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_new_func_exp)
+ callSlowPath(_llint_slow_path_new_func_exp)
dispatch(constexpr op_new_func_exp_length)
_llint_op_new_generator_func_exp:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_new_generator_func_exp)
+ callSlowPath(_llint_slow_path_new_generator_func_exp)
dispatch(constexpr op_new_generator_func_exp_length)
_llint_op_new_async_func_exp:
@@ -1725,7 +1710,7 @@
_llint_op_set_function_name:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_set_function_name)
+ callSlowPath(_llint_slow_path_set_function_name)
dispatch(constexpr op_set_function_name_length)
_llint_op_call:
@@ -1744,7 +1729,7 @@
doCall(_llint_slow_path_construct, prepareForRegularCall)
macro doCallVarargs(frameSlowPath, slowPath, prepareCall)
- callOpcodeSlowPath(frameSlowPath)
+ callSlowPath(frameSlowPath)
branchIfException(_llint_throw_from_slow_path_trampoline)
# calleeFrame in r1
if JSVALUE64
@@ -1831,13 +1816,13 @@
_llint_op_strcat:
traceExecution()
- callOpcodeSlowPath(_slow_path_strcat)
+ callSlowPath(_slow_path_strcat)
dispatch(constexpr op_strcat_length)
_llint_op_push_with_scope:
traceExecution()
- callOpcodeSlowPath(_slow_path_push_with_scope)
+ callSlowPath(_slow_path_push_with_scope)
dispatch(constexpr op_push_with_scope_length)
@@ -1848,7 +1833,7 @@
_llint_op_unreachable:
traceExecution()
- callOpcodeSlowPath(_slow_path_unreachable)
+ callSlowPath(_slow_path_unreachable)
dispatch(constexpr op_unreachable_length)
@@ -1858,19 +1843,19 @@
_llint_op_create_lexical_environment:
traceExecution()
- callOpcodeSlowPath(_slow_path_create_lexical_environment)
+ callSlowPath(_slow_path_create_lexical_environment)
dispatch(constexpr op_create_lexical_environment_length)
_llint_op_throw:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_throw)
+ callSlowPath(_llint_slow_path_throw)
dispatch(constexpr op_throw_length)
_llint_op_throw_static_error:
traceExecution()
- callOpcodeSlowPath(_slow_path_throw_static_error)
+ callSlowPath(_slow_path_throw_static_error)
dispatch(constexpr op_throw_static_error_length)
@@ -1879,7 +1864,7 @@
loadp CodeBlock[cfr], t0
loadi CodeBlock::m_debuggerRequests[t0], t0
btiz t0, .opDebugDone
- callOpcodeSlowPath(_llint_slow_path_debug)
+ callSlowPath(_llint_slow_path_debug)
.opDebugDone:
dispatch(constexpr op_debug_length)
@@ -1902,82 +1887,82 @@
_llint_op_get_enumerable_length:
traceExecution()
- callOpcodeSlowPath(_slow_path_get_enumerable_length)
+ callSlowPath(_slow_path_get_enumerable_length)
dispatch(constexpr op_get_enumerable_length_length)
_llint_op_has_indexed_property:
traceExecution()
- callOpcodeSlowPath(_slow_path_has_indexed_property)
+ callSlowPath(_slow_path_has_indexed_property)
dispatch(constexpr op_has_indexed_property_length)
_llint_op_has_structure_property:
traceExecution()
- callOpcodeSlowPath(_slow_path_has_structure_property)
+ callSlowPath(_slow_path_has_structure_property)
dispatch(constexpr op_has_structure_property_length)
_llint_op_has_generic_property:
traceExecution()
- callOpcodeSlowPath(_slow_path_has_generic_property)
+ callSlowPath(_slow_path_has_generic_property)
dispatch(constexpr op_has_generic_property_length)
_llint_op_get_direct_pname:
traceExecution()
- callOpcodeSlowPath(_slow_path_get_direct_pname)
+ callSlowPath(_slow_path_get_direct_pname)
dispatch(constexpr op_get_direct_pname_length)
_llint_op_get_property_enumerator:
traceExecution()
- callOpcodeSlowPath(_slow_path_get_property_enumerator)
+ callSlowPath(_slow_path_get_property_enumerator)
dispatch(constexpr op_get_property_enumerator_length)
_llint_op_enumerator_structure_pname:
traceExecution()
- callOpcodeSlowPath(_slow_path_next_structure_enumerator_pname)
+ callSlowPath(_slow_path_next_structure_enumerator_pname)
dispatch(constexpr op_enumerator_structure_pname_length)
_llint_op_enumerator_generic_pname:
traceExecution()
- callOpcodeSlowPath(_slow_path_next_generic_enumerator_pname)
+ callSlowPath(_slow_path_next_generic_enumerator_pname)
dispatch(constexpr op_enumerator_generic_pname_length)
_llint_op_to_index_string:
traceExecution()
- callOpcodeSlowPath(_slow_path_to_index_string)
+ callSlowPath(_slow_path_to_index_string)
dispatch(constexpr op_to_index_string_length)
_llint_op_create_rest:
traceExecution()
- callOpcodeSlowPath(_slow_path_create_rest)
+ callSlowPath(_slow_path_create_rest)
dispatch(constexpr op_create_rest_length)
_llint_op_instanceof:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_instanceof)
+ callSlowPath(_llint_slow_path_instanceof)
dispatch(constexpr op_instanceof_length)
_llint_op_get_by_id_with_this:
traceExecution()
- callOpcodeSlowPath(_slow_path_get_by_id_with_this)
+ callSlowPath(_slow_path_get_by_id_with_this)
dispatch(constexpr op_get_by_id_with_this_length)
_llint_op_get_by_val_with_this:
traceExecution()
- callOpcodeSlowPath(_slow_path_get_by_val_with_this)
+ callSlowPath(_slow_path_get_by_val_with_this)
dispatch(constexpr op_get_by_val_with_this_length)
_llint_op_put_by_id_with_this:
traceExecution()
- callOpcodeSlowPath(_slow_path_put_by_id_with_this)
+ callSlowPath(_slow_path_put_by_id_with_this)
dispatch(constexpr op_put_by_id_with_this_length)
_llint_op_put_by_val_with_this:
traceExecution()
- callOpcodeSlowPath(_slow_path_put_by_val_with_this)
+ callSlowPath(_slow_path_put_by_val_with_this)
dispatch(constexpr op_put_by_val_with_this_length)
_llint_op_resolve_scope_for_hoisting_func_decl_in_eval:
traceExecution()
- callOpcodeSlowPath(_slow_path_resolve_scope_for_hoisting_func_decl_in_eval)
+ callSlowPath(_slow_path_resolve_scope_for_hoisting_func_decl_in_eval)
dispatch(constexpr op_resolve_scope_for_hoisting_func_decl_in_eval_length)
# Lastly, make sure that we can link even though we don't support all opcodes.
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2018-03-09 21:04:03 UTC (rev 229478)
@@ -658,7 +658,7 @@
addi 1, t2
btinz t2, .opEnterLoop
.opEnterDone:
- callOpcodeSlowPath(_slow_path_enter)
+ callSlowPath(_slow_path_enter)
dispatch(constexpr op_enter_length)
@@ -714,7 +714,7 @@
dispatch(constexpr op_to_this_length)
.opToThisSlow:
- callOpcodeSlowPath(_slow_path_to_this)
+ callSlowPath(_slow_path_to_this)
dispatch(constexpr op_to_this_length)
@@ -723,7 +723,7 @@
loadisFromInstruction(1, t0)
loadConstantOrVariableTag(t0, t1)
bineq t1, EmptyValueTag, .opNotTDZ
- callOpcodeSlowPath(_slow_path_throw_tdz_error)
+ callSlowPath(_slow_path_throw_tdz_error)
.opNotTDZ:
dispatch(constexpr op_check_tdz_length)
@@ -751,7 +751,7 @@
dispatch(constexpr op_not_length)
.opNotSlow:
- callOpcodeSlowPath(_slow_path_not)
+ callSlowPath(_slow_path_not)
dispatch(constexpr op_not_length)
@@ -771,7 +771,7 @@
dispatch(constexpr op_eq_length)
.opEqSlow:
- callOpcodeSlowPath(_slow_path_eq)
+ callSlowPath(_slow_path_eq)
dispatch(constexpr op_eq_length)
@@ -818,7 +818,7 @@
dispatch(constexpr op_neq_length)
.opNeqSlow:
- callOpcodeSlowPath(_slow_path_neq)
+ callSlowPath(_slow_path_neq)
dispatch(constexpr op_neq_length)
@@ -867,7 +867,7 @@
dispatch(4)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(4)
end
@@ -891,7 +891,7 @@
dispatch(constexpr op_inc_length)
.opIncSlow:
- callOpcodeSlowPath(_slow_path_inc)
+ callSlowPath(_slow_path_inc)
dispatch(constexpr op_inc_length)
@@ -905,7 +905,7 @@
dispatch(constexpr op_dec_length)
.opDecSlow:
- callOpcodeSlowPath(_slow_path_dec)
+ callSlowPath(_slow_path_dec)
dispatch(constexpr op_dec_length)
@@ -923,7 +923,7 @@
dispatch(constexpr op_to_number_length)
.opToNumberSlow:
- callOpcodeSlowPath(_slow_path_to_number)
+ callSlowPath(_slow_path_to_number)
dispatch(constexpr op_to_number_length)
@@ -940,7 +940,7 @@
dispatch(constexpr op_to_string_length)
.opToStringSlow:
- callOpcodeSlowPath(_slow_path_to_string)
+ callSlowPath(_slow_path_to_string)
dispatch(constexpr op_to_string_length)
@@ -957,7 +957,7 @@
dispatch(constexpr op_to_object_length)
.opToObjectSlow:
- callOpcodeSlowPath(_slow_path_to_object)
+ callSlowPath(_slow_path_to_object)
dispatch(constexpr op_to_object_length)
@@ -985,7 +985,7 @@
dispatch(constexpr op_negate_length)
.opNegateSlow:
- callOpcodeSlowPath(_slow_path_negate)
+ callSlowPath(_slow_path_negate)
dispatch(constexpr op_negate_length)
@@ -1039,7 +1039,7 @@
dispatch(5)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(5)
end
@@ -1120,7 +1120,7 @@
dispatch(advance)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(advance)
end
@@ -1158,7 +1158,7 @@
storei Int32Tag, TagOffset[cfr, t0, 8]
dispatch(constexpr op_unsigned_length)
.opUnsignedSlow:
- callOpcodeSlowPath(_slow_path_unsigned)
+ callSlowPath(_slow_path_unsigned)
dispatch(constexpr op_unsigned_length)
@@ -1218,7 +1218,7 @@
_llint_op_instanceof_custom:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_instanceof_custom)
+ callSlowPath(_llint_slow_path_instanceof_custom)
dispatch(constexpr op_instanceof_custom_length)
@@ -1367,7 +1367,7 @@
dispatch(constexpr op_get_by_id_length)
.opGetByIdSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_id)
+ callSlowPath(_llint_slow_path_get_by_id)
dispatch(constexpr op_get_by_id_length)
@@ -1387,7 +1387,7 @@
dispatch(constexpr op_get_by_id_proto_load_length)
.opGetByIdProtoSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_id)
+ callSlowPath(_llint_slow_path_get_by_id)
dispatch(constexpr op_get_by_id_proto_load_length)
@@ -1404,7 +1404,7 @@
dispatch(constexpr op_get_by_id_unset_length)
.opGetByIdUnsetSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_id)
+ callSlowPath(_llint_slow_path_get_by_id)
dispatch(constexpr op_get_by_id_unset_length)
@@ -1427,7 +1427,7 @@
dispatch(constexpr op_get_array_length_length)
.opGetArrayLengthSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_id)
+ callSlowPath(_llint_slow_path_get_by_id)
dispatch(constexpr op_get_array_length_length)
@@ -1564,7 +1564,7 @@
dispatch(constexpr op_put_by_id_length)
.opPutByIdSlow:
- callOpcodeSlowPath(_llint_slow_path_put_by_id)
+ callSlowPath(_llint_slow_path_put_by_id)
dispatch(constexpr op_put_by_id_length)
@@ -1618,7 +1618,7 @@
dispatch(constexpr op_get_by_val_length)
.opGetByValSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_val)
+ callSlowPath(_llint_slow_path_get_by_val)
dispatch(constexpr op_get_by_val_length)
@@ -1710,7 +1710,7 @@
loadpFromInstruction(4, t0)
storeb 1, ArrayProfile::m_outOfBounds[t0]
.opPutByValSlow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(5)
end
@@ -1735,7 +1735,7 @@
dispatchBranch(8[PC])
.slow:
- callOpcodeSlowPath(slow)
+ callSlowPath(slow)
dispatch(0)
end
@@ -1860,7 +1860,7 @@
dispatchBranch(12[PC])
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(0)
end
@@ -1889,7 +1889,7 @@
dispatchBranch(8[PC])
.opSwitchImmSlow:
- callOpcodeSlowPath(_llint_slow_path_switch_imm)
+ callSlowPath(_llint_slow_path_switch_imm)
dispatch(0)
@@ -1926,7 +1926,7 @@
dispatchBranch(8[PC])
.opSwitchOnRope:
- callOpcodeSlowPath(_llint_slow_path_switch_char)
+ callSlowPath(_llint_slow_path_switch_char)
dispatch(0)
@@ -1985,7 +1985,7 @@
dispatch(constexpr op_to_primitive_length)
.opToPrimitiveSlowCase:
- callOpcodeSlowPath(_slow_path_to_primitive)
+ callSlowPath(_slow_path_to_primitive)
dispatch(constexpr op_to_primitive_length)
@@ -2005,7 +2005,7 @@
loadi VM::targetInterpreterPCForThrow[t3], PC
- callOpcodeSlowPath(_llint_slow_path_check_if_exception_is_uncatchable_and_notify_profiler)
+ callSlowPath(_llint_slow_path_check_if_exception_is_uncatchable_and_notify_profiler)
bpeq r1, 0, .isCatchableException
jmp _llint_throw_from_slow_path_trampoline
@@ -2028,7 +2028,7 @@
traceExecution() # This needs to be here because we don't want to clobber t0, t1, t2, t3 above.
- callOpcodeSlowPath(_llint_slow_path_profile_catch)
+ callSlowPath(_llint_slow_path_profile_catch)
dispatch(constexpr op_catch_length)
@@ -2272,7 +2272,7 @@
dispatch(7)
.rDynamic:
- callOpcodeSlowPath(_slow_path_resolve_scope)
+ callSlowPath(_slow_path_resolve_scope)
dispatch(7)
@@ -2372,7 +2372,7 @@
dispatch(8)
.gDynamic:
- callOpcodeSlowPath(_llint_slow_path_get_from_scope)
+ callSlowPath(_llint_slow_path_get_from_scope)
dispatch(8)
@@ -2483,11 +2483,11 @@
.pModuleVar:
bineq t0, ModuleVar, .pDynamic
- callOpcodeSlowPath(_slow_path_throw_strict_mode_readonly_property_write_error)
+ callSlowPath(_slow_path_throw_strict_mode_readonly_property_write_error)
dispatch(7)
.pDynamic:
- callOpcodeSlowPath(_llint_slow_path_put_to_scope)
+ callSlowPath(_llint_slow_path_put_to_scope)
dispatch(7)
@@ -2568,7 +2568,7 @@
loadp TypeProfilerLog::m_logEndPtr[t1], t1
bpneq t2, t1, .opProfileTypeDone
- callOpcodeSlowPath(_slow_path_profile_type_clear_log)
+ callSlowPath(_slow_path_profile_type_clear_log)
.opProfileTypeDone:
dispatch(6)
@@ -2615,7 +2615,7 @@
storep t1, ShadowChicken::Packet::scope[t0]
dispatch(2)
.opLogShadowChickenPrologueSlow:
- callOpcodeSlowPath(_llint_slow_path_log_shadow_chicken_prologue)
+ callSlowPath(_llint_slow_path_log_shadow_chicken_prologue)
dispatch(2)
@@ -2635,5 +2635,5 @@
storei PC, ShadowChicken::Packet::callSiteIndex[t0]
dispatch(3)
.opLogShadowChickenTailSlow:
- callOpcodeSlowPath(_llint_slow_path_log_shadow_chicken_tail)
+ callSlowPath(_llint_slow_path_log_shadow_chicken_tail)
dispatch(3)
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (229477 => 229478)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2018-03-09 21:04:03 UTC (rev 229478)
@@ -603,7 +603,7 @@
addq 1, t2
btqnz t2, .opEnterLoop
.opEnterDone:
- callOpcodeSlowPath(_slow_path_enter)
+ callSlowPath(_slow_path_enter)
dispatch(constexpr op_enter_length)
@@ -655,7 +655,7 @@
dispatch(constexpr op_to_this_length)
.opToThisSlow:
- callOpcodeSlowPath(_slow_path_to_this)
+ callSlowPath(_slow_path_to_this)
dispatch(constexpr op_to_this_length)
@@ -664,7 +664,7 @@
loadisFromInstruction(1, t0)
loadConstantOrVariable(t0, t1)
bqneq t1, ValueEmpty, .opNotTDZ
- callOpcodeSlowPath(_slow_path_throw_tdz_error)
+ callSlowPath(_slow_path_throw_tdz_error)
.opNotTDZ:
dispatch(constexpr op_check_tdz_length)
@@ -691,7 +691,7 @@
dispatch(constexpr op_not_length)
.opNotSlow:
- callOpcodeSlowPath(_slow_path_not)
+ callSlowPath(_slow_path_not)
dispatch(constexpr op_not_length)
@@ -708,7 +708,7 @@
dispatch(4)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(4)
end
@@ -783,7 +783,7 @@
dispatch(4)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(4)
end
@@ -810,7 +810,7 @@
dispatch(2)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(2)
end
@@ -839,7 +839,7 @@
dispatch(constexpr op_to_number_length)
.opToNumberSlow:
- callOpcodeSlowPath(_slow_path_to_number)
+ callSlowPath(_slow_path_to_number)
dispatch(constexpr op_to_number_length)
@@ -855,7 +855,7 @@
dispatch(constexpr op_to_string_length)
.opToStringSlow:
- callOpcodeSlowPath(_slow_path_to_string)
+ callSlowPath(_slow_path_to_string)
dispatch(constexpr op_to_string_length)
@@ -871,7 +871,7 @@
dispatch(constexpr op_to_object_length)
.opToObjectSlow:
- callOpcodeSlowPath(_slow_path_to_object)
+ callSlowPath(_slow_path_to_object)
dispatch(constexpr op_to_object_length)
@@ -898,7 +898,7 @@
dispatch(constexpr op_negate_length)
.opNegateSlow:
- callOpcodeSlowPath(_slow_path_negate)
+ callSlowPath(_slow_path_negate)
dispatch(constexpr op_negate_length)
@@ -959,7 +959,7 @@
dispatch(5)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(5)
end
@@ -1031,7 +1031,7 @@
macro (left, right) divd left, right end,
_slow_path_div)
else
- callOpcodeSlowPath(_slow_path_div)
+ callSlowPath(_slow_path_div)
dispatch(constexpr op_div_length)
end
@@ -1050,7 +1050,7 @@
dispatch(advance)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(advance)
end
@@ -1087,7 +1087,7 @@
storeq t2, [cfr, t0, 8]
dispatch(constexpr op_unsigned_length)
.opUnsignedSlow:
- callOpcodeSlowPath(_slow_path_unsigned)
+ callSlowPath(_slow_path_unsigned)
dispatch(constexpr op_unsigned_length)
@@ -1140,7 +1140,7 @@
_llint_op_instanceof_custom:
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_instanceof_custom)
+ callSlowPath(_llint_slow_path_instanceof_custom)
dispatch(constexpr op_instanceof_custom_length)
@@ -1274,7 +1274,7 @@
dispatch(constexpr op_get_by_id_length)
.opGetByIdSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_id)
+ callSlowPath(_llint_slow_path_get_by_id)
dispatch(constexpr op_get_by_id_length)
@@ -1294,7 +1294,7 @@
dispatch(constexpr op_get_by_id_proto_load_length)
.opGetByIdProtoSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_id)
+ callSlowPath(_llint_slow_path_get_by_id)
dispatch(constexpr op_get_by_id_proto_load_length)
@@ -1311,7 +1311,7 @@
dispatch(constexpr op_get_by_id_unset_length)
.opGetByIdUnsetSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_id)
+ callSlowPath(_llint_slow_path_get_by_id)
dispatch(constexpr op_get_by_id_unset_length)
@@ -1334,7 +1334,7 @@
dispatch(constexpr op_get_array_length_length)
.opGetArrayLengthSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_id)
+ callSlowPath(_llint_slow_path_get_by_id)
dispatch(constexpr op_get_array_length_length)
@@ -1477,7 +1477,7 @@
dispatch(constexpr op_put_by_id_length)
.opPutByIdSlow:
- callOpcodeSlowPath(_llint_slow_path_put_by_id)
+ callSlowPath(_llint_slow_path_put_by_id)
dispatch(constexpr op_put_by_id_length)
macro finishGetByVal(result, scratch)
@@ -1626,7 +1626,7 @@
finishDoubleGetByVal(ft0, t0, t1)
.opGetByValSlow:
- callOpcodeSlowPath(_llint_slow_path_get_by_val)
+ callSlowPath(_llint_slow_path_get_by_val)
dispatch(constexpr op_get_by_val_length)
@@ -1717,7 +1717,7 @@
loadpFromInstruction(4, t0)
storeb 1, ArrayProfile::m_outOfBounds[t0]
.opPutByValSlow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(5)
end
@@ -1745,7 +1745,7 @@
dispatchIntIndirect(2)
.slow:
- callOpcodeSlowPath(slow)
+ callSlowPath(slow)
dispatch(0)
end
@@ -1845,7 +1845,7 @@
dispatchIntIndirect(3)
.slow:
- callOpcodeSlowPath(slowPath)
+ callSlowPath(slowPath)
dispatch(0)
end
@@ -1901,7 +1901,7 @@
dispatchIntIndirect(2)
.opSwitchImmSlow:
- callOpcodeSlowPath(_llint_slow_path_switch_imm)
+ callSlowPath(_llint_slow_path_switch_imm)
dispatch(0)
@@ -1938,7 +1938,7 @@
dispatchIntIndirect(2)
.opSwitchOnRope:
- callOpcodeSlowPath(_llint_slow_path_switch_char)
+ callSlowPath(_llint_slow_path_switch_char)
dispatch(0)
@@ -2002,7 +2002,7 @@
dispatch(constexpr op_to_primitive_length)
.opToPrimitiveSlowCase:
- callOpcodeSlowPath(_slow_path_to_primitive)
+ callSlowPath(_slow_path_to_primitive)
dispatch(constexpr op_to_primitive_length)
@@ -2027,7 +2027,7 @@
subp PB, PC
rshiftp 3, PC
- callOpcodeSlowPath(_llint_slow_path_check_if_exception_is_uncatchable_and_notify_profiler)
+ callSlowPath(_llint_slow_path_check_if_exception_is_uncatchable_and_notify_profiler)
bpeq r1, 0, .isCatchableException
jmp _llint_throw_from_slow_path_trampoline
@@ -2047,7 +2047,7 @@
traceExecution()
- callOpcodeSlowPath(_llint_slow_path_profile_catch)
+ callSlowPath(_llint_slow_path_profile_catch)
dispatch(constexpr op_catch_length)
@@ -2256,7 +2256,7 @@
dispatch(constexpr op_resolve_scope_length)
.rDynamic:
- callOpcodeSlowPath(_slow_path_resolve_scope)
+ callSlowPath(_slow_path_resolve_scope)
dispatch(constexpr op_resolve_scope_length)
@@ -2352,7 +2352,7 @@
dispatch(constexpr op_get_from_scope_length)
.gDynamic:
- callOpcodeSlowPath(_llint_slow_path_get_from_scope)
+ callSlowPath(_llint_slow_path_get_from_scope)
dispatch(constexpr op_get_from_scope_length)
@@ -2473,11 +2473,11 @@
.pModuleVar:
bineq t0, ModuleVar, .pDynamic
- callOpcodeSlowPath(_slow_path_throw_strict_mode_readonly_property_write_error)
+ callSlowPath(_slow_path_throw_strict_mode_readonly_property_write_error)
dispatch(constexpr op_put_to_scope_length)
.pDynamic:
- callOpcodeSlowPath(_llint_slow_path_put_to_scope)
+ callSlowPath(_llint_slow_path_put_to_scope)
dispatch(constexpr op_put_to_scope_length)
@@ -2548,7 +2548,7 @@
loadp TypeProfilerLog::m_logEndPtr[t1], t1
bpneq t2, t1, .opProfileTypeDone
- callOpcodeSlowPath(_slow_path_profile_type_clear_log)
+ callSlowPath(_slow_path_profile_type_clear_log)
.opProfileTypeDone:
dispatch(constexpr op_profile_type_length)
@@ -2589,7 +2589,7 @@
storep t1, ShadowChicken::Packet::scope[t0]
dispatch(constexpr op_log_shadow_chicken_prologue_length)
.opLogShadowChickenPrologueSlow:
- callOpcodeSlowPath(_llint_slow_path_log_shadow_chicken_prologue)
+ callSlowPath(_llint_slow_path_log_shadow_chicken_prologue)
dispatch(constexpr op_log_shadow_chicken_prologue_length)
@@ -2607,5 +2607,5 @@
storei PC, ShadowChicken::Packet::callSiteIndex[t0]
dispatch(constexpr op_log_shadow_chicken_tail_length)
.opLogShadowChickenTailSlow:
- callOpcodeSlowPath(_llint_slow_path_log_shadow_chicken_tail)
+ callSlowPath(_llint_slow_path_log_shadow_chicken_tail)
dispatch(constexpr op_log_shadow_chicken_tail_length)
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (229477 => 229478)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2018-03-09 21:04:03 UTC (rev 229478)
@@ -27,8 +27,6 @@
#include "Options.h"
#include "AssemblerCommon.h"
-#include "LLIntCommon.h"
-#include "LLIntData.h"
#include "MinimumReservedZoneSize.h"
#include "SigillCrashAnalyzer.h"
#include <algorithm>
@@ -152,10 +150,6 @@
ASSERT(availability == Availability::Configurable);
UNUSED_PARAM(id);
-#if ENABLE(LLINT_STATS)
- if (id == reportLLIntStatsID || id == llintStatsFileID)
- return true;
-#endif
#if !defined(NDEBUG)
if (id == maxSingleAllocationSizeID)
return true;
@@ -482,9 +476,6 @@
ASSERT((static_cast<int64_t>(Options::thresholdForOptimizeAfterLongWarmUp()) << Options::reoptimizationRetryCounterMax()) > 0);
ASSERT((static_cast<int64_t>(Options::thresholdForOptimizeAfterLongWarmUp()) << Options::reoptimizationRetryCounterMax()) <= static_cast<int64_t>(std::numeric_limits<int32_t>::max()));
-#if ENABLE(LLINT_STATS)
- LLInt::Data::loadStats();
-#endif
#if !defined(NDEBUG)
if (Options::maxSingleAllocationSize())
fastSetMaxSingleAllocationSize(Options::maxSingleAllocationSize());
Modified: trunk/Source/_javascript_Core/runtime/Options.h (229477 => 229478)
--- trunk/Source/_javascript_Core/runtime/Options.h 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/runtime/Options.h 2018-03-09 21:04:03 UTC (rev 229478)
@@ -453,9 +453,6 @@
\
v(bool, useSuperSampler, false, Normal, nullptr) \
\
- v(bool, reportLLIntStats, false, Configurable, "Reports LLInt statistics") \
- v(optionString, llintStatsFile, nullptr, Configurable, "File to collect LLInt statistics in") \
- \
v(bool, useSourceProviderCache, true, Normal, "If false, the parser will not use the source provider cache. It's good to verify everything works when this is false. Because the cache is so successful, it can mask bugs.") \
v(bool, useCodeCache, true, Normal, "If false, the unlinked byte code cache will not be used.") \
\
Modified: trunk/Source/_javascript_Core/runtime/TestRunnerUtils.cpp (229477 => 229478)
--- trunk/Source/_javascript_Core/runtime/TestRunnerUtils.cpp 2018-03-09 20:47:11 UTC (rev 229477)
+++ trunk/Source/_javascript_Core/runtime/TestRunnerUtils.cpp 2018-03-09 21:04:03 UTC (rev 229478)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -159,8 +159,6 @@
// This is a hook called at the bitter end of some of our tests.
void finalizeStatsAtEndOfTesting()
{
- if (Options::reportLLIntStats())
- LLInt::Data::finalizeStats();
}
} // namespace JSC
