From 74fba4d8069c946c1ba12b9ac4d4026aaf14118b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 29 Jan 2013 14:20:50 +0100 Subject: [PATCH] Say hello to QtV4 module. Change-Id: I507cd5707b7d7223a0d901cf939896fb2649b684 Reviewed-by: Lars Knoll --- .qmake.conf | 1 + .../3rdparty}/double-conversion/README | 0 .../3rdparty}/double-conversion/bignum-dtoa.cc | 0 .../3rdparty}/double-conversion/bignum-dtoa.h | 0 .../3rdparty}/double-conversion/bignum.cc | 0 .../3rdparty}/double-conversion/bignum.h | 0 .../3rdparty}/double-conversion/cached-powers.cc | 0 .../3rdparty}/double-conversion/cached-powers.h | 0 .../3rdparty}/double-conversion/diy-fp.cc | 0 .../3rdparty}/double-conversion/diy-fp.h | 0 .../double-conversion/double-conversion.cc | 0 .../double-conversion/double-conversion.h | 0 .../double-conversion/double-conversion.pri | 1 + .../3rdparty}/double-conversion/fast-dtoa.cc | 0 .../3rdparty}/double-conversion/fast-dtoa.h | 0 .../3rdparty}/double-conversion/fixed-dtoa.cc | 0 .../3rdparty}/double-conversion/fixed-dtoa.h | 0 .../3rdparty}/double-conversion/ieee.h | 0 .../3rdparty}/double-conversion/strtod.cc | 0 .../3rdparty}/double-conversion/strtod.h | 0 .../3rdparty}/double-conversion/utils.h | 0 {3rdparty => src/3rdparty}/masm/WeakRandom.h | 0 .../3rdparty}/masm/assembler/ARMAssembler.cpp | 0 .../3rdparty}/masm/assembler/ARMAssembler.h | 0 .../3rdparty}/masm/assembler/ARMv7Assembler.cpp | 0 .../3rdparty}/masm/assembler/ARMv7Assembler.h | 0 .../masm/assembler/AbstractMacroAssembler.h | 0 .../3rdparty}/masm/assembler/AssemblerBuffer.h | 0 .../assembler/AssemblerBufferWithConstantPool.h | 0 .../3rdparty}/masm/assembler/CodeLocation.h | 0 .../3rdparty}/masm/assembler/LinkBuffer.cpp | 0 .../3rdparty}/masm/assembler/LinkBuffer.h | 0 .../3rdparty}/masm/assembler/MIPSAssembler.h | 0 .../3rdparty}/masm/assembler/MacroAssembler.h | 0 .../3rdparty}/masm/assembler/MacroAssemblerARM.cpp | 0 .../3rdparty}/masm/assembler/MacroAssemblerARM.h | 0 .../3rdparty}/masm/assembler/MacroAssemblerARMv7.h | 0 .../masm/assembler/MacroAssemblerCodeRef.h | 0 .../3rdparty}/masm/assembler/MacroAssemblerMIPS.h | 0 .../3rdparty}/masm/assembler/MacroAssemblerSH4.cpp | 0 .../3rdparty}/masm/assembler/MacroAssemblerSH4.h | 0 .../3rdparty}/masm/assembler/MacroAssemblerX86.h | 0 .../masm/assembler/MacroAssemblerX86Common.h | 0 .../masm/assembler/MacroAssemblerX86_64.h | 0 .../3rdparty}/masm/assembler/RepatchBuffer.h | 0 .../3rdparty}/masm/assembler/SH4Assembler.h | 0 .../3rdparty}/masm/assembler/X86Assembler.h | 0 {3rdparty => src/3rdparty}/masm/config.h | 0 .../3rdparty}/masm/create_regex_tables | 0 .../3rdparty}/masm/disassembler/Disassembler.cpp | 0 .../3rdparty}/masm/disassembler/Disassembler.h | 0 .../masm/disassembler/UDis86Disassembler.cpp | 0 .../masm/disassembler/udis86/differences.txt | 0 .../3rdparty}/masm/disassembler/udis86/itab.py | 0 .../3rdparty}/masm/disassembler/udis86/optable.xml | 0 .../masm/disassembler/udis86/ud_opcode.py | 0 .../masm/disassembler/udis86/ud_optable.py | 0 .../3rdparty}/masm/disassembler/udis86/udis86.c | 0 .../3rdparty}/masm/disassembler/udis86/udis86.h | 0 .../masm/disassembler/udis86/udis86_decode.c | 0 .../masm/disassembler/udis86/udis86_decode.h | 0 .../masm/disassembler/udis86/udis86_extern.h | 0 .../masm/disassembler/udis86/udis86_input.c | 0 .../masm/disassembler/udis86/udis86_input.h | 0 .../masm/disassembler/udis86/udis86_itab_holder.c | 0 .../masm/disassembler/udis86/udis86_syn-att.c | 0 .../masm/disassembler/udis86/udis86_syn-intel.c | 0 .../masm/disassembler/udis86/udis86_syn.c | 0 .../masm/disassembler/udis86/udis86_syn.h | 0 .../masm/disassembler/udis86/udis86_types.h | 0 .../3rdparty}/masm/jit/JITCompilationEffort.h | 0 {3rdparty => src/3rdparty}/masm/masm.pri | 1 + .../3rdparty}/masm/runtime/MatchResult.h | 0 .../3rdparty}/masm/stubs/ExecutableAllocator.h | 0 .../3rdparty}/masm/stubs/JSGlobalData.h | 0 {3rdparty => src/3rdparty}/masm/stubs/LLIntData.h | 0 {3rdparty => src/3rdparty}/masm/stubs/Options.h | 0 {3rdparty => src/3rdparty}/masm/stubs/WTFStubs.cpp | 0 {3rdparty => src/3rdparty}/masm/stubs/WTFStubs.h | 0 .../3rdparty}/masm/stubs/wtf/FastAllocBase.h | 0 .../3rdparty}/masm/stubs/wtf/FastMalloc.h | 0 .../3rdparty}/masm/stubs/wtf/Noncopyable.h | 0 {3rdparty => src/3rdparty}/masm/stubs/wtf/OwnPtr.h | 0 .../3rdparty}/masm/stubs/wtf/PassOwnPtr.h | 0 .../3rdparty}/masm/stubs/wtf/PassRefPtr.h | 0 .../3rdparty}/masm/stubs/wtf/RefCounted.h | 0 {3rdparty => src/3rdparty}/masm/stubs/wtf/RefPtr.h | 0 .../3rdparty}/masm/stubs/wtf/TypeTraits.h | 0 .../3rdparty}/masm/stubs/wtf/UnusedParam.h | 0 {3rdparty => src/3rdparty}/masm/stubs/wtf/Vector.h | 0 .../3rdparty}/masm/stubs/wtf/text/CString.h | 0 .../3rdparty}/masm/stubs/wtf/text/WTFString.h | 0 .../3rdparty}/masm/stubs/wtf/unicode/Unicode.h | 0 {3rdparty => src/3rdparty}/masm/wtf/ASCIICType.h | 0 {3rdparty => src/3rdparty}/masm/wtf/Assertions.h | 0 {3rdparty => src/3rdparty}/masm/wtf/Atomics.h | 0 .../3rdparty}/masm/wtf/BumpPointerAllocator.h | 0 .../3rdparty}/masm/wtf/CheckedArithmetic.h | 0 {3rdparty => src/3rdparty}/masm/wtf/Compiler.h | 0 .../masm/wtf/CryptographicallyRandomNumber.h | 0 {3rdparty => src/3rdparty}/masm/wtf/DataLog.h | 0 .../3rdparty}/masm/wtf/DynamicAnnotations.h | 0 .../3rdparty}/masm/wtf/FilePrintStream.cpp | 0 .../3rdparty}/masm/wtf/FilePrintStream.h | 0 {3rdparty => src/3rdparty}/masm/wtf/Locker.h | 0 {3rdparty => src/3rdparty}/masm/wtf/NotFound.h | 0 {3rdparty => src/3rdparty}/masm/wtf/NullPtr.h | 0 {3rdparty => src/3rdparty}/masm/wtf/OSAllocator.h | 0 .../3rdparty}/masm/wtf/OSAllocatorPosix.cpp | 0 .../3rdparty}/masm/wtf/OSAllocatorWin.cpp | 0 .../3rdparty}/masm/wtf/PageAllocation.h | 0 .../3rdparty}/masm/wtf/PageAllocationAligned.cpp | 0 .../3rdparty}/masm/wtf/PageAllocationAligned.h | 0 {3rdparty => src/3rdparty}/masm/wtf/PageBlock.cpp | 0 {3rdparty => src/3rdparty}/masm/wtf/PageBlock.h | 0 .../3rdparty}/masm/wtf/PageReservation.h | 0 {3rdparty => src/3rdparty}/masm/wtf/Platform.h | 0 {3rdparty => src/3rdparty}/masm/wtf/PossiblyNull.h | 0 .../3rdparty}/masm/wtf/PrintStream.cpp | 0 {3rdparty => src/3rdparty}/masm/wtf/PrintStream.h | 0 {3rdparty => src/3rdparty}/masm/wtf/RawPointer.h | 0 {3rdparty => src/3rdparty}/masm/wtf/StdLibExtras.h | 0 {3rdparty => src/3rdparty}/masm/wtf/VMTags.h | 0 {3rdparty => src/3rdparty}/masm/yarr/Yarr.h | 0 .../3rdparty}/masm/yarr/YarrCanonicalizeUCS2.cpp | 0 .../3rdparty}/masm/yarr/YarrCanonicalizeUCS2.h | 0 .../3rdparty}/masm/yarr/YarrCanonicalizeUCS2.js | 0 .../3rdparty}/masm/yarr/YarrInterpreter.cpp | 0 .../3rdparty}/masm/yarr/YarrInterpreter.h | 0 {3rdparty => src/3rdparty}/masm/yarr/YarrJIT.cpp | 0 {3rdparty => src/3rdparty}/masm/yarr/YarrJIT.h | 0 {3rdparty => src/3rdparty}/masm/yarr/YarrParser.h | 0 .../3rdparty}/masm/yarr/YarrPattern.cpp | 0 {3rdparty => src/3rdparty}/masm/yarr/YarrPattern.h | 0 .../3rdparty}/masm/yarr/YarrSyntaxChecker.cpp | 0 .../3rdparty}/masm/yarr/YarrSyntaxChecker.h | 0 {3rdparty => src/3rdparty}/masm/yarr/yarr.pri | 0 src/src.pro | 3 ++ main.cpp => src/tools/main.cpp | 38 ++++++++--------- src/tools/tools.pro | 17 ++++++++ debugging.cpp => src/v4/debugging.cpp | 0 debugging.h => src/v4/debugging.h | 3 +- llvm_runtime.cpp => src/v4/llvm_runtime.cpp | 0 {moth => src/v4/moth}/moth.pri | 0 {moth => src/v4/moth}/qv4instr_moth.cpp | 0 {moth => src/v4/moth}/qv4instr_moth_p.h | 0 {moth => src/v4/moth}/qv4isel_moth.cpp | 0 {moth => src/v4/moth}/qv4isel_moth_p.h | 5 ++- {moth => src/v4/moth}/qv4vme_moth.cpp | 0 {moth => src/v4/moth}/qv4vme_moth_p.h | 0 qmljs_engine.cpp => src/v4/qmljs_engine.cpp | 0 qmljs_engine.h => src/v4/qmljs_engine.h | 9 ++-- .../v4/qmljs_environment.cpp | 0 qmljs_environment.h => src/v4/qmljs_environment.h | 3 +- qmljs_math.h => src/v4/qmljs_math.h | 0 qmljs_runtime.cpp => src/v4/qmljs_runtime.cpp | 5 ++- qmljs_runtime.h => src/v4/qmljs_runtime.h | 5 ++- qmljs_value.cpp => src/v4/qmljs_value.cpp | 0 qmljs_value.h => src/v4/qmljs_value.h | 9 ++-- qv4_llvm_p.h => src/v4/qv4_llvm_p.h | 3 +- .../v4/qv4argumentsobject.cpp | 0 .../v4/qv4argumentsobject.h | 0 qv4array.cpp => src/v4/qv4array.cpp | 0 qv4array.h => src/v4/qv4array.h | 3 +- qv4arrayobject.cpp => src/v4/qv4arrayobject.cpp | 0 qv4arrayobject.h => src/v4/qv4arrayobject.h | 0 .../v4/qv4booleanobject.cpp | 0 qv4booleanobject.h => src/v4/qv4booleanobject.h | 0 qv4codegen.cpp => src/v4/qv4codegen.cpp | 0 qv4codegen_p.h => src/v4/qv4codegen_p.h | 3 +- qv4dateobject.cpp => src/v4/qv4dateobject.cpp | 0 qv4dateobject.h => src/v4/qv4dateobject.h | 0 qv4errorobject.cpp => src/v4/qv4errorobject.cpp | 0 qv4errorobject.h => src/v4/qv4errorobject.h | 0 .../v4/qv4functionobject.cpp | 0 qv4functionobject.h => src/v4/qv4functionobject.h | 6 ++- src/v4/qv4global.h | 49 ++++++++++++++++++++++ qv4globalobject.cpp => src/v4/qv4globalobject.cpp | 0 qv4globalobject.h => src/v4/qv4globalobject.h | 3 +- qv4ir.cpp => src/v4/qv4ir.cpp | 0 qv4ir_p.h => src/v4/qv4ir_p.h | 6 +-- qv4isel_llvm.cpp => src/v4/qv4isel_llvm.cpp | 3 +- qv4isel_llvm_p.h => src/v4/qv4isel_llvm_p.h | 0 qv4isel_masm.cpp => src/v4/qv4isel_masm.cpp | 0 qv4isel_masm_p.h => src/v4/qv4isel_masm_p.h | 5 ++- qv4isel_p.cpp => src/v4/qv4isel_p.cpp | 0 qv4isel_p.h => src/v4/qv4isel_p.h | 7 ++-- qv4isel_util_p.h => src/v4/qv4isel_util_p.h | 0 qv4jsonobject.cpp => src/v4/qv4jsonobject.cpp | 0 qv4jsonobject.h => src/v4/qv4jsonobject.h | 0 qv4managed.cpp => src/v4/qv4managed.cpp | 0 qv4managed.h => src/v4/qv4managed.h | 3 +- qv4mathobject.cpp => src/v4/qv4mathobject.cpp | 0 qv4mathobject.h => src/v4/qv4mathobject.h | 0 qv4mm.cpp => src/v4/qv4mm.cpp | 0 qv4mm.h => src/v4/qv4mm.h | 3 +- qv4numberobject.cpp => src/v4/qv4numberobject.cpp | 0 qv4numberobject.h => src/v4/qv4numberobject.h | 0 qv4object.cpp => src/v4/qv4object.cpp | 0 qv4object.h => src/v4/qv4object.h | 3 +- .../v4/qv4objectiterator.cpp | 0 qv4objectiterator.h => src/v4/qv4objectiterator.h | 0 qv4objectproto.cpp => src/v4/qv4objectproto.cpp | 0 qv4objectproto.h => src/v4/qv4objectproto.h | 0 .../v4/qv4propertydescriptor.h | 0 qv4propertytable.h => src/v4/qv4propertytable.h | 0 qv4regexp.cpp => src/v4/qv4regexp.cpp | 0 qv4regexp.h => src/v4/qv4regexp.h | 0 qv4regexpobject.cpp => src/v4/qv4regexpobject.cpp | 0 qv4regexpobject.h => src/v4/qv4regexpobject.h | 0 qv4string.cpp => src/v4/qv4string.cpp | 0 qv4string.h => src/v4/qv4string.h | 0 qv4stringobject.cpp => src/v4/qv4stringobject.cpp | 0 qv4stringobject.h => src/v4/qv4stringobject.h | 0 .../v4/qv4syntaxchecker.cpp | 0 .../v4/qv4syntaxchecker_p.h | 0 v4.pro => src/v4/v4.pro | 26 ++++++++---- sync.profile | 20 +++++++++ v4vm.pro | 2 + 219 files changed, 183 insertions(+), 62 deletions(-) create mode 100644 .qmake.conf rename {3rdparty => src/3rdparty}/double-conversion/README (100%) rename {3rdparty => src/3rdparty}/double-conversion/bignum-dtoa.cc (100%) rename {3rdparty => src/3rdparty}/double-conversion/bignum-dtoa.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/bignum.cc (100%) rename {3rdparty => src/3rdparty}/double-conversion/bignum.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/cached-powers.cc (100%) rename {3rdparty => src/3rdparty}/double-conversion/cached-powers.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/diy-fp.cc (100%) rename {3rdparty => src/3rdparty}/double-conversion/diy-fp.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/double-conversion.cc (100%) rename {3rdparty => src/3rdparty}/double-conversion/double-conversion.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/double-conversion.pri (74%) rename {3rdparty => src/3rdparty}/double-conversion/fast-dtoa.cc (100%) rename {3rdparty => src/3rdparty}/double-conversion/fast-dtoa.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/fixed-dtoa.cc (100%) rename {3rdparty => src/3rdparty}/double-conversion/fixed-dtoa.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/ieee.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/strtod.cc (100%) rename {3rdparty => src/3rdparty}/double-conversion/strtod.h (100%) rename {3rdparty => src/3rdparty}/double-conversion/utils.h (100%) rename {3rdparty => src/3rdparty}/masm/WeakRandom.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/ARMAssembler.cpp (100%) rename {3rdparty => src/3rdparty}/masm/assembler/ARMAssembler.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/ARMv7Assembler.cpp (100%) rename {3rdparty => src/3rdparty}/masm/assembler/ARMv7Assembler.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/AbstractMacroAssembler.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/AssemblerBuffer.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/AssemblerBufferWithConstantPool.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/CodeLocation.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/LinkBuffer.cpp (100%) rename {3rdparty => src/3rdparty}/masm/assembler/LinkBuffer.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MIPSAssembler.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssembler.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerARM.cpp (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerARM.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerARMv7.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerCodeRef.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerMIPS.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerSH4.cpp (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerSH4.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerX86.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerX86Common.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/MacroAssemblerX86_64.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/RepatchBuffer.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/SH4Assembler.h (100%) rename {3rdparty => src/3rdparty}/masm/assembler/X86Assembler.h (100%) rename {3rdparty => src/3rdparty}/masm/config.h (100%) rename {3rdparty => src/3rdparty}/masm/create_regex_tables (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/Disassembler.cpp (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/Disassembler.h (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/UDis86Disassembler.cpp (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/differences.txt (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/itab.py (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/optable.xml (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/ud_opcode.py (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/ud_optable.py (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86.c (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86.h (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_decode.c (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_decode.h (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_extern.h (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_input.c (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_input.h (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_itab_holder.c (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_syn-att.c (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_syn-intel.c (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_syn.c (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_syn.h (100%) rename {3rdparty => src/3rdparty}/masm/disassembler/udis86/udis86_types.h (100%) rename {3rdparty => src/3rdparty}/masm/jit/JITCompilationEffort.h (100%) rename {3rdparty => src/3rdparty}/masm/masm.pri (99%) rename {3rdparty => src/3rdparty}/masm/runtime/MatchResult.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/ExecutableAllocator.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/JSGlobalData.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/LLIntData.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/Options.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/WTFStubs.cpp (100%) rename {3rdparty => src/3rdparty}/masm/stubs/WTFStubs.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/FastAllocBase.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/FastMalloc.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/Noncopyable.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/OwnPtr.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/PassOwnPtr.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/PassRefPtr.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/RefCounted.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/RefPtr.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/TypeTraits.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/UnusedParam.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/Vector.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/text/CString.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/text/WTFString.h (100%) rename {3rdparty => src/3rdparty}/masm/stubs/wtf/unicode/Unicode.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/ASCIICType.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/Assertions.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/Atomics.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/BumpPointerAllocator.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/CheckedArithmetic.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/Compiler.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/CryptographicallyRandomNumber.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/DataLog.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/DynamicAnnotations.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/FilePrintStream.cpp (100%) rename {3rdparty => src/3rdparty}/masm/wtf/FilePrintStream.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/Locker.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/NotFound.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/NullPtr.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/OSAllocator.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/OSAllocatorPosix.cpp (100%) rename {3rdparty => src/3rdparty}/masm/wtf/OSAllocatorWin.cpp (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PageAllocation.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PageAllocationAligned.cpp (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PageAllocationAligned.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PageBlock.cpp (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PageBlock.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PageReservation.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/Platform.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PossiblyNull.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PrintStream.cpp (100%) rename {3rdparty => src/3rdparty}/masm/wtf/PrintStream.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/RawPointer.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/StdLibExtras.h (100%) rename {3rdparty => src/3rdparty}/masm/wtf/VMTags.h (100%) rename {3rdparty => src/3rdparty}/masm/yarr/Yarr.h (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrCanonicalizeUCS2.cpp (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrCanonicalizeUCS2.h (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrCanonicalizeUCS2.js (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrInterpreter.cpp (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrInterpreter.h (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrJIT.cpp (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrJIT.h (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrParser.h (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrPattern.cpp (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrPattern.h (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrSyntaxChecker.cpp (100%) rename {3rdparty => src/3rdparty}/masm/yarr/YarrSyntaxChecker.h (100%) rename {3rdparty => src/3rdparty}/masm/yarr/yarr.pri (100%) create mode 100644 src/src.pro rename main.cpp => src/tools/main.cpp (95%) create mode 100644 src/tools/tools.pro rename debugging.cpp => src/v4/debugging.cpp (100%) rename debugging.h => src/v4/debugging.h (98%) rename llvm_runtime.cpp => src/v4/llvm_runtime.cpp (100%) rename {moth => src/v4/moth}/moth.pri (100%) rename {moth => src/v4/moth}/qv4instr_moth.cpp (100%) rename {moth => src/v4/moth}/qv4instr_moth_p.h (100%) rename {moth => src/v4/moth}/qv4isel_moth.cpp (100%) rename {moth => src/v4/moth}/qv4isel_moth_p.h (98%) rename {moth => src/v4/moth}/qv4vme_moth.cpp (100%) rename {moth => src/v4/moth}/qv4vme_moth_p.h (100%) rename qmljs_engine.cpp => src/v4/qmljs_engine.cpp (100%) rename qmljs_engine.h => src/v4/qmljs_engine.h (98%) rename qmljs_environment.cpp => src/v4/qmljs_environment.cpp (100%) rename qmljs_environment.h => src/v4/qmljs_environment.h (98%) rename qmljs_math.h => src/v4/qmljs_math.h (100%) rename qmljs_runtime.cpp => src/v4/qmljs_runtime.cpp (99%) rename qmljs_runtime.h => src/v4/qmljs_runtime.h (99%) rename qmljs_value.cpp => src/v4/qmljs_value.cpp (100%) rename qmljs_value.h => src/v4/qmljs_value.h (99%) rename qv4_llvm_p.h => src/v4/qv4_llvm_p.h (92%) rename qv4argumentsobject.cpp => src/v4/qv4argumentsobject.cpp (100%) rename qv4argumentsobject.h => src/v4/qv4argumentsobject.h (100%) rename qv4array.cpp => src/v4/qv4array.cpp (100%) rename qv4array.h => src/v4/qv4array.h (99%) rename qv4arrayobject.cpp => src/v4/qv4arrayobject.cpp (100%) rename qv4arrayobject.h => src/v4/qv4arrayobject.h (100%) rename qv4booleanobject.cpp => src/v4/qv4booleanobject.cpp (100%) rename qv4booleanobject.h => src/v4/qv4booleanobject.h (100%) rename qv4codegen.cpp => src/v4/qv4codegen.cpp (100%) rename qv4codegen_p.h => src/v4/qv4codegen_p.h (99%) rename qv4dateobject.cpp => src/v4/qv4dateobject.cpp (100%) rename qv4dateobject.h => src/v4/qv4dateobject.h (100%) rename qv4errorobject.cpp => src/v4/qv4errorobject.cpp (100%) rename qv4errorobject.h => src/v4/qv4errorobject.h (100%) rename qv4functionobject.cpp => src/v4/qv4functionobject.cpp (100%) rename qv4functionobject.h => src/v4/qv4functionobject.h (98%) create mode 100644 src/v4/qv4global.h rename qv4globalobject.cpp => src/v4/qv4globalobject.cpp (100%) rename qv4globalobject.h => src/v4/qv4globalobject.h (98%) rename qv4ir.cpp => src/v4/qv4ir.cpp (100%) rename qv4ir_p.h => src/v4/qv4ir_p.h (99%) rename qv4isel_llvm.cpp => src/v4/qv4isel_llvm.cpp (99%) rename qv4isel_llvm_p.h => src/v4/qv4isel_llvm_p.h (100%) rename qv4isel_masm.cpp => src/v4/qv4isel_masm.cpp (100%) rename qv4isel_masm_p.h => src/v4/qv4isel_masm_p.h (99%) rename qv4isel_p.cpp => src/v4/qv4isel_p.cpp (100%) rename qv4isel_p.h => src/v4/qv4isel_p.h (97%) rename qv4isel_util_p.h => src/v4/qv4isel_util_p.h (100%) rename qv4jsonobject.cpp => src/v4/qv4jsonobject.cpp (100%) rename qv4jsonobject.h => src/v4/qv4jsonobject.h (100%) rename qv4managed.cpp => src/v4/qv4managed.cpp (100%) rename qv4managed.h => src/v4/qv4managed.h (99%) rename qv4mathobject.cpp => src/v4/qv4mathobject.cpp (100%) rename qv4mathobject.h => src/v4/qv4mathobject.h (100%) rename qv4mm.cpp => src/v4/qv4mm.cpp (100%) rename qv4mm.h => src/v4/qv4mm.h (98%) rename qv4numberobject.cpp => src/v4/qv4numberobject.cpp (100%) rename qv4numberobject.h => src/v4/qv4numberobject.h (100%) rename qv4object.cpp => src/v4/qv4object.cpp (100%) rename qv4object.h => src/v4/qv4object.h (99%) rename qv4objectiterator.cpp => src/v4/qv4objectiterator.cpp (100%) rename qv4objectiterator.h => src/v4/qv4objectiterator.h (100%) rename qv4objectproto.cpp => src/v4/qv4objectproto.cpp (100%) rename qv4objectproto.h => src/v4/qv4objectproto.h (100%) rename qv4propertydescriptor.h => src/v4/qv4propertydescriptor.h (100%) rename qv4propertytable.h => src/v4/qv4propertytable.h (100%) rename qv4regexp.cpp => src/v4/qv4regexp.cpp (100%) rename qv4regexp.h => src/v4/qv4regexp.h (100%) rename qv4regexpobject.cpp => src/v4/qv4regexpobject.cpp (100%) rename qv4regexpobject.h => src/v4/qv4regexpobject.h (100%) rename qv4string.cpp => src/v4/qv4string.cpp (100%) rename qv4string.h => src/v4/qv4string.h (100%) rename qv4stringobject.cpp => src/v4/qv4stringobject.cpp (100%) rename qv4stringobject.h => src/v4/qv4stringobject.h (100%) rename qv4syntaxchecker.cpp => src/v4/qv4syntaxchecker.cpp (100%) rename qv4syntaxchecker_p.h => src/v4/qv4syntaxchecker_p.h (100%) rename v4.pro => src/v4/v4.pro (89%) create mode 100644 sync.profile create mode 100644 v4vm.pro diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 0000000..42ba8e4 --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) diff --git a/3rdparty/double-conversion/README b/src/3rdparty/double-conversion/README similarity index 100% rename from 3rdparty/double-conversion/README rename to src/3rdparty/double-conversion/README diff --git a/3rdparty/double-conversion/bignum-dtoa.cc b/src/3rdparty/double-conversion/bignum-dtoa.cc similarity index 100% rename from 3rdparty/double-conversion/bignum-dtoa.cc rename to src/3rdparty/double-conversion/bignum-dtoa.cc diff --git a/3rdparty/double-conversion/bignum-dtoa.h b/src/3rdparty/double-conversion/bignum-dtoa.h similarity index 100% rename from 3rdparty/double-conversion/bignum-dtoa.h rename to src/3rdparty/double-conversion/bignum-dtoa.h diff --git a/3rdparty/double-conversion/bignum.cc b/src/3rdparty/double-conversion/bignum.cc similarity index 100% rename from 3rdparty/double-conversion/bignum.cc rename to src/3rdparty/double-conversion/bignum.cc diff --git a/3rdparty/double-conversion/bignum.h b/src/3rdparty/double-conversion/bignum.h similarity index 100% rename from 3rdparty/double-conversion/bignum.h rename to src/3rdparty/double-conversion/bignum.h diff --git a/3rdparty/double-conversion/cached-powers.cc b/src/3rdparty/double-conversion/cached-powers.cc similarity index 100% rename from 3rdparty/double-conversion/cached-powers.cc rename to src/3rdparty/double-conversion/cached-powers.cc diff --git a/3rdparty/double-conversion/cached-powers.h b/src/3rdparty/double-conversion/cached-powers.h similarity index 100% rename from 3rdparty/double-conversion/cached-powers.h rename to src/3rdparty/double-conversion/cached-powers.h diff --git a/3rdparty/double-conversion/diy-fp.cc b/src/3rdparty/double-conversion/diy-fp.cc similarity index 100% rename from 3rdparty/double-conversion/diy-fp.cc rename to src/3rdparty/double-conversion/diy-fp.cc diff --git a/3rdparty/double-conversion/diy-fp.h b/src/3rdparty/double-conversion/diy-fp.h similarity index 100% rename from 3rdparty/double-conversion/diy-fp.h rename to src/3rdparty/double-conversion/diy-fp.h diff --git a/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc similarity index 100% rename from 3rdparty/double-conversion/double-conversion.cc rename to src/3rdparty/double-conversion/double-conversion.cc diff --git a/3rdparty/double-conversion/double-conversion.h b/src/3rdparty/double-conversion/double-conversion.h similarity index 100% rename from 3rdparty/double-conversion/double-conversion.h rename to src/3rdparty/double-conversion/double-conversion.h diff --git a/3rdparty/double-conversion/double-conversion.pri b/src/3rdparty/double-conversion/double-conversion.pri similarity index 74% rename from 3rdparty/double-conversion/double-conversion.pri rename to src/3rdparty/double-conversion/double-conversion.pri index 9a9a2b8..8bb37c6 100644 --- a/3rdparty/double-conversion/double-conversion.pri +++ b/src/3rdparty/double-conversion/double-conversion.pri @@ -1,3 +1,4 @@ +INCLUDEPATH += $PWD VPATH += $$PWD SOURCES += $$PWD/*.cc HEADERS += $$PWD/*.h diff --git a/3rdparty/double-conversion/fast-dtoa.cc b/src/3rdparty/double-conversion/fast-dtoa.cc similarity index 100% rename from 3rdparty/double-conversion/fast-dtoa.cc rename to src/3rdparty/double-conversion/fast-dtoa.cc diff --git a/3rdparty/double-conversion/fast-dtoa.h b/src/3rdparty/double-conversion/fast-dtoa.h similarity index 100% rename from 3rdparty/double-conversion/fast-dtoa.h rename to src/3rdparty/double-conversion/fast-dtoa.h diff --git a/3rdparty/double-conversion/fixed-dtoa.cc b/src/3rdparty/double-conversion/fixed-dtoa.cc similarity index 100% rename from 3rdparty/double-conversion/fixed-dtoa.cc rename to src/3rdparty/double-conversion/fixed-dtoa.cc diff --git a/3rdparty/double-conversion/fixed-dtoa.h b/src/3rdparty/double-conversion/fixed-dtoa.h similarity index 100% rename from 3rdparty/double-conversion/fixed-dtoa.h rename to src/3rdparty/double-conversion/fixed-dtoa.h diff --git a/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/ieee.h similarity index 100% rename from 3rdparty/double-conversion/ieee.h rename to src/3rdparty/double-conversion/ieee.h diff --git a/3rdparty/double-conversion/strtod.cc b/src/3rdparty/double-conversion/strtod.cc similarity index 100% rename from 3rdparty/double-conversion/strtod.cc rename to src/3rdparty/double-conversion/strtod.cc diff --git a/3rdparty/double-conversion/strtod.h b/src/3rdparty/double-conversion/strtod.h similarity index 100% rename from 3rdparty/double-conversion/strtod.h rename to src/3rdparty/double-conversion/strtod.h diff --git a/3rdparty/double-conversion/utils.h b/src/3rdparty/double-conversion/utils.h similarity index 100% rename from 3rdparty/double-conversion/utils.h rename to src/3rdparty/double-conversion/utils.h diff --git a/3rdparty/masm/WeakRandom.h b/src/3rdparty/masm/WeakRandom.h similarity index 100% rename from 3rdparty/masm/WeakRandom.h rename to src/3rdparty/masm/WeakRandom.h diff --git a/3rdparty/masm/assembler/ARMAssembler.cpp b/src/3rdparty/masm/assembler/ARMAssembler.cpp similarity index 100% rename from 3rdparty/masm/assembler/ARMAssembler.cpp rename to src/3rdparty/masm/assembler/ARMAssembler.cpp diff --git a/3rdparty/masm/assembler/ARMAssembler.h b/src/3rdparty/masm/assembler/ARMAssembler.h similarity index 100% rename from 3rdparty/masm/assembler/ARMAssembler.h rename to src/3rdparty/masm/assembler/ARMAssembler.h diff --git a/3rdparty/masm/assembler/ARMv7Assembler.cpp b/src/3rdparty/masm/assembler/ARMv7Assembler.cpp similarity index 100% rename from 3rdparty/masm/assembler/ARMv7Assembler.cpp rename to src/3rdparty/masm/assembler/ARMv7Assembler.cpp diff --git a/3rdparty/masm/assembler/ARMv7Assembler.h b/src/3rdparty/masm/assembler/ARMv7Assembler.h similarity index 100% rename from 3rdparty/masm/assembler/ARMv7Assembler.h rename to src/3rdparty/masm/assembler/ARMv7Assembler.h diff --git a/3rdparty/masm/assembler/AbstractMacroAssembler.h b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h similarity index 100% rename from 3rdparty/masm/assembler/AbstractMacroAssembler.h rename to src/3rdparty/masm/assembler/AbstractMacroAssembler.h diff --git a/3rdparty/masm/assembler/AssemblerBuffer.h b/src/3rdparty/masm/assembler/AssemblerBuffer.h similarity index 100% rename from 3rdparty/masm/assembler/AssemblerBuffer.h rename to src/3rdparty/masm/assembler/AssemblerBuffer.h diff --git a/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h b/src/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h similarity index 100% rename from 3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h rename to src/3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h diff --git a/3rdparty/masm/assembler/CodeLocation.h b/src/3rdparty/masm/assembler/CodeLocation.h similarity index 100% rename from 3rdparty/masm/assembler/CodeLocation.h rename to src/3rdparty/masm/assembler/CodeLocation.h diff --git a/3rdparty/masm/assembler/LinkBuffer.cpp b/src/3rdparty/masm/assembler/LinkBuffer.cpp similarity index 100% rename from 3rdparty/masm/assembler/LinkBuffer.cpp rename to src/3rdparty/masm/assembler/LinkBuffer.cpp diff --git a/3rdparty/masm/assembler/LinkBuffer.h b/src/3rdparty/masm/assembler/LinkBuffer.h similarity index 100% rename from 3rdparty/masm/assembler/LinkBuffer.h rename to src/3rdparty/masm/assembler/LinkBuffer.h diff --git a/3rdparty/masm/assembler/MIPSAssembler.h b/src/3rdparty/masm/assembler/MIPSAssembler.h similarity index 100% rename from 3rdparty/masm/assembler/MIPSAssembler.h rename to src/3rdparty/masm/assembler/MIPSAssembler.h diff --git a/3rdparty/masm/assembler/MacroAssembler.h b/src/3rdparty/masm/assembler/MacroAssembler.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssembler.h rename to src/3rdparty/masm/assembler/MacroAssembler.h diff --git a/3rdparty/masm/assembler/MacroAssemblerARM.cpp b/src/3rdparty/masm/assembler/MacroAssemblerARM.cpp similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerARM.cpp rename to src/3rdparty/masm/assembler/MacroAssemblerARM.cpp diff --git a/3rdparty/masm/assembler/MacroAssemblerARM.h b/src/3rdparty/masm/assembler/MacroAssemblerARM.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerARM.h rename to src/3rdparty/masm/assembler/MacroAssemblerARM.h diff --git a/3rdparty/masm/assembler/MacroAssemblerARMv7.h b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerARMv7.h rename to src/3rdparty/masm/assembler/MacroAssemblerARMv7.h diff --git a/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerCodeRef.h rename to src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h diff --git a/3rdparty/masm/assembler/MacroAssemblerMIPS.h b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerMIPS.h rename to src/3rdparty/masm/assembler/MacroAssemblerMIPS.h diff --git a/3rdparty/masm/assembler/MacroAssemblerSH4.cpp b/src/3rdparty/masm/assembler/MacroAssemblerSH4.cpp similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerSH4.cpp rename to src/3rdparty/masm/assembler/MacroAssemblerSH4.cpp diff --git a/3rdparty/masm/assembler/MacroAssemblerSH4.h b/src/3rdparty/masm/assembler/MacroAssemblerSH4.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerSH4.h rename to src/3rdparty/masm/assembler/MacroAssemblerSH4.h diff --git a/3rdparty/masm/assembler/MacroAssemblerX86.h b/src/3rdparty/masm/assembler/MacroAssemblerX86.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerX86.h rename to src/3rdparty/masm/assembler/MacroAssemblerX86.h diff --git a/3rdparty/masm/assembler/MacroAssemblerX86Common.h b/src/3rdparty/masm/assembler/MacroAssemblerX86Common.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerX86Common.h rename to src/3rdparty/masm/assembler/MacroAssemblerX86Common.h diff --git a/3rdparty/masm/assembler/MacroAssemblerX86_64.h b/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h similarity index 100% rename from 3rdparty/masm/assembler/MacroAssemblerX86_64.h rename to src/3rdparty/masm/assembler/MacroAssemblerX86_64.h diff --git a/3rdparty/masm/assembler/RepatchBuffer.h b/src/3rdparty/masm/assembler/RepatchBuffer.h similarity index 100% rename from 3rdparty/masm/assembler/RepatchBuffer.h rename to src/3rdparty/masm/assembler/RepatchBuffer.h diff --git a/3rdparty/masm/assembler/SH4Assembler.h b/src/3rdparty/masm/assembler/SH4Assembler.h similarity index 100% rename from 3rdparty/masm/assembler/SH4Assembler.h rename to src/3rdparty/masm/assembler/SH4Assembler.h diff --git a/3rdparty/masm/assembler/X86Assembler.h b/src/3rdparty/masm/assembler/X86Assembler.h similarity index 100% rename from 3rdparty/masm/assembler/X86Assembler.h rename to src/3rdparty/masm/assembler/X86Assembler.h diff --git a/3rdparty/masm/config.h b/src/3rdparty/masm/config.h similarity index 100% rename from 3rdparty/masm/config.h rename to src/3rdparty/masm/config.h diff --git a/3rdparty/masm/create_regex_tables b/src/3rdparty/masm/create_regex_tables similarity index 100% rename from 3rdparty/masm/create_regex_tables rename to src/3rdparty/masm/create_regex_tables diff --git a/3rdparty/masm/disassembler/Disassembler.cpp b/src/3rdparty/masm/disassembler/Disassembler.cpp similarity index 100% rename from 3rdparty/masm/disassembler/Disassembler.cpp rename to src/3rdparty/masm/disassembler/Disassembler.cpp diff --git a/3rdparty/masm/disassembler/Disassembler.h b/src/3rdparty/masm/disassembler/Disassembler.h similarity index 100% rename from 3rdparty/masm/disassembler/Disassembler.h rename to src/3rdparty/masm/disassembler/Disassembler.h diff --git a/3rdparty/masm/disassembler/UDis86Disassembler.cpp b/src/3rdparty/masm/disassembler/UDis86Disassembler.cpp similarity index 100% rename from 3rdparty/masm/disassembler/UDis86Disassembler.cpp rename to src/3rdparty/masm/disassembler/UDis86Disassembler.cpp diff --git a/3rdparty/masm/disassembler/udis86/differences.txt b/src/3rdparty/masm/disassembler/udis86/differences.txt similarity index 100% rename from 3rdparty/masm/disassembler/udis86/differences.txt rename to src/3rdparty/masm/disassembler/udis86/differences.txt diff --git a/3rdparty/masm/disassembler/udis86/itab.py b/src/3rdparty/masm/disassembler/udis86/itab.py similarity index 100% rename from 3rdparty/masm/disassembler/udis86/itab.py rename to src/3rdparty/masm/disassembler/udis86/itab.py diff --git a/3rdparty/masm/disassembler/udis86/optable.xml b/src/3rdparty/masm/disassembler/udis86/optable.xml similarity index 100% rename from 3rdparty/masm/disassembler/udis86/optable.xml rename to src/3rdparty/masm/disassembler/udis86/optable.xml diff --git a/3rdparty/masm/disassembler/udis86/ud_opcode.py b/src/3rdparty/masm/disassembler/udis86/ud_opcode.py similarity index 100% rename from 3rdparty/masm/disassembler/udis86/ud_opcode.py rename to src/3rdparty/masm/disassembler/udis86/ud_opcode.py diff --git a/3rdparty/masm/disassembler/udis86/ud_optable.py b/src/3rdparty/masm/disassembler/udis86/ud_optable.py similarity index 100% rename from 3rdparty/masm/disassembler/udis86/ud_optable.py rename to src/3rdparty/masm/disassembler/udis86/ud_optable.py diff --git a/3rdparty/masm/disassembler/udis86/udis86.c b/src/3rdparty/masm/disassembler/udis86/udis86.c similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86.c rename to src/3rdparty/masm/disassembler/udis86/udis86.c diff --git a/3rdparty/masm/disassembler/udis86/udis86.h b/src/3rdparty/masm/disassembler/udis86/udis86.h similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86.h rename to src/3rdparty/masm/disassembler/udis86/udis86.h diff --git a/3rdparty/masm/disassembler/udis86/udis86_decode.c b/src/3rdparty/masm/disassembler/udis86/udis86_decode.c similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_decode.c rename to src/3rdparty/masm/disassembler/udis86/udis86_decode.c diff --git a/3rdparty/masm/disassembler/udis86/udis86_decode.h b/src/3rdparty/masm/disassembler/udis86/udis86_decode.h similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_decode.h rename to src/3rdparty/masm/disassembler/udis86/udis86_decode.h diff --git a/3rdparty/masm/disassembler/udis86/udis86_extern.h b/src/3rdparty/masm/disassembler/udis86/udis86_extern.h similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_extern.h rename to src/3rdparty/masm/disassembler/udis86/udis86_extern.h diff --git a/3rdparty/masm/disassembler/udis86/udis86_input.c b/src/3rdparty/masm/disassembler/udis86/udis86_input.c similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_input.c rename to src/3rdparty/masm/disassembler/udis86/udis86_input.c diff --git a/3rdparty/masm/disassembler/udis86/udis86_input.h b/src/3rdparty/masm/disassembler/udis86/udis86_input.h similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_input.h rename to src/3rdparty/masm/disassembler/udis86/udis86_input.h diff --git a/3rdparty/masm/disassembler/udis86/udis86_itab_holder.c b/src/3rdparty/masm/disassembler/udis86/udis86_itab_holder.c similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_itab_holder.c rename to src/3rdparty/masm/disassembler/udis86/udis86_itab_holder.c diff --git a/3rdparty/masm/disassembler/udis86/udis86_syn-att.c b/src/3rdparty/masm/disassembler/udis86/udis86_syn-att.c similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_syn-att.c rename to src/3rdparty/masm/disassembler/udis86/udis86_syn-att.c diff --git a/3rdparty/masm/disassembler/udis86/udis86_syn-intel.c b/src/3rdparty/masm/disassembler/udis86/udis86_syn-intel.c similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_syn-intel.c rename to src/3rdparty/masm/disassembler/udis86/udis86_syn-intel.c diff --git a/3rdparty/masm/disassembler/udis86/udis86_syn.c b/src/3rdparty/masm/disassembler/udis86/udis86_syn.c similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_syn.c rename to src/3rdparty/masm/disassembler/udis86/udis86_syn.c diff --git a/3rdparty/masm/disassembler/udis86/udis86_syn.h b/src/3rdparty/masm/disassembler/udis86/udis86_syn.h similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_syn.h rename to src/3rdparty/masm/disassembler/udis86/udis86_syn.h diff --git a/3rdparty/masm/disassembler/udis86/udis86_types.h b/src/3rdparty/masm/disassembler/udis86/udis86_types.h similarity index 100% rename from 3rdparty/masm/disassembler/udis86/udis86_types.h rename to src/3rdparty/masm/disassembler/udis86/udis86_types.h diff --git a/3rdparty/masm/jit/JITCompilationEffort.h b/src/3rdparty/masm/jit/JITCompilationEffort.h similarity index 100% rename from 3rdparty/masm/jit/JITCompilationEffort.h rename to src/3rdparty/masm/jit/JITCompilationEffort.h diff --git a/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri similarity index 99% rename from 3rdparty/masm/masm.pri rename to src/3rdparty/masm/masm.pri index a6d11f6..92ad32d 100644 --- a/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -6,6 +6,7 @@ SOURCES += $$PWD/assembler/MacroAssemblerARM.cpp SOURCES += $$PWD/assembler/MacroAssemblerSH4.cpp SOURCES += $$PWD/assembler/LinkBuffer.cpp +HEADERS += $$PWD/wtf/*.h SOURCES += $$PWD/wtf/PrintStream.cpp HEADERS += $$PWD/wtf/PrintStream.h diff --git a/3rdparty/masm/runtime/MatchResult.h b/src/3rdparty/masm/runtime/MatchResult.h similarity index 100% rename from 3rdparty/masm/runtime/MatchResult.h rename to src/3rdparty/masm/runtime/MatchResult.h diff --git a/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h similarity index 100% rename from 3rdparty/masm/stubs/ExecutableAllocator.h rename to src/3rdparty/masm/stubs/ExecutableAllocator.h diff --git a/3rdparty/masm/stubs/JSGlobalData.h b/src/3rdparty/masm/stubs/JSGlobalData.h similarity index 100% rename from 3rdparty/masm/stubs/JSGlobalData.h rename to src/3rdparty/masm/stubs/JSGlobalData.h diff --git a/3rdparty/masm/stubs/LLIntData.h b/src/3rdparty/masm/stubs/LLIntData.h similarity index 100% rename from 3rdparty/masm/stubs/LLIntData.h rename to src/3rdparty/masm/stubs/LLIntData.h diff --git a/3rdparty/masm/stubs/Options.h b/src/3rdparty/masm/stubs/Options.h similarity index 100% rename from 3rdparty/masm/stubs/Options.h rename to src/3rdparty/masm/stubs/Options.h diff --git a/3rdparty/masm/stubs/WTFStubs.cpp b/src/3rdparty/masm/stubs/WTFStubs.cpp similarity index 100% rename from 3rdparty/masm/stubs/WTFStubs.cpp rename to src/3rdparty/masm/stubs/WTFStubs.cpp diff --git a/3rdparty/masm/stubs/WTFStubs.h b/src/3rdparty/masm/stubs/WTFStubs.h similarity index 100% rename from 3rdparty/masm/stubs/WTFStubs.h rename to src/3rdparty/masm/stubs/WTFStubs.h diff --git a/3rdparty/masm/stubs/wtf/FastAllocBase.h b/src/3rdparty/masm/stubs/wtf/FastAllocBase.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/FastAllocBase.h rename to src/3rdparty/masm/stubs/wtf/FastAllocBase.h diff --git a/3rdparty/masm/stubs/wtf/FastMalloc.h b/src/3rdparty/masm/stubs/wtf/FastMalloc.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/FastMalloc.h rename to src/3rdparty/masm/stubs/wtf/FastMalloc.h diff --git a/3rdparty/masm/stubs/wtf/Noncopyable.h b/src/3rdparty/masm/stubs/wtf/Noncopyable.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/Noncopyable.h rename to src/3rdparty/masm/stubs/wtf/Noncopyable.h diff --git a/3rdparty/masm/stubs/wtf/OwnPtr.h b/src/3rdparty/masm/stubs/wtf/OwnPtr.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/OwnPtr.h rename to src/3rdparty/masm/stubs/wtf/OwnPtr.h diff --git a/3rdparty/masm/stubs/wtf/PassOwnPtr.h b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/PassOwnPtr.h rename to src/3rdparty/masm/stubs/wtf/PassOwnPtr.h diff --git a/3rdparty/masm/stubs/wtf/PassRefPtr.h b/src/3rdparty/masm/stubs/wtf/PassRefPtr.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/PassRefPtr.h rename to src/3rdparty/masm/stubs/wtf/PassRefPtr.h diff --git a/3rdparty/masm/stubs/wtf/RefCounted.h b/src/3rdparty/masm/stubs/wtf/RefCounted.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/RefCounted.h rename to src/3rdparty/masm/stubs/wtf/RefCounted.h diff --git a/3rdparty/masm/stubs/wtf/RefPtr.h b/src/3rdparty/masm/stubs/wtf/RefPtr.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/RefPtr.h rename to src/3rdparty/masm/stubs/wtf/RefPtr.h diff --git a/3rdparty/masm/stubs/wtf/TypeTraits.h b/src/3rdparty/masm/stubs/wtf/TypeTraits.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/TypeTraits.h rename to src/3rdparty/masm/stubs/wtf/TypeTraits.h diff --git a/3rdparty/masm/stubs/wtf/UnusedParam.h b/src/3rdparty/masm/stubs/wtf/UnusedParam.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/UnusedParam.h rename to src/3rdparty/masm/stubs/wtf/UnusedParam.h diff --git a/3rdparty/masm/stubs/wtf/Vector.h b/src/3rdparty/masm/stubs/wtf/Vector.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/Vector.h rename to src/3rdparty/masm/stubs/wtf/Vector.h diff --git a/3rdparty/masm/stubs/wtf/text/CString.h b/src/3rdparty/masm/stubs/wtf/text/CString.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/text/CString.h rename to src/3rdparty/masm/stubs/wtf/text/CString.h diff --git a/3rdparty/masm/stubs/wtf/text/WTFString.h b/src/3rdparty/masm/stubs/wtf/text/WTFString.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/text/WTFString.h rename to src/3rdparty/masm/stubs/wtf/text/WTFString.h diff --git a/3rdparty/masm/stubs/wtf/unicode/Unicode.h b/src/3rdparty/masm/stubs/wtf/unicode/Unicode.h similarity index 100% rename from 3rdparty/masm/stubs/wtf/unicode/Unicode.h rename to src/3rdparty/masm/stubs/wtf/unicode/Unicode.h diff --git a/3rdparty/masm/wtf/ASCIICType.h b/src/3rdparty/masm/wtf/ASCIICType.h similarity index 100% rename from 3rdparty/masm/wtf/ASCIICType.h rename to src/3rdparty/masm/wtf/ASCIICType.h diff --git a/3rdparty/masm/wtf/Assertions.h b/src/3rdparty/masm/wtf/Assertions.h similarity index 100% rename from 3rdparty/masm/wtf/Assertions.h rename to src/3rdparty/masm/wtf/Assertions.h diff --git a/3rdparty/masm/wtf/Atomics.h b/src/3rdparty/masm/wtf/Atomics.h similarity index 100% rename from 3rdparty/masm/wtf/Atomics.h rename to src/3rdparty/masm/wtf/Atomics.h diff --git a/3rdparty/masm/wtf/BumpPointerAllocator.h b/src/3rdparty/masm/wtf/BumpPointerAllocator.h similarity index 100% rename from 3rdparty/masm/wtf/BumpPointerAllocator.h rename to src/3rdparty/masm/wtf/BumpPointerAllocator.h diff --git a/3rdparty/masm/wtf/CheckedArithmetic.h b/src/3rdparty/masm/wtf/CheckedArithmetic.h similarity index 100% rename from 3rdparty/masm/wtf/CheckedArithmetic.h rename to src/3rdparty/masm/wtf/CheckedArithmetic.h diff --git a/3rdparty/masm/wtf/Compiler.h b/src/3rdparty/masm/wtf/Compiler.h similarity index 100% rename from 3rdparty/masm/wtf/Compiler.h rename to src/3rdparty/masm/wtf/Compiler.h diff --git a/3rdparty/masm/wtf/CryptographicallyRandomNumber.h b/src/3rdparty/masm/wtf/CryptographicallyRandomNumber.h similarity index 100% rename from 3rdparty/masm/wtf/CryptographicallyRandomNumber.h rename to src/3rdparty/masm/wtf/CryptographicallyRandomNumber.h diff --git a/3rdparty/masm/wtf/DataLog.h b/src/3rdparty/masm/wtf/DataLog.h similarity index 100% rename from 3rdparty/masm/wtf/DataLog.h rename to src/3rdparty/masm/wtf/DataLog.h diff --git a/3rdparty/masm/wtf/DynamicAnnotations.h b/src/3rdparty/masm/wtf/DynamicAnnotations.h similarity index 100% rename from 3rdparty/masm/wtf/DynamicAnnotations.h rename to src/3rdparty/masm/wtf/DynamicAnnotations.h diff --git a/3rdparty/masm/wtf/FilePrintStream.cpp b/src/3rdparty/masm/wtf/FilePrintStream.cpp similarity index 100% rename from 3rdparty/masm/wtf/FilePrintStream.cpp rename to src/3rdparty/masm/wtf/FilePrintStream.cpp diff --git a/3rdparty/masm/wtf/FilePrintStream.h b/src/3rdparty/masm/wtf/FilePrintStream.h similarity index 100% rename from 3rdparty/masm/wtf/FilePrintStream.h rename to src/3rdparty/masm/wtf/FilePrintStream.h diff --git a/3rdparty/masm/wtf/Locker.h b/src/3rdparty/masm/wtf/Locker.h similarity index 100% rename from 3rdparty/masm/wtf/Locker.h rename to src/3rdparty/masm/wtf/Locker.h diff --git a/3rdparty/masm/wtf/NotFound.h b/src/3rdparty/masm/wtf/NotFound.h similarity index 100% rename from 3rdparty/masm/wtf/NotFound.h rename to src/3rdparty/masm/wtf/NotFound.h diff --git a/3rdparty/masm/wtf/NullPtr.h b/src/3rdparty/masm/wtf/NullPtr.h similarity index 100% rename from 3rdparty/masm/wtf/NullPtr.h rename to src/3rdparty/masm/wtf/NullPtr.h diff --git a/3rdparty/masm/wtf/OSAllocator.h b/src/3rdparty/masm/wtf/OSAllocator.h similarity index 100% rename from 3rdparty/masm/wtf/OSAllocator.h rename to src/3rdparty/masm/wtf/OSAllocator.h diff --git a/3rdparty/masm/wtf/OSAllocatorPosix.cpp b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp similarity index 100% rename from 3rdparty/masm/wtf/OSAllocatorPosix.cpp rename to src/3rdparty/masm/wtf/OSAllocatorPosix.cpp diff --git a/3rdparty/masm/wtf/OSAllocatorWin.cpp b/src/3rdparty/masm/wtf/OSAllocatorWin.cpp similarity index 100% rename from 3rdparty/masm/wtf/OSAllocatorWin.cpp rename to src/3rdparty/masm/wtf/OSAllocatorWin.cpp diff --git a/3rdparty/masm/wtf/PageAllocation.h b/src/3rdparty/masm/wtf/PageAllocation.h similarity index 100% rename from 3rdparty/masm/wtf/PageAllocation.h rename to src/3rdparty/masm/wtf/PageAllocation.h diff --git a/3rdparty/masm/wtf/PageAllocationAligned.cpp b/src/3rdparty/masm/wtf/PageAllocationAligned.cpp similarity index 100% rename from 3rdparty/masm/wtf/PageAllocationAligned.cpp rename to src/3rdparty/masm/wtf/PageAllocationAligned.cpp diff --git a/3rdparty/masm/wtf/PageAllocationAligned.h b/src/3rdparty/masm/wtf/PageAllocationAligned.h similarity index 100% rename from 3rdparty/masm/wtf/PageAllocationAligned.h rename to src/3rdparty/masm/wtf/PageAllocationAligned.h diff --git a/3rdparty/masm/wtf/PageBlock.cpp b/src/3rdparty/masm/wtf/PageBlock.cpp similarity index 100% rename from 3rdparty/masm/wtf/PageBlock.cpp rename to src/3rdparty/masm/wtf/PageBlock.cpp diff --git a/3rdparty/masm/wtf/PageBlock.h b/src/3rdparty/masm/wtf/PageBlock.h similarity index 100% rename from 3rdparty/masm/wtf/PageBlock.h rename to src/3rdparty/masm/wtf/PageBlock.h diff --git a/3rdparty/masm/wtf/PageReservation.h b/src/3rdparty/masm/wtf/PageReservation.h similarity index 100% rename from 3rdparty/masm/wtf/PageReservation.h rename to src/3rdparty/masm/wtf/PageReservation.h diff --git a/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h similarity index 100% rename from 3rdparty/masm/wtf/Platform.h rename to src/3rdparty/masm/wtf/Platform.h diff --git a/3rdparty/masm/wtf/PossiblyNull.h b/src/3rdparty/masm/wtf/PossiblyNull.h similarity index 100% rename from 3rdparty/masm/wtf/PossiblyNull.h rename to src/3rdparty/masm/wtf/PossiblyNull.h diff --git a/3rdparty/masm/wtf/PrintStream.cpp b/src/3rdparty/masm/wtf/PrintStream.cpp similarity index 100% rename from 3rdparty/masm/wtf/PrintStream.cpp rename to src/3rdparty/masm/wtf/PrintStream.cpp diff --git a/3rdparty/masm/wtf/PrintStream.h b/src/3rdparty/masm/wtf/PrintStream.h similarity index 100% rename from 3rdparty/masm/wtf/PrintStream.h rename to src/3rdparty/masm/wtf/PrintStream.h diff --git a/3rdparty/masm/wtf/RawPointer.h b/src/3rdparty/masm/wtf/RawPointer.h similarity index 100% rename from 3rdparty/masm/wtf/RawPointer.h rename to src/3rdparty/masm/wtf/RawPointer.h diff --git a/3rdparty/masm/wtf/StdLibExtras.h b/src/3rdparty/masm/wtf/StdLibExtras.h similarity index 100% rename from 3rdparty/masm/wtf/StdLibExtras.h rename to src/3rdparty/masm/wtf/StdLibExtras.h diff --git a/3rdparty/masm/wtf/VMTags.h b/src/3rdparty/masm/wtf/VMTags.h similarity index 100% rename from 3rdparty/masm/wtf/VMTags.h rename to src/3rdparty/masm/wtf/VMTags.h diff --git a/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h similarity index 100% rename from 3rdparty/masm/yarr/Yarr.h rename to src/3rdparty/masm/yarr/Yarr.h diff --git a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp similarity index 100% rename from 3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp rename to src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp diff --git a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.h b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.h similarity index 100% rename from 3rdparty/masm/yarr/YarrCanonicalizeUCS2.h rename to src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.h diff --git a/3rdparty/masm/yarr/YarrCanonicalizeUCS2.js b/src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.js similarity index 100% rename from 3rdparty/masm/yarr/YarrCanonicalizeUCS2.js rename to src/3rdparty/masm/yarr/YarrCanonicalizeUCS2.js diff --git a/3rdparty/masm/yarr/YarrInterpreter.cpp b/src/3rdparty/masm/yarr/YarrInterpreter.cpp similarity index 100% rename from 3rdparty/masm/yarr/YarrInterpreter.cpp rename to src/3rdparty/masm/yarr/YarrInterpreter.cpp diff --git a/3rdparty/masm/yarr/YarrInterpreter.h b/src/3rdparty/masm/yarr/YarrInterpreter.h similarity index 100% rename from 3rdparty/masm/yarr/YarrInterpreter.h rename to src/3rdparty/masm/yarr/YarrInterpreter.h diff --git a/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp similarity index 100% rename from 3rdparty/masm/yarr/YarrJIT.cpp rename to src/3rdparty/masm/yarr/YarrJIT.cpp diff --git a/3rdparty/masm/yarr/YarrJIT.h b/src/3rdparty/masm/yarr/YarrJIT.h similarity index 100% rename from 3rdparty/masm/yarr/YarrJIT.h rename to src/3rdparty/masm/yarr/YarrJIT.h diff --git a/3rdparty/masm/yarr/YarrParser.h b/src/3rdparty/masm/yarr/YarrParser.h similarity index 100% rename from 3rdparty/masm/yarr/YarrParser.h rename to src/3rdparty/masm/yarr/YarrParser.h diff --git a/3rdparty/masm/yarr/YarrPattern.cpp b/src/3rdparty/masm/yarr/YarrPattern.cpp similarity index 100% rename from 3rdparty/masm/yarr/YarrPattern.cpp rename to src/3rdparty/masm/yarr/YarrPattern.cpp diff --git a/3rdparty/masm/yarr/YarrPattern.h b/src/3rdparty/masm/yarr/YarrPattern.h similarity index 100% rename from 3rdparty/masm/yarr/YarrPattern.h rename to src/3rdparty/masm/yarr/YarrPattern.h diff --git a/3rdparty/masm/yarr/YarrSyntaxChecker.cpp b/src/3rdparty/masm/yarr/YarrSyntaxChecker.cpp similarity index 100% rename from 3rdparty/masm/yarr/YarrSyntaxChecker.cpp rename to src/3rdparty/masm/yarr/YarrSyntaxChecker.cpp diff --git a/3rdparty/masm/yarr/YarrSyntaxChecker.h b/src/3rdparty/masm/yarr/YarrSyntaxChecker.h similarity index 100% rename from 3rdparty/masm/yarr/YarrSyntaxChecker.h rename to src/3rdparty/masm/yarr/YarrSyntaxChecker.h diff --git a/3rdparty/masm/yarr/yarr.pri b/src/3rdparty/masm/yarr/yarr.pri similarity index 100% rename from 3rdparty/masm/yarr/yarr.pri rename to src/3rdparty/masm/yarr/yarr.pri diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 0000000..7062854 --- /dev/null +++ b/src/src.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS = v4 tools +CONFIG += ordered diff --git a/main.cpp b/src/tools/main.cpp similarity index 95% rename from main.cpp rename to src/tools/main.cpp index 07e8b3c..1983191 100644 --- a/main.cpp +++ b/src/tools/main.cpp @@ -40,24 +40,24 @@ ****************************************************************************/ #ifndef QMLJS_NO_LLVM -# include "qv4_llvm_p.h" +# include "private/qv4_llvm_p.h" #endif -#include "debugging.h" -#include "qv4object.h" -#include "qmljs_runtime.h" -#include "qv4functionobject.h" -#include "qv4errorobject.h" -#include "qv4globalobject.h" -#include "qv4codegen_p.h" -#include "qv4isel_masm_p.h" -#include "qv4isel_moth_p.h" -#include "qv4vme_moth_p.h" -#include "qv4syntaxchecker_p.h" -#include "qv4objectproto.h" -#include "qv4isel_p.h" -#include "qv4mm.h" -#include "qmljs_environment.h" +#include "private/debugging.h" +#include "private/qv4object.h" +#include "private/qmljs_runtime.h" +#include "private/qv4functionobject.h" +#include "private/qv4errorobject.h" +#include "private/qv4globalobject.h" +#include "private/qv4codegen_p.h" +#include "private/qv4isel_masm_p.h" +#include "private/qv4isel_moth_p.h" +#include "private/qv4vme_moth_p.h" +#include "private/qv4syntaxchecker_p.h" +#include "private/qv4objectproto.h" +#include "private/qv4isel_p.h" +#include "private/qv4mm.h" +#include "private/qmljs_environment.h" #include #include @@ -72,7 +72,7 @@ namespace builtins { using namespace QQmlJS::VM; -struct Print: FunctionObject +struct Q_V4_EXPORT Print: FunctionObject { Print(ExecutionContext *scope): FunctionObject(scope) { name = scope->engine->newString("print"); @@ -91,7 +91,7 @@ struct Print: FunctionObject } }; -struct TestHarnessError: FunctionObject +struct Q_V4_EXPORT TestHarnessError: FunctionObject { TestHarnessError(ExecutionContext *scope, bool &errorInTestHarness): FunctionObject(scope), errorOccurred(errorInTestHarness) { name = scope->engine->newString("$ERROR"); @@ -114,7 +114,7 @@ struct TestHarnessError: FunctionObject bool &errorOccurred; }; -struct GC: public FunctionObject +struct Q_V4_EXPORT GC: public FunctionObject { GC(ExecutionContext* scope) : FunctionObject(scope) diff --git a/src/tools/tools.pro b/src/tools/tools.pro new file mode 100644 index 0000000..820eb18 --- /dev/null +++ b/src/tools/tools.pro @@ -0,0 +1,17 @@ +TEMPLATE = app +QT = core v4 v4-private core-private qmldevtools-private +SOURCES = main.cpp + +TARGET = v4 + +INCLUDEPATH += ../v4 +INCLUDEPATH += ../3rdparty/masm +INCLUDEPATH += ../3rdparty/masm/wtf +INCLUDEPATH += ../3rdparty/masm/stubs +INCLUDEPATH += ../3rdparty/masm/stubs/wtf +INCLUDEPATH += ../3rdparty/masm/jit +INCLUDEPATH += ../3rdparty/masm/assembler +INCLUDEPATH += ../3rdparty/masm/disassembler + +DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" +DEFINES += QMLJS_NO_LLVM \ No newline at end of file diff --git a/debugging.cpp b/src/v4/debugging.cpp similarity index 100% rename from debugging.cpp rename to src/v4/debugging.cpp diff --git a/debugging.h b/src/v4/debugging.h similarity index 98% rename from debugging.h rename to src/v4/debugging.h index e6626c5..00c9671 100644 --- a/debugging.h +++ b/src/v4/debugging.h @@ -30,6 +30,7 @@ #ifndef DEBUGGING_H #define DEBUGGING_H +#include "qv4global.h" #include "qmljs_engine.h" #include "qmljs_environment.h" @@ -94,7 +95,7 @@ struct CallInfo {} }; -class Debugger +class Q_V4_EXPORT Debugger { public: Debugger(VM::ExecutionEngine *_engine); diff --git a/llvm_runtime.cpp b/src/v4/llvm_runtime.cpp similarity index 100% rename from llvm_runtime.cpp rename to src/v4/llvm_runtime.cpp diff --git a/moth/moth.pri b/src/v4/moth/moth.pri similarity index 100% rename from moth/moth.pri rename to src/v4/moth/moth.pri diff --git a/moth/qv4instr_moth.cpp b/src/v4/moth/qv4instr_moth.cpp similarity index 100% rename from moth/qv4instr_moth.cpp rename to src/v4/moth/qv4instr_moth.cpp diff --git a/moth/qv4instr_moth_p.h b/src/v4/moth/qv4instr_moth_p.h similarity index 100% rename from moth/qv4instr_moth_p.h rename to src/v4/moth/qv4instr_moth_p.h diff --git a/moth/qv4isel_moth.cpp b/src/v4/moth/qv4isel_moth.cpp similarity index 100% rename from moth/qv4isel_moth.cpp rename to src/v4/moth/qv4isel_moth.cpp diff --git a/moth/qv4isel_moth_p.h b/src/v4/moth/qv4isel_moth_p.h similarity index 98% rename from moth/qv4isel_moth_p.h rename to src/v4/moth/qv4isel_moth_p.h index 90b191b..0b93ea8 100644 --- a/moth/qv4isel_moth_p.h +++ b/src/v4/moth/qv4isel_moth_p.h @@ -1,6 +1,7 @@ #ifndef QV4ISEL_MOTH_P_H #define QV4ISEL_MOTH_P_H +#include "qv4global.h" #include "qv4isel_p.h" #include "qv4ir_p.h" #include "qv4object.h" @@ -9,7 +10,7 @@ namespace QQmlJS { namespace Moth { -class InstructionSelection: +class Q_V4_EXPORT InstructionSelection: public IR::InstructionSelection, public EvalInstructionSelection { @@ -145,7 +146,7 @@ private: uchar *_codeEnd; }; -class ISelFactory: public EvalISelFactory +class Q_V4_EXPORT ISelFactory: public EvalISelFactory { public: virtual ~ISelFactory() {} diff --git a/moth/qv4vme_moth.cpp b/src/v4/moth/qv4vme_moth.cpp similarity index 100% rename from moth/qv4vme_moth.cpp rename to src/v4/moth/qv4vme_moth.cpp diff --git a/moth/qv4vme_moth_p.h b/src/v4/moth/qv4vme_moth_p.h similarity index 100% rename from moth/qv4vme_moth_p.h rename to src/v4/moth/qv4vme_moth_p.h diff --git a/qmljs_engine.cpp b/src/v4/qmljs_engine.cpp similarity index 100% rename from qmljs_engine.cpp rename to src/v4/qmljs_engine.cpp diff --git a/qmljs_engine.h b/src/v4/qmljs_engine.h similarity index 98% rename from qmljs_engine.h rename to src/v4/qmljs_engine.h index 01b1c51..f741688 100644 --- a/qmljs_engine.h +++ b/src/v4/qmljs_engine.h @@ -41,9 +41,10 @@ #ifndef QMLJS_ENGINE_H #define QMLJS_ENGINE_H -#include -#include -#include +#include "qv4global.h" +#include "qv4isel_p.h" +#include "qv4object.h" +#include "qmljs_environment.h" #include #include @@ -94,7 +95,7 @@ struct EvalFunction; class RegExp; -struct ExecutionEngine +struct Q_V4_EXPORT ExecutionEngine { MemoryManager *memoryManager; EvalISelFactory *iselFactory; diff --git a/qmljs_environment.cpp b/src/v4/qmljs_environment.cpp similarity index 100% rename from qmljs_environment.cpp rename to src/v4/qmljs_environment.cpp diff --git a/qmljs_environment.h b/src/v4/qmljs_environment.h similarity index 98% rename from qmljs_environment.h rename to src/v4/qmljs_environment.h index c21cab5..111c6ae 100644 --- a/qmljs_environment.h +++ b/src/v4/qmljs_environment.h @@ -41,6 +41,7 @@ #ifndef QMLJS_ENVIRONMENT_H #define QMLJS_ENVIRONMENT_H +#include "qv4global.h" #include namespace QQmlJS { @@ -52,7 +53,7 @@ struct ExecutionEngine; struct ExecutionContext; struct DeclarativeEnvironment; -struct DiagnosticMessage +struct Q_V4_EXPORT DiagnosticMessage { enum { Error, Warning }; diff --git a/qmljs_math.h b/src/v4/qmljs_math.h similarity index 100% rename from qmljs_math.h rename to src/v4/qmljs_math.h diff --git a/qmljs_runtime.cpp b/src/v4/qmljs_runtime.cpp similarity index 99% rename from qmljs_runtime.cpp rename to src/v4/qmljs_runtime.cpp index 9e50217..ce1d1ab 100644 --- a/qmljs_runtime.cpp +++ b/src/v4/qmljs_runtime.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "qv4global.h" #include "debugging.h" #include "qmljs_runtime.h" #include "qv4object.h" @@ -56,7 +57,7 @@ #include #include -#include "3rdparty/double-conversion/double-conversion.h" +#include "../3rdparty/double-conversion/double-conversion.h" namespace QQmlJS { namespace VM { @@ -845,7 +846,7 @@ void __qmljs_throw(Value value, ExecutionContext *context) longjmp(handler.stackFrame, 1); } -void *__qmljs_create_exception_handler(ExecutionContext *context) +Q_V4_EXPORT void * __qmljs_create_exception_handler(ExecutionContext *context) { context->engine->exception = Value::undefinedValue(); context->engine->unwindStack.append(ExecutionEngine::ExceptionHandler()); diff --git a/qmljs_runtime.h b/src/v4/qmljs_runtime.h similarity index 99% rename from qmljs_runtime.h rename to src/v4/qmljs_runtime.h index 830dc9a..2ea6126 100644 --- a/qmljs_runtime.h +++ b/src/v4/qmljs_runtime.h @@ -41,8 +41,9 @@ #ifndef QMLJS_RUNTIME_H #define QMLJS_RUNTIME_H -#include -#include +#include "qmljs_value.h" +#include "qmljs_math.h" + #include #include diff --git a/qmljs_value.cpp b/src/v4/qmljs_value.cpp similarity index 100% rename from qmljs_value.cpp rename to src/v4/qmljs_value.cpp diff --git a/qmljs_value.h b/src/v4/qmljs_value.h similarity index 99% rename from qmljs_value.h rename to src/v4/qmljs_value.h index 401b61f..e11b08f 100644 --- a/qmljs_value.h +++ b/src/v4/qmljs_value.h @@ -41,13 +41,12 @@ #ifndef QMLJS_VALUE_H #define QMLJS_VALUE_H -#include - #include #include -#include +#include "qv4global.h" +#include "qv4string.h" #include -#include +#include "qv4managed.h" namespace QQmlJS { namespace VM { @@ -64,7 +63,7 @@ double __qmljs_to_number(Value value, ExecutionContext *ctx); typedef uint Bool; -struct Value +struct Q_V4_EXPORT Value { union { quint64 val; diff --git a/qv4_llvm_p.h b/src/v4/qv4_llvm_p.h similarity index 92% rename from qv4_llvm_p.h rename to src/v4/qv4_llvm_p.h index c0f18e5..60625c8 100644 --- a/qv4_llvm_p.h +++ b/src/v4/qv4_llvm_p.h @@ -30,6 +30,7 @@ #ifndef QV4_LLVM_P_H #define QV4_LLVM_P_H +#include "qv4global.h" #include "qv4ir_p.h" #include @@ -45,7 +46,7 @@ enum LLVMOutputType { LLVMOutputObject = 3 // .o }; -int compileWithLLVM(IR::Module *module, const QString &fileName, LLVMOutputType outputType, int (*exec)(void *)); +Q_V4_EXPORT int compileWithLLVM(IR::Module *module, const QString &fileName, LLVMOutputType outputType, int (*)(void *)); } // QQmlJS diff --git a/qv4argumentsobject.cpp b/src/v4/qv4argumentsobject.cpp similarity index 100% rename from qv4argumentsobject.cpp rename to src/v4/qv4argumentsobject.cpp diff --git a/qv4argumentsobject.h b/src/v4/qv4argumentsobject.h similarity index 100% rename from qv4argumentsobject.h rename to src/v4/qv4argumentsobject.h diff --git a/qv4array.cpp b/src/v4/qv4array.cpp similarity index 100% rename from qv4array.cpp rename to src/v4/qv4array.cpp diff --git a/qv4array.h b/src/v4/qv4array.h similarity index 99% rename from qv4array.h rename to src/v4/qv4array.h index 19aa99b..86d438e 100644 --- a/qv4array.h +++ b/src/v4/qv4array.h @@ -42,6 +42,7 @@ #ifndef QV4ARRAY_H #define QV4ARRAY_H +#include "qv4global.h" #include #include #include @@ -147,7 +148,7 @@ inline SparseArrayNode *SparseArrayNode::upperBound(uint akey) -struct Q_CORE_EXPORT SparseArray +struct Q_V4_EXPORT SparseArray { SparseArray(); ~SparseArray() { diff --git a/qv4arrayobject.cpp b/src/v4/qv4arrayobject.cpp similarity index 100% rename from qv4arrayobject.cpp rename to src/v4/qv4arrayobject.cpp diff --git a/qv4arrayobject.h b/src/v4/qv4arrayobject.h similarity index 100% rename from qv4arrayobject.h rename to src/v4/qv4arrayobject.h diff --git a/qv4booleanobject.cpp b/src/v4/qv4booleanobject.cpp similarity index 100% rename from qv4booleanobject.cpp rename to src/v4/qv4booleanobject.cpp diff --git a/qv4booleanobject.h b/src/v4/qv4booleanobject.h similarity index 100% rename from qv4booleanobject.h rename to src/v4/qv4booleanobject.h diff --git a/qv4codegen.cpp b/src/v4/qv4codegen.cpp similarity index 100% rename from qv4codegen.cpp rename to src/v4/qv4codegen.cpp diff --git a/qv4codegen_p.h b/src/v4/qv4codegen_p.h similarity index 99% rename from qv4codegen_p.h rename to src/v4/qv4codegen_p.h index 89953c8..d83e129 100644 --- a/qv4codegen_p.h +++ b/src/v4/qv4codegen_p.h @@ -41,6 +41,7 @@ #ifndef QV4CODEGEN_P_H #define QV4CODEGEN_P_H +#include "qv4global.h" #include "qv4ir_p.h" #include #include @@ -67,7 +68,7 @@ public: virtual void syntaxError(VM::DiagnosticMessage *message) = 0; }; -class Codegen: protected AST::Visitor +class Q_V4_EXPORT Codegen: protected AST::Visitor { public: Codegen(VM::ExecutionContext *ctx, bool strict); diff --git a/qv4dateobject.cpp b/src/v4/qv4dateobject.cpp similarity index 100% rename from qv4dateobject.cpp rename to src/v4/qv4dateobject.cpp diff --git a/qv4dateobject.h b/src/v4/qv4dateobject.h similarity index 100% rename from qv4dateobject.h rename to src/v4/qv4dateobject.h diff --git a/qv4errorobject.cpp b/src/v4/qv4errorobject.cpp similarity index 100% rename from qv4errorobject.cpp rename to src/v4/qv4errorobject.cpp diff --git a/qv4errorobject.h b/src/v4/qv4errorobject.h similarity index 100% rename from qv4errorobject.h rename to src/v4/qv4errorobject.h diff --git a/qv4functionobject.cpp b/src/v4/qv4functionobject.cpp similarity index 100% rename from qv4functionobject.cpp rename to src/v4/qv4functionobject.cpp diff --git a/qv4functionobject.h b/src/v4/qv4functionobject.h similarity index 98% rename from qv4functionobject.h rename to src/v4/qv4functionobject.h index 822cee9..b651eed 100644 --- a/qv4functionobject.h +++ b/src/v4/qv4functionobject.h @@ -41,6 +41,7 @@ #ifndef QV4FUNCTIONOBJECT_H #define QV4FUNCTIONOBJECT_H +#include "qv4global.h" #include "qmljs_runtime.h" #include "qmljs_engine.h" #include "qmljs_environment.h" @@ -61,6 +62,9 @@ #include #include +#include +#include + namespace QQmlJS { namespace VM { @@ -131,7 +135,7 @@ struct Function { void mark(); }; -struct FunctionObject: Object { +struct Q_V4_EXPORT FunctionObject: Object { ExecutionContext *scope; String *name; String * const *formalParameterList; diff --git a/src/v4/qv4global.h b/src/v4/qv4global.h new file mode 100644 index 0000000..6b1c9a2 --- /dev/null +++ b/src/v4/qv4global.h @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +#ifndef QV4GLOBAL_H +#define QV4GLOBAL_H + +#include + +QT_BEGIN_HEADER + +#ifndef QT_STATIC +# if defined(QT_BUILD_V4_LIB) +# define Q_V4_EXPORT Q_DECL_EXPORT +# else +# define Q_V4_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_V4_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QV4GLOBAL_H diff --git a/qv4globalobject.cpp b/src/v4/qv4globalobject.cpp similarity index 100% rename from qv4globalobject.cpp rename to src/v4/qv4globalobject.cpp diff --git a/qv4globalobject.h b/src/v4/qv4globalobject.h similarity index 98% rename from qv4globalobject.h rename to src/v4/qv4globalobject.h index fecad46..6a586c1 100644 --- a/qv4globalobject.h +++ b/src/v4/qv4globalobject.h @@ -41,13 +41,14 @@ #ifndef QV4GLOBALOBJECT_H #define QV4GLOBALOBJECT_H +#include "qv4global.h" #include "qv4functionobject.h" namespace QQmlJS { namespace VM { -struct EvalFunction : FunctionObject +struct Q_V4_EXPORT EvalFunction : FunctionObject { EvalFunction(ExecutionContext *scope); diff --git a/qv4ir.cpp b/src/v4/qv4ir.cpp similarity index 100% rename from qv4ir.cpp rename to src/v4/qv4ir.cpp diff --git a/qv4ir_p.h b/src/v4/qv4ir_p.h similarity index 99% rename from qv4ir_p.h rename to src/v4/qv4ir_p.h index 64f59f4..4e60fa9 100644 --- a/qv4ir_p.h +++ b/src/v4/qv4ir_p.h @@ -52,15 +52,13 @@ // We mean it. // +#include "qv4global.h" #include #include #include #include -#include -#include - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -589,7 +587,7 @@ struct Ret: Stmt { virtual void dump(QTextStream &out, Mode); }; -struct Module { +struct Q_V4_EXPORT Module { MemoryPool pool; QVector functions; Function *rootFunction; diff --git a/qv4isel_llvm.cpp b/src/v4/qv4isel_llvm.cpp similarity index 99% rename from qv4isel_llvm.cpp rename to src/v4/qv4isel_llvm.cpp index e575fa0..0919368 100644 --- a/qv4isel_llvm.cpp +++ b/src/v4/qv4isel_llvm.cpp @@ -80,10 +80,11 @@ #include "qv4_llvm_p.h" #include "qv4ir_p.h" #include "qv4string.h" +#include "qv4global.h" namespace QQmlJS { -int compileWithLLVM(IR::Module *module, const QString &fileName, LLVMOutputType outputType, int (*exec)(void *)) +Q_V4_EXPORT int compileWithLLVM(IR::Module *module, const QString &fileName, LLVMOutputType outputType, int (*exec)(void *)) { Q_ASSERT(module); Q_ASSERT(exec || outputType != LLVMOutputJit); diff --git a/qv4isel_llvm_p.h b/src/v4/qv4isel_llvm_p.h similarity index 100% rename from qv4isel_llvm_p.h rename to src/v4/qv4isel_llvm_p.h diff --git a/qv4isel_masm.cpp b/src/v4/qv4isel_masm.cpp similarity index 100% rename from qv4isel_masm.cpp rename to src/v4/qv4isel_masm.cpp diff --git a/qv4isel_masm_p.h b/src/v4/qv4isel_masm_p.h similarity index 99% rename from qv4isel_masm_p.h rename to src/v4/qv4isel_masm_p.h index 5a4a29b..de0971f 100644 --- a/qv4isel_masm_p.h +++ b/src/v4/qv4isel_masm_p.h @@ -41,6 +41,7 @@ #ifndef QV4ISEL_MASM_P_H #define QV4ISEL_MASM_P_H +#include "qv4global.h" #include "qv4ir_p.h" #include "qv4isel_p.h" #include "qv4isel_util_p.h" @@ -663,7 +664,7 @@ private: QList _callsToLink; }; -class InstructionSelection: +class Q_V4_EXPORT InstructionSelection: protected IR::InstructionSelection, public EvalInstructionSelection { @@ -783,7 +784,7 @@ private: Assembler* _asm; }; -class ISelFactory: public EvalISelFactory +class Q_V4_EXPORT ISelFactory: public EvalISelFactory { public: virtual ~ISelFactory() {} diff --git a/qv4isel_p.cpp b/src/v4/qv4isel_p.cpp similarity index 100% rename from qv4isel_p.cpp rename to src/v4/qv4isel_p.cpp diff --git a/qv4isel_p.h b/src/v4/qv4isel_p.h similarity index 97% rename from qv4isel_p.h rename to src/v4/qv4isel_p.h index 0fb3e8d..d4f7052 100644 --- a/qv4isel_p.h +++ b/src/v4/qv4isel_p.h @@ -30,6 +30,7 @@ #ifndef QV4ISEL_P_H #define QV4ISEL_P_H +#include "qv4global.h" #include "qv4ir_p.h" #include @@ -42,7 +43,7 @@ struct ExecutionEngine; struct Function; } // namespace VM -class EvalInstructionSelection +class Q_V4_EXPORT EvalInstructionSelection { public: EvalInstructionSelection(VM::ExecutionEngine *engine, IR::Module *module); @@ -60,7 +61,7 @@ private: QHash _irToVM; }; -class EvalISelFactory +class Q_V4_EXPORT EvalISelFactory { public: virtual ~EvalISelFactory() = 0; @@ -68,7 +69,7 @@ public: }; namespace IR { -class InstructionSelection: protected IR::StmtVisitor +class Q_V4_EXPORT InstructionSelection: protected IR::StmtVisitor { public: virtual ~InstructionSelection() = 0; diff --git a/qv4isel_util_p.h b/src/v4/qv4isel_util_p.h similarity index 100% rename from qv4isel_util_p.h rename to src/v4/qv4isel_util_p.h diff --git a/qv4jsonobject.cpp b/src/v4/qv4jsonobject.cpp similarity index 100% rename from qv4jsonobject.cpp rename to src/v4/qv4jsonobject.cpp diff --git a/qv4jsonobject.h b/src/v4/qv4jsonobject.h similarity index 100% rename from qv4jsonobject.h rename to src/v4/qv4jsonobject.h diff --git a/qv4managed.cpp b/src/v4/qv4managed.cpp similarity index 100% rename from qv4managed.cpp rename to src/v4/qv4managed.cpp diff --git a/qv4managed.h b/src/v4/qv4managed.h similarity index 99% rename from qv4managed.h rename to src/v4/qv4managed.h index 7b6768d..dc4d1f2 100644 --- a/qv4managed.h +++ b/src/v4/qv4managed.h @@ -45,6 +45,7 @@ #include #include #include +#include "qv4global.h" namespace QQmlJS { @@ -69,7 +70,7 @@ struct ArgumentsObject; struct JSONObject; struct ForeachIteratorObject; -struct Managed +struct Q_V4_EXPORT Managed { private: void *operator new(size_t); diff --git a/qv4mathobject.cpp b/src/v4/qv4mathobject.cpp similarity index 100% rename from qv4mathobject.cpp rename to src/v4/qv4mathobject.cpp diff --git a/qv4mathobject.h b/src/v4/qv4mathobject.h similarity index 100% rename from qv4mathobject.h rename to src/v4/qv4mathobject.h diff --git a/qv4mm.cpp b/src/v4/qv4mm.cpp similarity index 100% rename from qv4mm.cpp rename to src/v4/qv4mm.cpp diff --git a/qv4mm.h b/src/v4/qv4mm.h similarity index 98% rename from qv4mm.h rename to src/v4/qv4mm.h index 48d0c3d..6f747f5 100644 --- a/qv4mm.h +++ b/src/v4/qv4mm.h @@ -30,6 +30,7 @@ #ifndef QV4GC_H #define QV4GC_H +#include "qv4global.h" #include "qv4object.h" #include @@ -41,7 +42,7 @@ namespace VM { struct Managed; -class MemoryManager +class Q_V4_EXPORT MemoryManager { MemoryManager(const MemoryManager &); MemoryManager &operator=(const MemoryManager&); diff --git a/qv4numberobject.cpp b/src/v4/qv4numberobject.cpp similarity index 100% rename from qv4numberobject.cpp rename to src/v4/qv4numberobject.cpp diff --git a/qv4numberobject.h b/src/v4/qv4numberobject.h similarity index 100% rename from qv4numberobject.h rename to src/v4/qv4numberobject.h diff --git a/qv4object.cpp b/src/v4/qv4object.cpp similarity index 100% rename from qv4object.cpp rename to src/v4/qv4object.cpp diff --git a/qv4object.h b/src/v4/qv4object.h similarity index 99% rename from qv4object.h rename to src/v4/qv4object.h index c50ffe2..73d62bf 100644 --- a/qv4object.h +++ b/src/v4/qv4object.h @@ -41,6 +41,7 @@ #ifndef QMLJS_OBJECTS_H #define QMLJS_OBJECTS_H +#include "qv4global.h" #include "qmljs_runtime.h" #include "qmljs_engine.h" #include "qmljs_environment.h" @@ -98,7 +99,7 @@ struct TypeErrorPrototype; struct URIErrorPrototype; -struct Object: Managed { +struct Q_V4_EXPORT Object: Managed { Object *prototype; QScopedPointer members; Array array; diff --git a/qv4objectiterator.cpp b/src/v4/qv4objectiterator.cpp similarity index 100% rename from qv4objectiterator.cpp rename to src/v4/qv4objectiterator.cpp diff --git a/qv4objectiterator.h b/src/v4/qv4objectiterator.h similarity index 100% rename from qv4objectiterator.h rename to src/v4/qv4objectiterator.h diff --git a/qv4objectproto.cpp b/src/v4/qv4objectproto.cpp similarity index 100% rename from qv4objectproto.cpp rename to src/v4/qv4objectproto.cpp diff --git a/qv4objectproto.h b/src/v4/qv4objectproto.h similarity index 100% rename from qv4objectproto.h rename to src/v4/qv4objectproto.h diff --git a/qv4propertydescriptor.h b/src/v4/qv4propertydescriptor.h similarity index 100% rename from qv4propertydescriptor.h rename to src/v4/qv4propertydescriptor.h diff --git a/qv4propertytable.h b/src/v4/qv4propertytable.h similarity index 100% rename from qv4propertytable.h rename to src/v4/qv4propertytable.h diff --git a/qv4regexp.cpp b/src/v4/qv4regexp.cpp similarity index 100% rename from qv4regexp.cpp rename to src/v4/qv4regexp.cpp diff --git a/qv4regexp.h b/src/v4/qv4regexp.h similarity index 100% rename from qv4regexp.h rename to src/v4/qv4regexp.h diff --git a/qv4regexpobject.cpp b/src/v4/qv4regexpobject.cpp similarity index 100% rename from qv4regexpobject.cpp rename to src/v4/qv4regexpobject.cpp diff --git a/qv4regexpobject.h b/src/v4/qv4regexpobject.h similarity index 100% rename from qv4regexpobject.h rename to src/v4/qv4regexpobject.h diff --git a/qv4string.cpp b/src/v4/qv4string.cpp similarity index 100% rename from qv4string.cpp rename to src/v4/qv4string.cpp diff --git a/qv4string.h b/src/v4/qv4string.h similarity index 100% rename from qv4string.h rename to src/v4/qv4string.h diff --git a/qv4stringobject.cpp b/src/v4/qv4stringobject.cpp similarity index 100% rename from qv4stringobject.cpp rename to src/v4/qv4stringobject.cpp diff --git a/qv4stringobject.h b/src/v4/qv4stringobject.h similarity index 100% rename from qv4stringobject.h rename to src/v4/qv4stringobject.h diff --git a/qv4syntaxchecker.cpp b/src/v4/qv4syntaxchecker.cpp similarity index 100% rename from qv4syntaxchecker.cpp rename to src/v4/qv4syntaxchecker.cpp diff --git a/qv4syntaxchecker_p.h b/src/v4/qv4syntaxchecker_p.h similarity index 100% rename from qv4syntaxchecker_p.h rename to src/v4/qv4syntaxchecker_p.h diff --git a/v4.pro b/src/v4/v4.pro similarity index 89% rename from v4.pro rename to src/v4/v4.pro index 12e9013..6d990ed 100644 --- a/v4.pro +++ b/src/v4/v4.pro @@ -1,18 +1,27 @@ -QT = core-private qmldevtools-private -CONFIG -= app_bundle -CONFIG += console +TARGET = QtV4 +QT_PRIVATE = core-private qmldevtools-private + +CONFIG += internal_module LLVM_CONFIG=llvm-config OBJECTS_DIR=.obj +load(qt_build_config) +load(qt_module) + +CONFIG += warn_off + +#win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 #TODO ??! + + # Pick up the qmake variable or environment variable for LLVM_INSTALL_DIR. If either was set, change the LLVM_CONFIG to use that. isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) !isEmpty(LLVM_INSTALL_DIR):LLVM_CONFIG=$$LLVM_INSTALL_DIR/bin/llvm-config !macx-clang*:LIBS += -rdynamic -SOURCES += main.cpp \ +SOURCES += \ qv4codegen.cpp \ qv4ir.cpp \ qmljs_engine.cpp \ @@ -46,6 +55,7 @@ SOURCES += main.cpp \ qv4regexp.cpp HEADERS += \ + qv4global.h \ qv4codegen_p.h \ qv4ir_p.h \ qmljs_engine.h \ @@ -126,8 +136,8 @@ linux-g++*:isEqual(QT_ARCH,i386) { QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse } -TESTSCRIPT=$$PWD/tests/test262.py -V4CMD = $$OUT_PWD/v4 +TESTSCRIPT=$$PWD/../../tests/test262.py +V4CMD = $$OUT_PWD/../tools/v4 checktarget.target = check checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations @@ -141,5 +151,5 @@ QMAKE_EXTRA_TARGETS += checkmothtarget include(moth/moth.pri) -include(3rdparty/masm/masm.pri) -include(3rdparty/double-conversion/double-conversion.pri) +include(../3rdparty/masm/masm.pri) +include(../3rdparty/double-conversion/double-conversion.pri) diff --git a/sync.profile b/sync.profile new file mode 100644 index 0000000..4e6f5f7 --- /dev/null +++ b/sync.profile @@ -0,0 +1,20 @@ +%modules = ( # path to module name map + "QtV4" => "$basedir/src", +); +%moduleheaders = ( # restrict the module headers to those found in relative path + #"QtV4" => "3rdparty/masm;v4;", +); +@allmoduleheadersprivate = ( + "QtV4" +); + +# Module dependencies. +# Every module that is required to build this module should have one entry. +# Each of the module version specifiers can take one of the following values: +# - A specific Git revision. +# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# +%dependencies = ( + "qtbase" => "refs/heads/dev", + "qtdeclarative" => "refs/heads/dev", +); diff --git a/v4vm.pro b/v4vm.pro new file mode 100644 index 0000000..0c67e66 --- /dev/null +++ b/v4vm.pro @@ -0,0 +1,2 @@ +load(configure) +load(qt_parts) -- 2.7.4