Changeset 38461 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Nov 16, 2008, 5:48:55 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-16 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

A few more renames:

BytecodeInterpreter => Interpreter
WREC => JSC::WREC, removing JSC:: prefix in a lot of places
X86Assembler::copy => X86Assembler::executableCopy
AssemblerBuffer::copy => AssemblerBuffer::executableCopy
WRECFunction => WREC::RegExpFunction
OBJECT_OFFSET => FIELD_OFFSET

Also:

Nixed use of OBJECT_OFFSET outside of CTI.cpp by making CTI a friend in more places.

Nixed X86

and X86Assembler:: prefixes in a lot of places using typedefs

• JavaScriptCore.exp:
• VM/CTI.cpp: (JSC::): (JSC::CTI::emitGetVirtualRegister): (JSC::CTI::emitGetVirtualRegisters): (JSC::CTI::emitPutCTIArgFromVirtualRegister): (JSC::CTI::emitPutCTIArg): (JSC::CTI::emitGetCTIArg): (JSC::CTI::emitPutCTIParam): (JSC::CTI::emitGetCTIParam): (JSC::CTI::emitPutToCallFrameHeader): (JSC::CTI::emitGetFromCallFrameHeader): (JSC::CTI::emitPutVirtualRegister): (JSC::CTI::emitNakedCall): (JSC::CTI::emitNakedFastCall): (JSC::CTI::emitCTICall): (JSC::CTI::emitJumpSlowCaseIfNotJSCell): (JSC::CTI::emitJumpSlowCaseIfNotImmNum): (JSC::CTI::emitJumpSlowCaseIfNotImmNums): (JSC::CTI::emitFastArithDeTagImmediate): (JSC::CTI::emitFastArithDeTagImmediateJumpIfZero): (JSC::CTI::emitFastArithReTagImmediate): (JSC::CTI::emitFastArithPotentiallyReTagImmediate): (JSC::CTI::emitFastArithImmToInt): (JSC::CTI::emitFastArithIntToImmOrSlowCase): (JSC::CTI::emitFastArithIntToImmNoCheck): (JSC::CTI::emitArithIntToImmWithJump): (JSC::CTI::emitTagAsBoolImmediate): (JSC::CTI::compileOpCallInitializeCallFrame): (JSC::CTI::compileOpCall): (JSC::CTI::compileOpStrictEq): (JSC::CTI::emitSlowScriptCheck): (JSC::CTI::putDoubleResultToJSNumberCellOrJSImmediate): (JSC::CTI::compileBinaryArithOp): (JSC::CTI::compileBinaryArithOpSlowCase): (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileSlowCases): (JSC::CTI::privateCompile): (JSC::CTI::privateCompileGetByIdSelf): (JSC::CTI::privateCompileGetByIdProto): (JSC::CTI::privateCompileGetByIdChain): (JSC::CTI::privateCompilePutByIdReplace): (JSC::CTI::privateCompilePutByIdTransition): (JSC::CTI::privateCompileCTIMachineTrampolines): (JSC::CTI::freeCTIMachineTrampolines): (JSC::CTI::patchGetByIdSelf): (JSC::CTI::patchPutByIdReplace): (JSC::CTI::privateCompilePatchGetArrayLength): (JSC::CTI::emitGetVariableObjectRegister): (JSC::CTI::emitPutVariableObjectRegister):
• VM/CTI.h: (JSC::CallRecord::CallRecord): (JSC::JmpTable::JmpTable): (JSC::SlowCaseEntry::SlowCaseEntry): (JSC::CTI::JSRInfo::JSRInfo):
• VM/CodeBlock.cpp: (JSC::CodeBlock::printStructures): (JSC::CodeBlock::derefStructures): (JSC::CodeBlock::refStructures):
• VM/Machine.cpp: (JSC::jsLess): (JSC::jsLessEq): (JSC::Interpreter::resolve): (JSC::Interpreter::resolveSkip): (JSC::Interpreter::resolveGlobal): (JSC::Interpreter::resolveBase): (JSC::Interpreter::resolveBaseAndProperty): (JSC::Interpreter::resolveBaseAndFunc): (JSC::Interpreter::slideRegisterWindowForCall): (JSC::Interpreter::callEval): (JSC::Interpreter::Interpreter): (JSC::Interpreter::initialize): (JSC::Interpreter::~Interpreter): (JSC::Interpreter::dumpCallFrame): (JSC::Interpreter::dumpRegisters): (JSC::Interpreter::isOpcode): (JSC::Interpreter::unwindCallFrame): (JSC::Interpreter::throwException): (JSC::Interpreter::execute): (JSC::Interpreter::debug): (JSC::Interpreter::resetTimeoutCheck): (JSC::Interpreter::checkTimeout): (JSC::Interpreter::createExceptionScope): (JSC::Interpreter::tryCachePutByID): (JSC::Interpreter::uncachePutByID): (JSC::Interpreter::tryCacheGetByID): (JSC::Interpreter::uncacheGetByID): (JSC::Interpreter::privateExecute): (JSC::Interpreter::retrieveArguments): (JSC::Interpreter::retrieveCaller): (JSC::Interpreter::retrieveLastCaller): (JSC::Interpreter::findFunctionCallFrame): (JSC::Interpreter::tryCTICachePutByID): (JSC::Interpreter::tryCTICacheGetByID): (JSC::): (JSC::Interpreter::cti_op_convert_this): (JSC::Interpreter::cti_op_end): (JSC::Interpreter::cti_op_add): (JSC::Interpreter::cti_op_pre_inc): (JSC::Interpreter::cti_timeout_check): (JSC::Interpreter::cti_register_file_check): (JSC::Interpreter::cti_op_loop_if_less): (JSC::Interpreter::cti_op_loop_if_lesseq): (JSC::Interpreter::cti_op_new_object): (JSC::Interpreter::cti_op_put_by_id): (JSC::Interpreter::cti_op_put_by_id_second): (JSC::Interpreter::cti_op_put_by_id_generic): (JSC::Interpreter::cti_op_put_by_id_fail): (JSC::Interpreter::cti_op_get_by_id): (JSC::Interpreter::cti_op_get_by_id_second): (JSC::Interpreter::cti_op_get_by_id_generic): (JSC::Interpreter::cti_op_get_by_id_fail): (JSC::Interpreter::cti_op_instanceof): (JSC::Interpreter::cti_op_del_by_id): (JSC::Interpreter::cti_op_mul): (JSC::Interpreter::cti_op_new_func): (JSC::Interpreter::cti_op_call_JSFunction): (JSC::Interpreter::cti_op_call_arityCheck): (JSC::Interpreter::cti_vm_dontLazyLinkCall): (JSC::Interpreter::cti_vm_lazyLinkCall): (JSC::Interpreter::cti_op_push_activation): (JSC::Interpreter::cti_op_call_NotJSFunction): (JSC::Interpreter::cti_op_create_arguments): (JSC::Interpreter::cti_op_create_arguments_no_params): (JSC::Interpreter::cti_op_tear_off_activation): (JSC::Interpreter::cti_op_tear_off_arguments): (JSC::Interpreter::cti_op_profile_will_call): (JSC::Interpreter::cti_op_profile_did_call): (JSC::Interpreter::cti_op_ret_scopeChain): (JSC::Interpreter::cti_op_new_array): (JSC::Interpreter::cti_op_resolve): (JSC::Interpreter::cti_op_construct_JSConstruct): (JSC::Interpreter::cti_op_construct_NotJSConstruct): (JSC::Interpreter::cti_op_get_by_val): (JSC::Interpreter::cti_op_resolve_func): (JSC::Interpreter::cti_op_sub): (JSC::Interpreter::cti_op_put_by_val): (JSC::Interpreter::cti_op_put_by_val_array): (JSC::Interpreter::cti_op_lesseq): (JSC::Interpreter::cti_op_loop_if_true): (JSC::Interpreter::cti_op_negate): (JSC::Interpreter::cti_op_resolve_base): (JSC::Interpreter::cti_op_resolve_skip): (JSC::Interpreter::cti_op_resolve_global): (JSC::Interpreter::cti_op_div): (JSC::Interpreter::cti_op_pre_dec): (JSC::Interpreter::cti_op_jless): (JSC::Interpreter::cti_op_not): (JSC::Interpreter::cti_op_jtrue): (JSC::Interpreter::cti_op_post_inc): (JSC::Interpreter::cti_op_eq): (JSC::Interpreter::cti_op_lshift): (JSC::Interpreter::cti_op_bitand): (JSC::Interpreter::cti_op_rshift): (JSC::Interpreter::cti_op_bitnot): (JSC::Interpreter::cti_op_resolve_with_base): (JSC::Interpreter::cti_op_new_func_exp): (JSC::Interpreter::cti_op_mod): (JSC::Interpreter::cti_op_less): (JSC::Interpreter::cti_op_neq): (JSC::Interpreter::cti_op_post_dec): (JSC::Interpreter::cti_op_urshift): (JSC::Interpreter::cti_op_bitxor): (JSC::Interpreter::cti_op_new_regexp): (JSC::Interpreter::cti_op_bitor): (JSC::Interpreter::cti_op_call_eval): (JSC::Interpreter::cti_op_throw): (JSC::Interpreter::cti_op_get_pnames): (JSC::Interpreter::cti_op_next_pname): (JSC::Interpreter::cti_op_push_scope): (JSC::Interpreter::cti_op_pop_scope): (JSC::Interpreter::cti_op_typeof): (JSC::Interpreter::cti_op_is_undefined): (JSC::Interpreter::cti_op_is_boolean): (JSC::Interpreter::cti_op_is_number): (JSC::Interpreter::cti_op_is_string): (JSC::Interpreter::cti_op_is_object): (JSC::Interpreter::cti_op_is_function): (JSC::Interpreter::cti_op_stricteq): (JSC::Interpreter::cti_op_nstricteq): (JSC::Interpreter::cti_op_to_jsnumber): (JSC::Interpreter::cti_op_in): (JSC::Interpreter::cti_op_push_new_scope): (JSC::Interpreter::cti_op_jmp_scopes): (JSC::Interpreter::cti_op_put_by_index): (JSC::Interpreter::cti_op_switch_imm): (JSC::Interpreter::cti_op_switch_char): (JSC::Interpreter::cti_op_switch_string): (JSC::Interpreter::cti_op_del_by_val): (JSC::Interpreter::cti_op_put_getter): (JSC::Interpreter::cti_op_put_setter): (JSC::Interpreter::cti_op_new_error): (JSC::Interpreter::cti_op_debug): (JSC::Interpreter::cti_vm_throw):
• VM/Machine.h:
• VM/Register.h:
• VM/SamplingTool.cpp: (JSC::SamplingTool::dump):
• VM/SamplingTool.h: (JSC::SamplingTool::SamplingTool):
• bytecompiler/CodeGenerator.cpp: (JSC::BytecodeGenerator::generate): (JSC::BytecodeGenerator::BytecodeGenerator):
• jsc.cpp: (runWithScripts):
• masm/X86Assembler.h: (JSC::AssemblerBuffer::executableCopy): (JSC::X86Assembler::executableCopy):
• runtime/ExecState.h: (JSC::ExecState::interpreter):
• runtime/JSCell.h:
• runtime/JSFunction.h:
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• runtime/JSGlobalData.h:
• runtime/JSImmediate.h:
• runtime/JSString.h:
• runtime/JSValue.h:
• runtime/JSVariableObject.h:
• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::~RegExp): (JSC::RegExp::match):
• runtime/RegExp.h:
• wrec/CharacterClassConstructor.cpp:
• wrec/CharacterClassConstructor.h:
• wrec/WREC.cpp: (JSC::WREC::compileRegExp):
• wrec/WREC.h: (JSC::WREC::Generator::Generator): (JSC::WREC::Parser::): (JSC::WREC::Parser::Parser): (JSC::WREC::Parser::parseAlternative):

Location:

trunk/JavaScriptCore/runtime

Files:

• ExecState.h (modified) (2 diffs)
• JSCell.h (modified) (1 diff)
• JSFunction.h (modified) (1 diff)
• JSGlobalData.cpp (modified) (1 diff)
• JSGlobalData.h (modified) (2 diffs)
• JSImmediate.h (modified) (1 diff)
• JSString.h (modified) (1 diff)
• JSValue.h (modified) (1 diff)
• JSVariableObject.h (modified) (3 diffs)
• RegExp.cpp (modified) (6 diffs)
• RegExp.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/ExecState.h

@@ -83 +83 @@
         const CommonIdentifiers& propertyNames() const { return *globalData().propertyNames; }
         const ArgList& emptyList() const { return *globalData().emptyList; }
-        BytecodeInterpreter* interpreter() { return globalData().interpreter; }
+        Interpreter* interpreter() { return globalData().interpreter; }
         Heap* heap() { return &globalData().heap; }
 
@@ -98 +98 @@
         friend class JSActivation;
         friend class JSGlobalObject;
-        friend class BytecodeInterpreter;
+        friend class Interpreter;
 
         static CallFrame* create(Register* callFrameBase) { return static_cast<CallFrame*>(callFrameBase); }

trunk/JavaScriptCore/runtime/JSCell.h

@@ -39 +39 @@
         friend class JSString;
         friend class JSValue;
-        friend class BytecodeInterpreter;
+        friend class Interpreter;
 
     private:

trunk/JavaScriptCore/runtime/JSFunction.h

@@ -40 +40 @@
     class JSFunction : public InternalFunction {
         friend class CTI;
-        friend class BytecodeInterpreter;
+        friend class Interpreter;
 
         typedef InternalFunction Base;

trunk/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -65 +65 @@
 
 JSGlobalData::JSGlobalData(bool isShared)
-    : interpreter(new BytecodeInterpreter)
+    : interpreter(new Interpreter)
     , exception(noValue())
     , arrayTable(new HashTable(JSC::arrayTable))

trunk/JavaScriptCore/runtime/JSGlobalData.h

@@ -48 +48 @@
     class JSObject;
     class Lexer;
-    class BytecodeInterpreter;
+    class Interpreter;
     class Parser;
     class ParserRefCounted;
@@ -64 +64 @@
         ~JSGlobalData();
 
-        BytecodeInterpreter* interpreter;
+        Interpreter* interpreter;
 
         JSValue* exception;

trunk/JavaScriptCore/runtime/JSImmediate.h

@@ -87 +87 @@
     class JSImmediate {
     private:
-        friend class CTI; // Whooo!
+        friend class CTI;
     
         static const uintptr_t TagMask           = 0x3u; // primary tag is 2 bits long

trunk/JavaScriptCore/runtime/JSString.h

@@ -61 +61 @@
     class JSString : public JSCell {
         friend class CTI;
-        friend class BytecodeInterpreter;
+        friend class Interpreter;
 
     public:

trunk/JavaScriptCore/runtime/JSValue.h

@@ -29 +29 @@
 #include "UString.h"
 #include <stddef.h> // for size_t
-
-// The magic number 0x4000 is not important here, it is being subtracted back out (avoiding using zero since this
-// can have unexpected effects in this type of macro, particularly where multiple-inheritance is involved).
-#define OBJECT_OFFSET(class, member) (reinterpret_cast<ptrdiff_t>(&(reinterpret_cast<class*>(0x4000)->member)) - 0x4000)
 
 namespace JSC {

trunk/JavaScriptCore/runtime/JSVariableObject.h

@@ -42 +42 @@
 
     class JSVariableObject : public JSObject {
+        friend class CTI;
+
     public:
         SymbolTable& symbolTable() const { return *d->symbolTable; }
@@ -73 +75 @@
             OwnArrayPtr<Register> registerArray; // Independent copy of registers, used when a variable object copies its registers out of the register file.
 
-            static inline ptrdiff_t offsetOf_registers()
-            {
-                return OBJECT_OFFSET(JSVariableObjectData, registers);
-            }
-
         private:
             JSVariableObjectData(const JSVariableObjectData&);
@@ -98 +95 @@
 
         JSVariableObjectData* d;
-
-    public:
-        static inline ptrdiff_t offsetOf_d()
-        {
-            return OBJECT_OFFSET(JSVariableObject, d);
-        }
-
-        static inline ptrdiff_t offsetOf_Data_registers()
-        {
-            return JSVariableObjectData::offsetOf_registers();
-        }
     };
 

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -22 +22 @@
 #include "RegExp.h"
 
-#include "CTI.h"
 #include "Lexer.h"
 #include <pcre/pcre.h>
@@ -28 +27 @@
 #include <stdlib.h>
 #include <string.h>
-#include <wrec/WREC.h>
 #include <wtf/Assertions.h>
 #include <wtf/OwnArrayPtr.h>
@@ -46 +44 @@
 {
 #if ENABLE(WREC)
-    m_wrecFunction = WREC::compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError);
+    m_wrecFunction = compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError);
     if (m_wrecFunction)
         return;
@@ -89 +87 @@
 
 #if ENABLE(WREC)
-    m_wrecFunction = WREC::compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError, (m_flagBits & IgnoreCase), (m_flagBits & Multiline));
+    m_wrecFunction = compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError, (m_flagBits & IgnoreCase), (m_flagBits & Multiline));
     if (m_wrecFunction)
         return;
@@ -110 +108 @@
 #if ENABLE(WREC)
     if (m_wrecFunction)
-        WTF::fastFreeExecutable(m_wrecFunction);
+        WTF::fastFreeExecutable(reinterpret_cast<void*>(m_wrecFunction));
 #endif
 }
@@ -137 +135 @@
             ovector->set(offsetVector);
 
-        int result = reinterpret_cast<WRECFunction>(m_wrecFunction)(s.data(), i, s.size(), offsetVector);
+        int result = m_wrecFunction(s.data(), i, s.size(), offsetVector);
 
         if (result < 0) {

trunk/JavaScriptCore/runtime/RegExp.h

@@ -23 +23 @@
 
 #include "UString.h"
+#include "WREC.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
@@ -67 +68 @@
 
 #if ENABLE(WREC)
-        // Called as a WRECFunction
-        void* m_wrecFunction;
+        WREC::RegExpFunction m_wrecFunction;
 #endif
     };