Changeset 207693 in webkit


Ignore:
Timestamp:
Oct 21, 2016 12:14:20 PM (7 years ago)
Author:
keith_miller@apple.com
Message:

Rename WASM to Wasm
​https://bugs.webkit.org/show_bug.cgi?id=163796

Rubber stamped by Filip Pizlo.

  • CMakeLists.txt:
  • Configurations/ToolExecutable.xcconfig:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • llint/LLIntThunks.cpp:

(JSC::vmEntryToWasm):
(JSC::vmEntryToWASM): Deleted.

  • llint/LLIntThunks.h:
  • runtime/Executable.cpp:

(JSC::WebAssemblyExecutable::WebAssemblyExecutable):

  • runtime/Executable.h:
  • shell/CMakeLists.txt:
  • testWASM.cpp:

(runWASMTests): Deleted.

  • testWasm.cpp: Renamed from Source/JavaScriptCore/testWASM.cpp.

(CommandLine::CommandLine):
(printUsageStatement):
(CommandLine::parseArguments):
(runLEBTests):
(invoke):
(box):
(runWasmTests):
(main):

  • wasm/JSWASMModule.cpp:

(JSC::JSWASMModule::JSWASMModule): Deleted.
(JSC::JSWASMModule::destroy): Deleted.
(JSC::JSWASMModule::visitChildren): Deleted.

  • wasm/JSWASMModule.h:

(JSC::JSWASMModule::create): Deleted.
(JSC::JSWASMModule::createStructure): Deleted.
(JSC::JSWASMModule::i32Constants): Deleted.
(JSC::JSWASMModule::f32Constants): Deleted.
(JSC::JSWASMModule::f64Constants): Deleted.
(JSC::JSWASMModule::signatures): Deleted.
(JSC::JSWASMModule::functionImports): Deleted.
(JSC::JSWASMModule::functionImportSignatures): Deleted.
(JSC::JSWASMModule::globalVariableTypes): Deleted.
(JSC::JSWASMModule::functionDeclarations): Deleted.
(JSC::JSWASMModule::functionPointerTables): Deleted.
(JSC::JSWASMModule::arrayBuffer): Deleted.
(JSC::JSWASMModule::functions): Deleted.
(JSC::JSWASMModule::functionStartOffsetsInSource): Deleted.
(JSC::JSWASMModule::functionStackHeights): Deleted.
(JSC::JSWASMModule::globalVariables): Deleted.
(JSC::JSWASMModule::importedFunctions): Deleted.

  • wasm/JSWasmModule.cpp: Renamed from Source/JavaScriptCore/wasm/JSWASMModule.cpp.

(JSC::JSWasmModule::JSWasmModule):
(JSC::JSWasmModule::destroy):
(JSC::JSWasmModule::visitChildren):

  • wasm/JSWasmModule.h: Renamed from Source/JavaScriptCore/wasm/JSWASMModule.h.

(JSC::JSWasmModule::create):
(JSC::JSWasmModule::createStructure):
(JSC::JSWasmModule::i32Constants):
(JSC::JSWasmModule::f32Constants):
(JSC::JSWasmModule::f64Constants):
(JSC::JSWasmModule::signatures):
(JSC::JSWasmModule::functionImports):
(JSC::JSWasmModule::functionImportSignatures):
(JSC::JSWasmModule::globalVariableTypes):
(JSC::JSWasmModule::functionDeclarations):
(JSC::JSWasmModule::functionPointerTables):
(JSC::JSWasmModule::arrayBuffer):
(JSC::JSWasmModule::functions):
(JSC::JSWasmModule::functionStartOffsetsInSource):
(JSC::JSWasmModule::functionStackHeights):
(JSC::JSWasmModule::globalVariables):
(JSC::JSWasmModule::importedFunctions):

  • wasm/WASMB3IRGenerator.cpp:

(JSC::WASM::createJSWrapper): Deleted.
(JSC::WASM::parseAndCompile): Deleted.

  • wasm/WASMCallingConvention.cpp:

(JSC::WASM::jscCallingConvention): Deleted.
(JSC::WASM::wasmCallingConvention): Deleted.

  • wasm/WASMCallingConvention.h:

(JSC::WASM::CallingConvention::CallingConvention): Deleted.
(JSC::WASM::CallingConvention::marshallArgumentImpl): Deleted.
(JSC::WASM::CallingConvention::marshallArgument): Deleted.
(JSC::WASM::CallingConvention::loadArguments): Deleted.
(JSC::WASM::CallingConvention::setupCall): Deleted.
(JSC::WASM::nextJSCOffset): Deleted.

  • wasm/WASMFormat.h:

(JSC::WASM::toB3Type): Deleted.
(JSC::WASM::isValueType): Deleted.

  • wasm/WASMFunctionParser.h:

(JSC::WASM::FunctionParser<Context>::FunctionParser): Deleted.
(JSC::WASM::FunctionParser<Context>::parse): Deleted.
(JSC::WASM::FunctionParser<Context>::parseBlock): Deleted.
(JSC::WASM::FunctionParser<Context>::parseExpression): Deleted.
(JSC::WASM::FunctionParser<Context>::parseUnreachableExpression): Deleted.

  • wasm/WASMMemory.cpp:

(JSC::WASM::Memory::Memory): Deleted.

  • wasm/WASMMemory.h:

(JSC::WASM::Memory::~Memory): Deleted.
(JSC::WASM::Memory::memory): Deleted.
(JSC::WASM::Memory::size): Deleted.
(JSC::WASM::Memory::pinnedRegisters): Deleted.
(JSC::WASM::Memory::mode): Deleted.
(JSC::WASM::Memory::grow): Deleted.
(JSC::WASM::Memory::offsetOfSize): Deleted.

  • wasm/WASMModuleParser.cpp:

(JSC::WASM::ModuleParser::parse): Deleted.
(JSC::WASM::ModuleParser::parseMemory): Deleted.
(JSC::WASM::ModuleParser::parseFunctionTypes): Deleted.
(JSC::WASM::ModuleParser::parseFunctionSignatures): Deleted.
(JSC::WASM::ModuleParser::parseFunctionDefinitions): Deleted.

  • wasm/WASMModuleParser.h:

(JSC::WASM::ModuleParser::ModuleParser): Deleted.
(JSC::WASM::ModuleParser::functionInformation): Deleted.
(JSC::WASM::ModuleParser::memory): Deleted.

  • wasm/WASMOps.h:

(JSC::WASM::isValidOpType): Deleted.
(JSC::WASM::isControlOp): Deleted.

  • wasm/WASMParser.h:

(JSC::WASM::Parser::parseVarUInt32): Deleted.
(JSC::WASM::Parser::parseVarUInt64): Deleted.
(JSC::WASM::Parser::Parser): Deleted.
(JSC::WASM::Parser::consumeCharacter): Deleted.
(JSC::WASM::Parser::consumeString): Deleted.
(JSC::WASM::Parser::parseUInt32): Deleted.
(JSC::WASM::Parser::parseUInt7): Deleted.
(JSC::WASM::Parser::parseVarUInt1): Deleted.
(JSC::WASM::Parser::parseValueType): Deleted.

  • wasm/WASMPlan.cpp:

(JSC::WASM::Plan::Plan): Deleted.

  • wasm/WASMSections.h:

(JSC::WASM::Sections::validateOrder): Deleted.

  • wasm/WasmB3IRGenerator.cpp: Renamed from Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp.

(dumpProcedure):
(JSC::Wasm::createJSWrapper):
(JSC::Wasm::parseAndCompile):

  • wasm/WasmB3IRGenerator.h: Renamed from Source/JavaScriptCore/wasm/WASMB3IRGenerator.h.
  • wasm/WasmCallingConvention.cpp: Renamed from Source/JavaScriptCore/wasm/WASMCallingConvention.cpp.

(JSC::Wasm::jscCallingConvention):
(JSC::Wasm::wasmCallingConvention):

  • wasm/WasmCallingConvention.h: Renamed from Source/JavaScriptCore/wasm/WASMCallingConvention.h.

(JSC::Wasm::CallingConvention::CallingConvention):
(JSC::Wasm::CallingConvention::marshallArgumentImpl):
(JSC::Wasm::CallingConvention::marshallArgument):
(JSC::Wasm::CallingConvention::loadArguments):
(JSC::Wasm::CallingConvention::setupCall):
(JSC::Wasm::nextJSCOffset):

  • wasm/WasmFormat.h: Renamed from Source/JavaScriptCore/wasm/WASMFormat.h.

(JSC::Wasm::toB3Type):
(JSC::Wasm::isValueType):

  • wasm/WasmFunctionParser.h: Renamed from Source/JavaScriptCore/wasm/WASMFunctionParser.h.

(JSC::Wasm::FunctionParser<Context>::FunctionParser):
(JSC::Wasm::FunctionParser<Context>::parse):
(JSC::Wasm::FunctionParser<Context>::parseBlock):
(JSC::Wasm::FunctionParser<Context>::parseExpression):
(JSC::Wasm::FunctionParser<Context>::parseUnreachableExpression):

  • wasm/WasmMemory.cpp: Renamed from Source/JavaScriptCore/wasm/WASMMemory.cpp.

(JSC::Wasm::Memory::Memory):

  • wasm/WasmMemory.h: Renamed from Source/JavaScriptCore/wasm/WASMMemory.h.

(JSC::Wasm::Memory::~Memory):
(JSC::Wasm::Memory::memory):
(JSC::Wasm::Memory::size):
(JSC::Wasm::Memory::pinnedRegisters):
(JSC::Wasm::Memory::mode):
(JSC::Wasm::Memory::grow):
(JSC::Wasm::Memory::offsetOfSize):

  • wasm/WasmModuleParser.cpp: Renamed from Source/JavaScriptCore/wasm/WASMModuleParser.cpp.

(JSC::Wasm::ModuleParser::parse):
(JSC::Wasm::ModuleParser::parseMemory):
(JSC::Wasm::ModuleParser::parseFunctionTypes):
(JSC::Wasm::ModuleParser::parseFunctionSignatures):
(JSC::Wasm::ModuleParser::parseFunctionDefinitions):

  • wasm/WasmModuleParser.h: Renamed from Source/JavaScriptCore/wasm/WASMModuleParser.h.

(JSC::Wasm::ModuleParser::ModuleParser):
(JSC::Wasm::ModuleParser::functionInformation):
(JSC::Wasm::ModuleParser::memory):

  • wasm/WasmOps.h: Renamed from Source/JavaScriptCore/wasm/WASMOps.h.

(JSC::Wasm::isValidOpType):
(JSC::Wasm::isControlOp):

  • wasm/WasmParser.h: Renamed from Source/JavaScriptCore/wasm/WASMParser.h.

(JSC::Wasm::Parser::parseVarUInt32):
(JSC::Wasm::Parser::parseVarUInt64):
(JSC::Wasm::Parser::Parser):
(JSC::Wasm::Parser::consumeCharacter):
(JSC::Wasm::Parser::consumeString):
(JSC::Wasm::Parser::parseUInt32):
(JSC::Wasm::Parser::parseUInt7):
(JSC::Wasm::Parser::parseVarUInt1):
(JSC::Wasm::Parser::parseValueType):

  • wasm/WasmPlan.cpp: Renamed from Source/JavaScriptCore/wasm/WASMPlan.cpp.

(JSC::Wasm::Plan::Plan):

  • wasm/WasmPlan.h: Renamed from Source/JavaScriptCore/wasm/WASMPlan.h.
  • wasm/WasmSections.h: Renamed from Source/JavaScriptCore/wasm/WASMSections.h.

(JSC::Wasm::Sections::validateOrder):

Location:
trunk/Source/JavaScriptCore
Files:
9 edited
18 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r207653 r207693  
    862862    tools/JSDollarVMPrototype.cpp
    863863
    864     wasm/JSWASMModule.cpp
     864    wasm/JSWasmModule.cpp
    865865    wasm/JSWebAssembly.cpp
    866     wasm/WASMB3IRGenerator.cpp
    867     wasm/WASMCallingConvention.cpp
    868     wasm/WASMMemory.cpp
    869     wasm/WASMModuleParser.cpp
    870     wasm/WASMPlan.cpp
     866    wasm/WasmB3IRGenerator.cpp
     867    wasm/WasmCallingConvention.cpp
     868    wasm/WasmMemory.cpp
     869    wasm/WasmModuleParser.cpp
     870    wasm/WasmPlan.cpp
    871871
    872872    wasm/js/JSWebAssemblyCompileError.cpp

  • trunk/Source/JavaScriptCore/ChangeLog

    r207684 r207693  
     12016-10-21  Keith Miller  <keith_miller@apple.com>
     2
     3        Rename WASM to Wasm
     4        https://bugs.webkit.org/show_bug.cgi?id=163796
     5
     6        Rubber stamped by Filip Pizlo.
     7
     8        * CMakeLists.txt:
     9        * Configurations/ToolExecutable.xcconfig:
     10        * JavaScriptCore.xcodeproj/project.pbxproj:
     11        * llint/LLIntThunks.cpp:
     12        (JSC::vmEntryToWasm):
     13        (JSC::vmEntryToWASM): Deleted.
     14        * llint/LLIntThunks.h:
     15        * runtime/Executable.cpp:
     16        (JSC::WebAssemblyExecutable::WebAssemblyExecutable):
     17        * runtime/Executable.h:
     18        * shell/CMakeLists.txt:
     19        * testWASM.cpp:
     20        (runWASMTests): Deleted.
     21        * testWasm.cpp: Renamed from Source/JavaScriptCore/testWASM.cpp.
     22        (CommandLine::CommandLine):
     23        (printUsageStatement):
     24        (CommandLine::parseArguments):
     25        (runLEBTests):
     26        (invoke):
     27        (box):
     28        (runWasmTests):
     29        (main):
     30        * wasm/JSWASMModule.cpp:
     31        (JSC::JSWASMModule::JSWASMModule): Deleted.
     32        (JSC::JSWASMModule::destroy): Deleted.
     33        (JSC::JSWASMModule::visitChildren): Deleted.
     34        * wasm/JSWASMModule.h:
     35        (JSC::JSWASMModule::create): Deleted.
     36        (JSC::JSWASMModule::createStructure): Deleted.
     37        (JSC::JSWASMModule::i32Constants): Deleted.
     38        (JSC::JSWASMModule::f32Constants): Deleted.
     39        (JSC::JSWASMModule::f64Constants): Deleted.
     40        (JSC::JSWASMModule::signatures): Deleted.
     41        (JSC::JSWASMModule::functionImports): Deleted.
     42        (JSC::JSWASMModule::functionImportSignatures): Deleted.
     43        (JSC::JSWASMModule::globalVariableTypes): Deleted.
     44        (JSC::JSWASMModule::functionDeclarations): Deleted.
     45        (JSC::JSWASMModule::functionPointerTables): Deleted.
     46        (JSC::JSWASMModule::arrayBuffer): Deleted.
     47        (JSC::JSWASMModule::functions): Deleted.
     48        (JSC::JSWASMModule::functionStartOffsetsInSource): Deleted.
     49        (JSC::JSWASMModule::functionStackHeights): Deleted.
     50        (JSC::JSWASMModule::globalVariables): Deleted.
     51        (JSC::JSWASMModule::importedFunctions): Deleted.
     52        * wasm/JSWasmModule.cpp: Renamed from Source/JavaScriptCore/wasm/JSWASMModule.cpp.
     53        (JSC::JSWasmModule::JSWasmModule):
     54        (JSC::JSWasmModule::destroy):
     55        (JSC::JSWasmModule::visitChildren):
     56        * wasm/JSWasmModule.h: Renamed from Source/JavaScriptCore/wasm/JSWASMModule.h.
     57        (JSC::JSWasmModule::create):
     58        (JSC::JSWasmModule::createStructure):
     59        (JSC::JSWasmModule::i32Constants):
     60        (JSC::JSWasmModule::f32Constants):
     61        (JSC::JSWasmModule::f64Constants):
     62        (JSC::JSWasmModule::signatures):
     63        (JSC::JSWasmModule::functionImports):
     64        (JSC::JSWasmModule::functionImportSignatures):
     65        (JSC::JSWasmModule::globalVariableTypes):
     66        (JSC::JSWasmModule::functionDeclarations):
     67        (JSC::JSWasmModule::functionPointerTables):
     68        (JSC::JSWasmModule::arrayBuffer):
     69        (JSC::JSWasmModule::functions):
     70        (JSC::JSWasmModule::functionStartOffsetsInSource):
     71        (JSC::JSWasmModule::functionStackHeights):
     72        (JSC::JSWasmModule::globalVariables):
     73        (JSC::JSWasmModule::importedFunctions):
     74        * wasm/WASMB3IRGenerator.cpp:
     75        (JSC::WASM::createJSWrapper): Deleted.
     76        (JSC::WASM::parseAndCompile): Deleted.
     77        * wasm/WASMCallingConvention.cpp:
     78        (JSC::WASM::jscCallingConvention): Deleted.
     79        (JSC::WASM::wasmCallingConvention): Deleted.
     80        * wasm/WASMCallingConvention.h:
     81        (JSC::WASM::CallingConvention::CallingConvention): Deleted.
     82        (JSC::WASM::CallingConvention::marshallArgumentImpl): Deleted.
     83        (JSC::WASM::CallingConvention::marshallArgument): Deleted.
     84        (JSC::WASM::CallingConvention::loadArguments): Deleted.
     85        (JSC::WASM::CallingConvention::setupCall): Deleted.
     86        (JSC::WASM::nextJSCOffset): Deleted.
     87        * wasm/WASMFormat.h:
     88        (JSC::WASM::toB3Type): Deleted.
     89        (JSC::WASM::isValueType): Deleted.
     90        * wasm/WASMFunctionParser.h:
     91        (JSC::WASM::FunctionParser<Context>::FunctionParser): Deleted.
     92        (JSC::WASM::FunctionParser<Context>::parse): Deleted.
     93        (JSC::WASM::FunctionParser<Context>::parseBlock): Deleted.
     94        (JSC::WASM::FunctionParser<Context>::parseExpression): Deleted.
     95        (JSC::WASM::FunctionParser<Context>::parseUnreachableExpression): Deleted.
     96        * wasm/WASMMemory.cpp:
     97        (JSC::WASM::Memory::Memory): Deleted.
     98        * wasm/WASMMemory.h:
     99        (JSC::WASM::Memory::~Memory): Deleted.
     100        (JSC::WASM::Memory::memory): Deleted.
     101        (JSC::WASM::Memory::size): Deleted.
     102        (JSC::WASM::Memory::pinnedRegisters): Deleted.
     103        (JSC::WASM::Memory::mode): Deleted.
     104        (JSC::WASM::Memory::grow): Deleted.
     105        (JSC::WASM::Memory::offsetOfSize): Deleted.
     106        * wasm/WASMModuleParser.cpp:
     107        (JSC::WASM::ModuleParser::parse): Deleted.
     108        (JSC::WASM::ModuleParser::parseMemory): Deleted.
     109        (JSC::WASM::ModuleParser::parseFunctionTypes): Deleted.
     110        (JSC::WASM::ModuleParser::parseFunctionSignatures): Deleted.
     111        (JSC::WASM::ModuleParser::parseFunctionDefinitions): Deleted.
     112        * wasm/WASMModuleParser.h:
     113        (JSC::WASM::ModuleParser::ModuleParser): Deleted.
     114        (JSC::WASM::ModuleParser::functionInformation): Deleted.
     115        (JSC::WASM::ModuleParser::memory): Deleted.
     116        * wasm/WASMOps.h:
     117        (JSC::WASM::isValidOpType): Deleted.
     118        (JSC::WASM::isControlOp): Deleted.
     119        * wasm/WASMParser.h:
     120        (JSC::WASM::Parser::parseVarUInt32): Deleted.
     121        (JSC::WASM::Parser::parseVarUInt64): Deleted.
     122        (JSC::WASM::Parser::Parser): Deleted.
     123        (JSC::WASM::Parser::consumeCharacter): Deleted.
     124        (JSC::WASM::Parser::consumeString): Deleted.
     125        (JSC::WASM::Parser::parseUInt32): Deleted.
     126        (JSC::WASM::Parser::parseUInt7): Deleted.
     127        (JSC::WASM::Parser::parseVarUInt1): Deleted.
     128        (JSC::WASM::Parser::parseValueType): Deleted.
     129        * wasm/WASMPlan.cpp:
     130        (JSC::WASM::Plan::Plan): Deleted.
     131        * wasm/WASMSections.h:
     132        (JSC::WASM::Sections::validateOrder): Deleted.
     133        * wasm/WasmB3IRGenerator.cpp: Renamed from Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp.
     134        (dumpProcedure):
     135        (JSC::Wasm::createJSWrapper):
     136        (JSC::Wasm::parseAndCompile):
     137        * wasm/WasmB3IRGenerator.h: Renamed from Source/JavaScriptCore/wasm/WASMB3IRGenerator.h.
     138        * wasm/WasmCallingConvention.cpp: Renamed from Source/JavaScriptCore/wasm/WASMCallingConvention.cpp.
     139        (JSC::Wasm::jscCallingConvention):
     140        (JSC::Wasm::wasmCallingConvention):
     141        * wasm/WasmCallingConvention.h: Renamed from Source/JavaScriptCore/wasm/WASMCallingConvention.h.
     142        (JSC::Wasm::CallingConvention::CallingConvention):
     143        (JSC::Wasm::CallingConvention::marshallArgumentImpl):
     144        (JSC::Wasm::CallingConvention::marshallArgument):
     145        (JSC::Wasm::CallingConvention::loadArguments):
     146        (JSC::Wasm::CallingConvention::setupCall):
     147        (JSC::Wasm::nextJSCOffset):
     148        * wasm/WasmFormat.h: Renamed from Source/JavaScriptCore/wasm/WASMFormat.h.
     149        (JSC::Wasm::toB3Type):
     150        (JSC::Wasm::isValueType):
     151        * wasm/WasmFunctionParser.h: Renamed from Source/JavaScriptCore/wasm/WASMFunctionParser.h.
     152        (JSC::Wasm::FunctionParser<Context>::FunctionParser):
     153        (JSC::Wasm::FunctionParser<Context>::parse):
     154        (JSC::Wasm::FunctionParser<Context>::parseBlock):
     155        (JSC::Wasm::FunctionParser<Context>::parseExpression):
     156        (JSC::Wasm::FunctionParser<Context>::parseUnreachableExpression):
     157        * wasm/WasmMemory.cpp: Renamed from Source/JavaScriptCore/wasm/WASMMemory.cpp.
     158        (JSC::Wasm::Memory::Memory):
     159        * wasm/WasmMemory.h: Renamed from Source/JavaScriptCore/wasm/WASMMemory.h.
     160        (JSC::Wasm::Memory::~Memory):
     161        (JSC::Wasm::Memory::memory):
     162        (JSC::Wasm::Memory::size):
     163        (JSC::Wasm::Memory::pinnedRegisters):
     164        (JSC::Wasm::Memory::mode):
     165        (JSC::Wasm::Memory::grow):
     166        (JSC::Wasm::Memory::offsetOfSize):
     167        * wasm/WasmModuleParser.cpp: Renamed from Source/JavaScriptCore/wasm/WASMModuleParser.cpp.
     168        (JSC::Wasm::ModuleParser::parse):
     169        (JSC::Wasm::ModuleParser::parseMemory):
     170        (JSC::Wasm::ModuleParser::parseFunctionTypes):
     171        (JSC::Wasm::ModuleParser::parseFunctionSignatures):
     172        (JSC::Wasm::ModuleParser::parseFunctionDefinitions):
     173        * wasm/WasmModuleParser.h: Renamed from Source/JavaScriptCore/wasm/WASMModuleParser.h.
     174        (JSC::Wasm::ModuleParser::ModuleParser):
     175        (JSC::Wasm::ModuleParser::functionInformation):
     176        (JSC::Wasm::ModuleParser::memory):
     177        * wasm/WasmOps.h: Renamed from Source/JavaScriptCore/wasm/WASMOps.h.
     178        (JSC::Wasm::isValidOpType):
     179        (JSC::Wasm::isControlOp):
     180        * wasm/WasmParser.h: Renamed from Source/JavaScriptCore/wasm/WASMParser.h.
     181        (JSC::Wasm::Parser::parseVarUInt32):
     182        (JSC::Wasm::Parser::parseVarUInt64):
     183        (JSC::Wasm::Parser::Parser):
     184        (JSC::Wasm::Parser::consumeCharacter):
     185        (JSC::Wasm::Parser::consumeString):
     186        (JSC::Wasm::Parser::parseUInt32):
     187        (JSC::Wasm::Parser::parseUInt7):
     188        (JSC::Wasm::Parser::parseVarUInt1):
     189        (JSC::Wasm::Parser::parseValueType):
     190        * wasm/WasmPlan.cpp: Renamed from Source/JavaScriptCore/wasm/WASMPlan.cpp.
     191        (JSC::Wasm::Plan::Plan):
     192        * wasm/WasmPlan.h: Renamed from Source/JavaScriptCore/wasm/WASMPlan.h.
     193        * wasm/WasmSections.h: Renamed from Source/JavaScriptCore/wasm/WASMSections.h.
     194        (JSC::Wasm::Sections::validateOrder):
     195
    11962016-10-21  Caitlin Potter  <caitp@igalia.com>
    2197

  • trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

    r207542 r207693  
    3232CODE_SIGN_ENTITLEMENTS_ios_testapi = entitlements.plist;
    3333CODE_SIGN_ENTITLEMENTS_ios_testb3 = entitlements.plist;
    34 CODE_SIGN_ENTITLEMENTS_ios_testWASM = entitlements.plist;
     34CODE_SIGN_ENTITLEMENTS_ios_testWasm = entitlements.plist;
    3535CODE_SIGN_ENTITLEMENTS_ios_testRegExp = entitlements.plist;
    3636

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r207653 r207693  
    12101210                52C952B719A289850069B386 /* TypeProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 52C952B619A289850069B386 /* TypeProfiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12111211                52C952B919A28A1C0069B386 /* TypeProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52C952B819A28A1C0069B386 /* TypeProfiler.cpp */; };
    1212                 531374BD1D5CE67600AF7A0B /* WASMPlan.h in Headers */ = {isa = PBXBuildFile; fileRef = 531374BC1D5CE67600AF7A0B /* WASMPlan.h */; };
    1213                 531374BF1D5CE95000AF7A0B /* WASMPlan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531374BE1D5CE95000AF7A0B /* WASMPlan.cpp */; };
     1212                531374BD1D5CE67600AF7A0B /* WasmPlan.h in Headers */ = {isa = PBXBuildFile; fileRef = 531374BC1D5CE67600AF7A0B /* WasmPlan.h */; };
     1213                531374BF1D5CE95000AF7A0B /* WasmPlan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531374BE1D5CE95000AF7A0B /* WasmPlan.cpp */; };
    12141214                5341FC701DAC33E500E7E4D7 /* B3WasmBoundsCheckValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5341FC6F1DAC33E500E7E4D7 /* B3WasmBoundsCheckValue.cpp */; };
    12151215                5341FC721DAC343C00E7E4D7 /* B3WasmBoundsCheckValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5341FC711DAC343C00E7E4D7 /* B3WasmBoundsCheckValue.h */; };
    … …  
    12201220                534C457E1BC72549007476A7 /* JSTypedArrayViewConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 534C457D1BC72549007476A7 /* JSTypedArrayViewConstructor.cpp */; };
    12211221                53529A4C1C457B75000B49C6 /* APIUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 53529A4B1C457B75000B49C6 /* APIUtils.h */; };
    1222                 535557141D9D9EA5006D583B /* WASMMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 535557131D9D9EA5006D583B /* WASMMemory.h */; };
    1223                 535557161D9DFA32006D583B /* WASMMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 535557151D9DFA32006D583B /* WASMMemory.cpp */; };
     1222                535557141D9D9EA5006D583B /* WasmMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 535557131D9D9EA5006D583B /* WasmMemory.h */; };
     1223                535557161D9DFA32006D583B /* WasmMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 535557151D9DFA32006D583B /* WasmMemory.cpp */; };
    12241224                5370B4F51BF26202005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5370B4F31BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.cpp */; };
    12251225                5370B4F61BF26205005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370B4F41BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.h */; };
    … …  
    12271227                539EB0791D55607000C82EF7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
    12281228                539EB07A1D55607000C82EF7 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
    1229                 539EB0811D55608A00C82EF7 /* testWASM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 539EB0711D553DF800C82EF7 /* testWASM.cpp */; };
     1229                539EB0811D55608A00C82EF7 /* testWasm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 539EB0711D553DF800C82EF7 /* testWasm.cpp */; };
    12301230                539FB8BA1C99DA7C00940FA1 /* JSArrayInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 539FB8B91C99DA7C00940FA1 /* JSArrayInlines.h */; };
    12311231                53D444DC1DAF08AB00B92784 /* B3WasmAddressValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D444DB1DAF08AB00B92784 /* B3WasmAddressValue.h */; };
    12321232                53D444DE1DAF09A000B92784 /* B3WasmAddressValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53D444DD1DAF09A000B92784 /* B3WasmAddressValue.cpp */; };
    1233                 53F40E851D58F9770099A1B6 /* WASMSections.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E841D58F9770099A1B6 /* WASMSections.h */; };
    1234                 53F40E8B1D5901BB0099A1B6 /* WASMFunctionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E8A1D5901BB0099A1B6 /* WASMFunctionParser.h */; };
    1235                 53F40E8D1D5901F20099A1B6 /* WASMParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E8C1D5901F20099A1B6 /* WASMParser.h */; };
    1236                 53F40E8F1D5902820099A1B6 /* WASMB3IRGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F40E8E1D5902820099A1B6 /* WASMB3IRGenerator.cpp */; };
    1237                 53F40E911D5903020099A1B6 /* WASMOps.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E901D5903020099A1B6 /* WASMOps.h */; };
    1238                 53F40E931D5A4AB30099A1B6 /* WASMB3IRGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E921D5A4AB30099A1B6 /* WASMB3IRGenerator.h */; };
    1239                 53F40E951D5A7AEF0099A1B6 /* WASMModuleParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E941D5A7AEF0099A1B6 /* WASMModuleParser.h */; };
    1240                 53F40E971D5A7BEC0099A1B6 /* WASMModuleParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F40E961D5A7BEC0099A1B6 /* WASMModuleParser.cpp */; };
     1233                53F40E851D58F9770099A1B6 /* WasmSections.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E841D58F9770099A1B6 /* WasmSections.h */; };
     1234                53F40E8B1D5901BB0099A1B6 /* WasmFunctionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E8A1D5901BB0099A1B6 /* WasmFunctionParser.h */; };
     1235                53F40E8D1D5901F20099A1B6 /* WasmParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E8C1D5901F20099A1B6 /* WasmParser.h */; };
     1236                53F40E8F1D5902820099A1B6 /* WasmB3IRGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F40E8E1D5902820099A1B6 /* WasmB3IRGenerator.cpp */; };
     1237                53F40E911D5903020099A1B6 /* WasmOps.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E901D5903020099A1B6 /* WasmOps.h */; };
     1238                53F40E931D5A4AB30099A1B6 /* WasmB3IRGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E921D5A4AB30099A1B6 /* WasmB3IRGenerator.h */; };
     1239                53F40E951D5A7AEF0099A1B6 /* WasmModuleParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F40E941D5A7AEF0099A1B6 /* WasmModuleParser.h */; };
     1240                53F40E971D5A7BEC0099A1B6 /* WasmModuleParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F40E961D5A7BEC0099A1B6 /* WasmModuleParser.cpp */; };
    12411241                53F6BF6D1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F6BF6C1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12421242                53FA2AE11CF37F3F0022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 53FA2AE01CF37F3F0022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12431243                53FA2AE31CF380390022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53FA2AE21CF380390022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp */; };
    1244                 53FD04D31D7AB277003287D3 /* WASMCallingConvention.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53FD04D11D7AB187003287D3 /* WASMCallingConvention.cpp */; };
    1245                 53FD04D41D7AB291003287D3 /* WASMCallingConvention.h in Headers */ = {isa = PBXBuildFile; fileRef = 53FD04D21D7AB187003287D3 /* WASMCallingConvention.h */; };
     1244                53FD04D31D7AB277003287D3 /* WasmCallingConvention.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53FD04D11D7AB187003287D3 /* WasmCallingConvention.cpp */; };
     1245                53FD04D41D7AB291003287D3 /* WasmCallingConvention.h in Headers */ = {isa = PBXBuildFile; fileRef = 53FD04D21D7AB187003287D3 /* WasmCallingConvention.h */; };
    12461246                5D5D8AD10E0D0EBE00F9C692 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */; };
    12471247                5DBB151B131D0B310056AD36 /* testapi.js in Copy Support Script */ = {isa = PBXBuildFile; fileRef = 14D857740A4696C80032146C /* testapi.js */; };
    … …  
    13661366                79F8FC1E1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79F8FC1C1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp */; };
    13671367                79F8FC1F1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 79F8FC1D1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h */; };
    1368                 7B98D1361B60CD5F0023B1A4 /* JSWASMModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */; };
    1369                 7B98D1371B60CD620023B1A4 /* JSWASMModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1370                 7BC547D31B6959A100959B58 /* WASMFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC547D21B69599B00959B58 /* WASMFormat.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1368                7B98D1361B60CD5F0023B1A4 /* JSWasmModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */; };
     1369                7B98D1371B60CD620023B1A4 /* JSWasmModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1370                7BC547D31B6959A100959B58 /* WasmFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC547D21B69599B00959B58 /* WasmFormat.h */; settings = {ATTRIBUTES = (Private, ); }; };
    13711371                7C008CDA187124BB00955C24 /* JSPromiseDeferred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C008CD8187124BB00955C24 /* JSPromiseDeferred.cpp */; };
    13721372                7C008CDB187124BB00955C24 /* JSPromiseDeferred.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C008CD9187124BB00955C24 /* JSPromiseDeferred.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    35113511                52C952B619A289850069B386 /* TypeProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypeProfiler.h; sourceTree = "<group>"; };
    35123512                52C952B819A28A1C0069B386 /* TypeProfiler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypeProfiler.cpp; sourceTree = "<group>"; };
    3513                 531374BC1D5CE67600AF7A0B /* WASMPlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMPlan.h; sourceTree = "<group>"; };
    3514                 531374BE1D5CE95000AF7A0B /* WASMPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMPlan.cpp; sourceTree = "<group>"; };
     3513                531374BC1D5CE67600AF7A0B /* WasmPlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmPlan.h; sourceTree = "<group>"; };
     3514                531374BE1D5CE95000AF7A0B /* WasmPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmPlan.cpp; sourceTree = "<group>"; };
    35153515                5341FC6F1DAC33E500E7E4D7 /* B3WasmBoundsCheckValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3WasmBoundsCheckValue.cpp; path = b3/B3WasmBoundsCheckValue.cpp; sourceTree = "<group>"; };
    35163516                5341FC711DAC343C00E7E4D7 /* B3WasmBoundsCheckValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3WasmBoundsCheckValue.h; path = b3/B3WasmBoundsCheckValue.h; sourceTree = "<group>"; };
    … …  
    35233523                534C457D1BC72549007476A7 /* JSTypedArrayViewConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypedArrayViewConstructor.cpp; sourceTree = "<group>"; };
    35243524                53529A4B1C457B75000B49C6 /* APIUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUtils.h; sourceTree = "<group>"; };
    3525                 535557131D9D9EA5006D583B /* WASMMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMMemory.h; sourceTree = "<group>"; };
    3526                 535557151D9DFA32006D583B /* WASMMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMMemory.cpp; sourceTree = "<group>"; };
     3525                535557131D9D9EA5006D583B /* WasmMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmMemory.h; sourceTree = "<group>"; };
     3526                535557151D9DFA32006D583B /* WasmMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmMemory.cpp; sourceTree = "<group>"; };
    35273527                5370B4F31BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AdaptiveInferredPropertyValueWatchpointBase.cpp; sourceTree = "<group>"; };
    35283528                5370B4F41BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdaptiveInferredPropertyValueWatchpointBase.h; sourceTree = "<group>"; };
    … …  
    35303530                53917E7C1B791106000EBD33 /* JSTypedArrayViewPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypedArrayViewPrototype.h; sourceTree = "<group>"; };
    35313531                53917E831B791CB8000EBD33 /* TypedArrayPrototype.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = TypedArrayPrototype.js; path = builtins/TypedArrayPrototype.js; sourceTree = SOURCE_ROOT; };
    3532                 539EB0711D553DF800C82EF7 /* testWASM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testWASM.cpp; sourceTree = "<group>"; };
     3532                539EB0711D553DF800C82EF7 /* testWasm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testWasm.cpp; sourceTree = "<group>"; };
    35333533                539EB0801D55607000C82EF7 /* testWASM */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testWASM; sourceTree = BUILT_PRODUCTS_DIR; };
    35343534                539FB8B91C99DA7C00940FA1 /* JSArrayInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSArrayInlines.h; sourceTree = "<group>"; };
    … …  
    35363536                53D444DD1DAF09A000B92784 /* B3WasmAddressValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3WasmAddressValue.cpp; path = b3/B3WasmAddressValue.cpp; sourceTree = "<group>"; };
    35373537                53F256E11B87E28000B4B768 /* JSTypedArrayViewPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypedArrayViewPrototype.cpp; sourceTree = "<group>"; };
    3538                 53F40E841D58F9770099A1B6 /* WASMSections.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMSections.h; sourceTree = "<group>"; };
    3539                 53F40E8A1D5901BB0099A1B6 /* WASMFunctionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMFunctionParser.h; sourceTree = "<group>"; };
    3540                 53F40E8C1D5901F20099A1B6 /* WASMParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMParser.h; sourceTree = "<group>"; };
    3541                 53F40E8E1D5902820099A1B6 /* WASMB3IRGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMB3IRGenerator.cpp; sourceTree = "<group>"; };
    3542                 53F40E901D5903020099A1B6 /* WASMOps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMOps.h; sourceTree = "<group>"; };
    3543                 53F40E921D5A4AB30099A1B6 /* WASMB3IRGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMB3IRGenerator.h; sourceTree = "<group>"; };
    3544                 53F40E941D5A7AEF0099A1B6 /* WASMModuleParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMModuleParser.h; sourceTree = "<group>"; };
    3545                 53F40E961D5A7BEC0099A1B6 /* WASMModuleParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMModuleParser.cpp; sourceTree = "<group>"; };
     3538                53F40E841D58F9770099A1B6 /* WasmSections.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmSections.h; sourceTree = "<group>"; };
     3539                53F40E8A1D5901BB0099A1B6 /* WasmFunctionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmFunctionParser.h; sourceTree = "<group>"; };
     3540                53F40E8C1D5901F20099A1B6 /* WasmParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmParser.h; sourceTree = "<group>"; };
     3541                53F40E8E1D5902820099A1B6 /* WasmB3IRGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmB3IRGenerator.cpp; sourceTree = "<group>"; };
     3542                53F40E901D5903020099A1B6 /* WasmOps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmOps.h; sourceTree = "<group>"; };
     3543                53F40E921D5A4AB30099A1B6 /* WasmB3IRGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmB3IRGenerator.h; sourceTree = "<group>"; };
     3544                53F40E941D5A7AEF0099A1B6 /* WasmModuleParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmModuleParser.h; sourceTree = "<group>"; };
     3545                53F40E961D5A7BEC0099A1B6 /* WasmModuleParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmModuleParser.cpp; sourceTree = "<group>"; };
    35463546                53F6BF6C1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InternalFunctionAllocationProfile.h; sourceTree = "<group>"; };
    35473547                53FA2AE01CF37F3F0022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LLIntPrototypeLoadAdaptiveStructureWatchpoint.h; sourceTree = "<group>"; };
    35483548                53FA2AE21CF380390022711D /* LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp; sourceTree = "<group>"; };
    3549                 53FD04D11D7AB187003287D3 /* WASMCallingConvention.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMCallingConvention.cpp; sourceTree = "<group>"; };
    3550                 53FD04D21D7AB187003287D3 /* WASMCallingConvention.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMCallingConvention.h; sourceTree = "<group>"; };
     3549                53FD04D11D7AB187003287D3 /* WasmCallingConvention.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmCallingConvention.cpp; sourceTree = "<group>"; };
     3550                53FD04D21D7AB187003287D3 /* WasmCallingConvention.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmCallingConvention.h; sourceTree = "<group>"; };
    35513551                5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libedit.dylib; path = /usr/lib/libedit.dylib; sourceTree = "<absolute>"; };
    35523552                5DAFD6CB146B686300FBEFB4 /* JSC.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = JSC.xcconfig; sourceTree = "<group>"; };
    … …  
    37073707                79F8FC1C1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGMaximalFlushInsertionPhase.cpp; path = dfg/DFGMaximalFlushInsertionPhase.cpp; sourceTree = "<group>"; };
    37083708                79F8FC1D1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGMaximalFlushInsertionPhase.h; path = dfg/DFGMaximalFlushInsertionPhase.h; sourceTree = "<group>"; };
    3709                 7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWASMModule.cpp; sourceTree = "<group>"; };
    3710                 7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWASMModule.h; sourceTree = "<group>"; };
    3711                 7BC547D21B69599B00959B58 /* WASMFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMFormat.h; sourceTree = "<group>"; };
     3709                7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWasmModule.cpp; sourceTree = "<group>"; };
     3710                7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWasmModule.h; sourceTree = "<group>"; };
     3711                7BC547D21B69599B00959B58 /* WasmFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmFormat.h; sourceTree = "<group>"; };
    37123712                7C008CD8187124BB00955C24 /* JSPromiseDeferred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPromiseDeferred.cpp; sourceTree = "<group>"; };
    37133713                7C008CD9187124BB00955C24 /* JSPromiseDeferred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPromiseDeferred.h; sourceTree = "<group>"; };
    … …  
    52965296                                86D22219167EF9440024C804 /* testapi.mm */,
    52975297                                651122E5140469BA002B101D /* testRegExp.cpp */,
    5298                                 539EB0711D553DF800C82EF7 /* testWASM.cpp */,
     5298                                539EB0711D553DF800C82EF7 /* testWasm.cpp */,
    52995299                        );
    53005300                        name = tests;
    … …  
    58205820                                AD2FCC2F1DB839F700B3E736 /* JSWebAssembly.h */,
    58215821                                AD2FCB8A1DB5840000B3E736 /* js */,
    5822                                 7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */,
    5823                                 7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */,
    5824                                 53F40E8E1D5902820099A1B6 /* WASMB3IRGenerator.cpp */,
    5825                                 53F40E921D5A4AB30099A1B6 /* WASMB3IRGenerator.h */,
    5826                                 53FD04D11D7AB187003287D3 /* WASMCallingConvention.cpp */,
    5827                                 53FD04D21D7AB187003287D3 /* WASMCallingConvention.h */,
    5828                                 53F40E901D5903020099A1B6 /* WASMOps.h */,
    5829                                 7BC547D21B69599B00959B58 /* WASMFormat.h */,
    5830                                 53F40E8A1D5901BB0099A1B6 /* WASMFunctionParser.h */,
    5831                                 535557151D9DFA32006D583B /* WASMMemory.cpp */,
    5832                                 535557131D9D9EA5006D583B /* WASMMemory.h */,
    5833                                 53F40E961D5A7BEC0099A1B6 /* WASMModuleParser.cpp */,
    5834                                 53F40E941D5A7AEF0099A1B6 /* WASMModuleParser.h */,
    5835                                 531374BE1D5CE95000AF7A0B /* WASMPlan.cpp */,
    5836                                 531374BC1D5CE67600AF7A0B /* WASMPlan.h */,
    5837                                 53F40E8C1D5901F20099A1B6 /* WASMParser.h */,
    5838                                 53F40E841D58F9770099A1B6 /* WASMSections.h */,
     5822                                7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */,
     5823                                7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */,
     5824                                53F40E8E1D5902820099A1B6 /* WasmB3IRGenerator.cpp */,
     5825                                53F40E921D5A4AB30099A1B6 /* WasmB3IRGenerator.h */,
     5826                                53FD04D11D7AB187003287D3 /* WasmCallingConvention.cpp */,
     5827                                53FD04D21D7AB187003287D3 /* WasmCallingConvention.h */,
     5828                                53F40E901D5903020099A1B6 /* WasmOps.h */,
     5829                                7BC547D21B69599B00959B58 /* WasmFormat.h */,
     5830                                53F40E8A1D5901BB0099A1B6 /* WasmFunctionParser.h */,
     5831                                535557151D9DFA32006D583B /* WasmMemory.cpp */,
     5832                                535557131D9D9EA5006D583B /* WasmMemory.h */,
     5833                                53F40E961D5A7BEC0099A1B6 /* WasmModuleParser.cpp */,
     5834                                53F40E941D5A7AEF0099A1B6 /* WasmModuleParser.h */,
     5835                                531374BE1D5CE95000AF7A0B /* WasmPlan.cpp */,
     5836                                531374BC1D5CE67600AF7A0B /* WasmPlan.h */,
     5837                                53F40E8C1D5901F20099A1B6 /* WasmParser.h */,
     5838                                53F40E841D58F9770099A1B6 /* WasmSections.h */,
    58395839                        );
    58405840                        path = wasm;
    … …  
    76047604                                C2FCAE1317A9C24E0034C735 /* BytecodeLivenessAnalysis.h in Headers */,
    76057605                                0F666EC0183566F900D017F1 /* BytecodeLivenessAnalysisInlines.h in Headers */,
    7606                                 53F40E951D5A7AEF0099A1B6 /* WASMModuleParser.h in Headers */,
     7606                                53F40E951D5A7AEF0099A1B6 /* WasmModuleParser.h in Headers */,
    76077607                                6514F21918B3E1670098FF8B /* Bytecodes.h in Headers */,
    76087608                                0F885E111849A3BE00F1E3FA /* BytecodeUseDef.h in Headers */,
    … …  
    76847684                                6AD2CB4D19B9140100065719 /* DebuggerEvalEnabler.h in Headers */,
    76857685                                FEA08621182B7A0400F6D851 /* DebuggerPrimitives.h in Headers */,
    7686                                 53F40E851D58F9770099A1B6 /* WASMSections.h in Headers */,
     7686                                53F40E851D58F9770099A1B6 /* WasmSections.h in Headers */,
    76877687                                DC9A0C1F1D2D9CB10085124E /* B3CaseCollectionInlines.h in Headers */,
    76887688                                0F2D4DDE19832D34007D4B19 /* DebuggerScope.h in Headers */,
    … …  
    78447844                                0F392C8A1B46188400844728 /* DFGOSRExitFuzz.h in Headers */,
    78457845                                0FEFC9AB1681A3B600567F53 /* DFGOSRExitJumpPlaceholder.h in Headers */,
    7846                                 53F40E8D1D5901F20099A1B6 /* WASMParser.h in Headers */,
     7846                                53F40E8D1D5901F20099A1B6 /* WasmParser.h in Headers */,
    78477847                                0F40E4A81C497F7400A577FA /* AirOpcodeGenerated.h in Headers */,
    78487848                                0F235BEE17178E7300690C7F /* DFGOSRExitPreparation.h in Headers */,
    … …  
    80108010                                0F2B66AE17B6B54500A7AE3F /* GCIncomingRefCountedSet.h in Headers */,
    80118011                                0F2B66AF17B6B54500A7AE3F /* GCIncomingRefCountedSetInlines.h in Headers */,
    8012                                 531374BD1D5CE67600AF7A0B /* WASMPlan.h in Headers */,
     8012                                531374BD1D5CE67600AF7A0B /* WasmPlan.h in Headers */,
    80138013                                2AABCDE718EF294200002096 /* GCLogging.h in Headers */,
    80148014                                0F2BBD981C5FF3F50023EF23 /* B3Variable.h in Headers */,
    … …  
    80648064                                1478297B1379E8A800A7C2A3 /* HandleTypes.h in Headers */,
    80658065                                0F10F1A31C420BF0001C07D2 /* AirCustom.h in Headers */,
    8066                                 535557141D9D9EA5006D583B /* WASMMemory.h in Headers */,
     8066                                535557141D9D9EA5006D583B /* WasmMemory.h in Headers */,
    80678067                                14BA7A9813AADFF8005B7C2C /* Heap.h in Headers */,
    80688068                                0F32BD111BB34F190093A57F /* HeapHelperPool.h in Headers */,
    … …  
    82388238                                797E07AA1B8FCFB9008400BA /* JSGlobalLexicalEnvironment.h in Headers */,
    82398239                                BC18C4210E16F5CD00B34460 /* JSGlobalObject.h in Headers */,
    8240                                 53F40E8B1D5901BB0099A1B6 /* WASMFunctionParser.h in Headers */,
     8240                                53F40E8B1D5901BB0099A1B6 /* WasmFunctionParser.h in Headers */,
    82418241                                996B731D1BDA08EF00331B84 /* JSGlobalObject.lut.h in Headers */,
    82428242                                A5FD0086189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h in Headers */,
    … …  
    83068306                                FE1220271BE7F58C0039E6F2 /* JITAddGenerator.h in Headers */,
    83078307                                0F919D11157F332C004A4E7D /* JSSegmentedVariableObject.h in Headers */,
    8308                                 53F40E911D5903020099A1B6 /* WASMOps.h in Headers */,
     8308                                53F40E911D5903020099A1B6 /* WasmOps.h in Headers */,
    83098309                                A7299D9E17D12837005F5FF9 /* JSSet.h in Headers */,
    83108310                                A790DD70182F499700588807 /* JSSetIterator.h in Headers */,
    … …  
    83428342                                86E3C615167BABD7006D760A /* JSVirtualMachine.h in Headers */,
    83438343                                86E3C61D167BABEE006D760A /* JSVirtualMachineInternal.h in Headers */,
    8344                                 7B98D1371B60CD620023B1A4 /* JSWASMModule.h in Headers */,
     8344                                7B98D1371B60CD620023B1A4 /* JSWasmModule.h in Headers */,
    83458345                                DC605B5E1CE26EA200593718 /* ProfilerEvent.h in Headers */,
    83468346                                A7CA3AE817DA41AE006538AF /* JSWeakMap.h in Headers */,
    … …  
    83588358                                99DA00B01BD5994E00F4575C /* lazywriter.py in Headers */,
    83598359                                BC18C4310E16F5CD00B34460 /* Lexer.h in Headers */,
    8360                                 53F40E931D5A4AB30099A1B6 /* WASMB3IRGenerator.h in Headers */,
     8360                                53F40E931D5A4AB30099A1B6 /* WasmB3IRGenerator.h in Headers */,
    83618361                                BC18C52E0E16FCE100B34460 /* Lexer.lut.h in Headers */,
    83628362                                DCF3D56B1CD29472003D5C65 /* LazyClassStructureInlines.h in Headers */,
    … …  
    86088608                                0F33FCFC1C1625BE00323F67 /* B3Dominators.h in Headers */,
    86098609                                E32FF1EA1DA7571C00A8BF21 /* DOMJITSlowPathCalls.h in Headers */,
    8610                                 53FD04D41D7AB291003287D3 /* WASMCallingConvention.h in Headers */,
     8610                                53FD04D41D7AB291003287D3 /* WasmCallingConvention.h in Headers */,
    86118611                                705B41B21A6E501E00716757 /* SymbolPrototype.h in Headers */,
    86128612                                AD2FCC201DB59CB200B3E736 /* WebAssemblyTableConstructor.lut.h in Headers */,
    … …  
    86698669                                658D3A5619638268003C45D6 /* VMEntryRecord.h in Headers */,
    86708670                                FE5932A8183C5A2600A1ECCC /* VMEntryScope.h in Headers */,
    8671                                 7BC547D31B6959A100959B58 /* WASMFormat.h in Headers */,
     8671                                7BC547D31B6959A100959B58 /* WasmFormat.h in Headers */,
    86728672                                0F6B8ADD1C4EFAC300969052 /* B3SSACalculator.h in Headers */,
    86738673                                0F2BBD9A1C5FF3F50023EF23 /* B3VariableValue.h in Headers */,
    … …  
    92129212                        buildActionMask = 2147483647;
    92139213                        files = (
    9214                                 539EB0811D55608A00C82EF7 /* testWASM.cpp in Sources */,
     9214                                539EB0811D55608A00C82EF7 /* testWasm.cpp in Sources */,
    92159215                        );
    92169216                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    94289428                                0FD3C82614115D4000FD81CB /* DFGDriver.cpp in Sources */,
    94299429                                0FF0F19E16B72A0B005DF95B /* DFGEdge.cpp in Sources */,
    9430                                 535557161D9DFA32006D583B /* WASMMemory.cpp in Sources */,
     9430                                535557161D9DFA32006D583B /* WasmMemory.cpp in Sources */,
    94319431                                0F8F14331ADF090100ED792C /* DFGEpoch.cpp in Sources */,
    94329432                                0FBC0AE71496C7C400D4FBDD /* DFGExitProfile.cpp in Sources */,
    … …  
    94559455                                FEA0C4021CDD7D1D00481991 /* FunctionWhitelist.cpp in Sources */,
    94569456                                A73A535A1799CD5D00170C19 /* DFGLazyJSValue.cpp in Sources */,
    9457                                 53FD04D31D7AB277003287D3 /* WASMCallingConvention.cpp in Sources */,
     9457                                53FD04D31D7AB277003287D3 /* WasmCallingConvention.cpp in Sources */,
    94589458                                62F2AA371B0BEDE300610C7A /* DFGLazyNode.cpp in Sources */,
    94599459                                A7D9A29717A0BC7400EE2618 /* DFGLICMPhase.cpp in Sources */,
    … …  
    96439643                                A513E5B7185B8BD3007E95AD /* InjectedScript.cpp in Sources */,
    96449644                                A514B2C2185A684400F3C7CB /* InjectedScriptBase.cpp in Sources */,
    9645                                 531374BF1D5CE95000AF7A0B /* WASMPlan.cpp in Sources */,
     9645                                531374BF1D5CE95000AF7A0B /* WasmPlan.cpp in Sources */,
    96469646                                A58E35911860DECF001F24FE /* InjectedScriptHost.cpp in Sources */,
    96479647                                A513E5CA185F9624007E95AD /* InjectedScriptManager.cpp in Sources */,
    … …  
    98229822                                14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */,
    98239823                                86E3C61C167BABEE006D760A /* JSVirtualMachine.mm in Sources */,
    9824                                 7B98D1361B60CD5F0023B1A4 /* JSWASMModule.cpp in Sources */,
     9824                                7B98D1361B60CD5F0023B1A4 /* JSWasmModule.cpp in Sources */,
    98259825                                A7CA3AE717DA41AE006538AF /* JSWeakMap.cpp in Sources */,
    98269826                                A7482B9411671147003B0712 /* JSWeakObjectMapRefPrivate.cpp in Sources */,
    … …  
    1004410044                                FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */,
    1004510045                                FE187A011BFBE55E0038BBCA /* JITMulGenerator.cpp in Sources */,
    10046                                 53F40E8F1D5902820099A1B6 /* WASMB3IRGenerator.cpp in Sources */,
     10046                                53F40E8F1D5902820099A1B6 /* WasmB3IRGenerator.cpp in Sources */,
    1004710047                                26718BA41BE99F780052017B /* AirIteratedRegisterCoalescing.cpp in Sources */,
    1004810048                                FED94F2E171E3E2300BE77A4 /* Watchdog.cpp in Sources */,
    … …  
    1005510055                                0F338DF91BE96AA80013C88F /* B3CCallValue.cpp in Sources */,
    1005610056                                A7CA3AEB17DA5168006538AF /* WeakMapData.cpp in Sources */,
    10057                                 53F40E971D5A7BEC0099A1B6 /* WASMModuleParser.cpp in Sources */,
     10057                                53F40E971D5A7BEC0099A1B6 /* WasmModuleParser.cpp in Sources */,
    1005810058                                A7CA3AE517DA41AE006538AF /* WeakMapPrototype.cpp in Sources */,
    1005910059                                14E84FA014EE1ACC00D6D5D4 /* WeakSet.cpp in Sources */,

  • trunk/Source/JavaScriptCore/llint/LLIntThunks.cpp

    r205462 r207693  
    4343namespace JSC {
    4444
    45 EncodedJSValue JS_EXPORT_PRIVATE vmEntryToWASM(void* code, VM* vm, ProtoCallFrame* frame)
     45EncodedJSValue JS_EXPORT_PRIVATE vmEntryToWasm(void* code, VM* vm, ProtoCallFrame* frame)
    4646{
    4747    return vmEntryToJavaScript(code, vm, frame);

  • trunk/Source/JavaScriptCore/llint/LLIntThunks.h

    r206525 r207693  
    3939}
    4040
    41 EncodedJSValue JS_EXPORT_PRIVATE vmEntryToWASM(void*, VM*, ProtoCallFrame*);
     41EncodedJSValue JS_EXPORT_PRIVATE vmEntryToWasm(void*, VM*, ProtoCallFrame*);
    4242
    4343namespace LLInt {

  • trunk/Source/JavaScriptCore/runtime/Executable.cpp

    r207475 r207693  
    3232#include "JIT.h"
    3333#include "JSCInlines.h"
    34 #include "JSWASMModule.h"
     34#include "JSWasmModule.h"
    3535#include "LLIntEntrypoint.h"
    3636#include "Parser.h"
    … …  
    748748const ClassInfo WebAssemblyExecutable::s_info = { "WebAssemblyExecutable", &ExecutableBase::s_info, 0, CREATE_METHOD_TABLE(WebAssemblyExecutable) };
    749749
    750 WebAssemblyExecutable::WebAssemblyExecutable(VM& vm, const SourceCode& source, JSWASMModule* module, unsigned functionIndex)
     750WebAssemblyExecutable::WebAssemblyExecutable(VM& vm, const SourceCode& source, JSWasmModule* module, unsigned functionIndex)
    751751    : ExecutableBase(vm, vm.webAssemblyExecutableStructure.get(), NUM_PARAMETERS_NOT_COMPILED, NoIntrinsic)
    752752    , m_source(source)

  • trunk/Source/JavaScriptCore/runtime/Executable.h

    r207475 r207693  
    4747class FunctionCodeBlock;
    4848class JSScope;
    49 class JSWASMModule;
     49class JSWasmModule;
    5050class LLIntOffsetsExtractor;
    5151class ModuleProgramCodeBlock;
    … …  
    720720    static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
    721721
    722     static WebAssemblyExecutable* create(VM& vm, const SourceCode& source, JSWASMModule* module, unsigned functionIndex)
     722    static WebAssemblyExecutable* create(VM& vm, const SourceCode& source, JSWasmModule* module, unsigned functionIndex)
    723723    {
    724724        WebAssemblyExecutable* executable = new (NotNull, allocateCell<WebAssemblyExecutable>(vm.heap)) WebAssemblyExecutable(vm, source, module, functionIndex);
    … …  
    745745private:
    746746    friend class ExecutableBase;
    747     WebAssemblyExecutable(VM&, const SourceCode&, JSWASMModule*, unsigned functionIndex);
     747    WebAssemblyExecutable(VM&, const SourceCode&, JSWasmModule*, unsigned functionIndex);
    748748
    749749    static void visitChildren(JSCell*, SlotVisitor&);
    750750
    751751    SourceCode m_source;
    752     WriteBarrier<JSWASMModule> m_module;
     752    WriteBarrier<JSWasmModule> m_module;
    753753    unsigned m_functionIndex;
    754754

  • trunk/Source/JavaScriptCore/shell/CMakeLists.txt

    r206434 r207693  
    5151
    5252    set(TESTWASM_SOURCES
    53         ../testWASM.cpp
     53        ../testWasm.cpp
    5454    )
    5555

  • trunk/Source/JavaScriptCore/testWasm.cpp

    r207692 r207693  
    3333#include "ProtoCallFrame.h"
    3434#include "VM.h"
    35 #include "WASMMemory.h"
    36 #include "WASMPlan.h"
     35#include "WasmMemory.h"
     36#include "WasmPlan.h"
    3737
    3838#include <wtf/DataLog.h>
    … …  
    4848    Vector<String> m_arguments;
    4949    bool m_runLEBTests { false };
    50     bool m_runWASMTests { false };
     50    bool m_runWasmTests { false };
    5151
    5252    void parseArguments(int, char**);
    … …  
    5555static NO_RETURN void printUsageStatement(bool help = false)
    5656{
    57     fprintf(stderr, "Usage: testWASM [options]\n");
     57    fprintf(stderr, "Usage: testWasm [options]\n");
    5858    fprintf(stderr, "  -h|--help  Prints this help message\n");
    5959    fprintf(stderr, "  -l|--leb   Runs the LEB decoder tests\n");
    60     fprintf(stderr, "  -w|--web   Run the WASM tests\n");
     60    fprintf(stderr, "  -w|--web   Run the Wasm tests\n");
    6161    fprintf(stderr, "\n");
    6262
    … …  
    7777
    7878        if (!strcmp(arg, "-w") || !strcmp(arg, "--web"))
    79             m_runWASMTests = true;
     79            m_runWasmTests = true;
    8080    }
    8181
    … …  
    205205
    206206using namespace JSC;
    207 using namespace WASM;
     207using namespace Wasm;
    208208using namespace B3;
    209209
    … …  
    226226
    227227    // This won't work for floating point values but we don't have those yet.
    228     return static_cast<T>(vmEntryToWASM(ptr.executableAddress(), vm, &protoCallFrame));
     228    return static_cast<T>(vmEntryToWasm(ptr.executableAddress(), vm, &protoCallFrame));
    229229}
    230230
    … …  
    241241
    242242// For now we inline the test files.
    243 static void runWASMTests()
     243static void runWasmTests()
    244244{
    245245    {
    … …  
    11901190        runLEBTests();
    11911191
    1192     if (options.m_runWASMTests) {
     1192    if (options.m_runWasmTests) {
    11931193#if ENABLE(WEBASSEMBLY)
    11941194        JSC::initializeThreading();
    11951195        vm = &JSC::VM::create(JSC::LargeHeap).leakRef();
    1196         runWASMTests();
     1196        runWasmTests();
    11971197#else
    1198         dataLogLn("WASM is not enabled!");
     1198        dataLogLn("Wasm is not enabled!");
    11991199        return EXIT_FAILURE;
    12001200#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/JSWasmModule.cpp

    r207692 r207693  
    2525
    2626#include "config.h"
    27 #include "JSWASMModule.h"
     27#include "JSWasmModule.h"
    2828
    2929#if ENABLE(WEBASSEMBLY)
    … …  
    4040namespace JSC {
    4141
    42 const ClassInfo JSWASMModule::s_info = { "WASMModule", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWASMModule) };
     42const ClassInfo JSWasmModule::s_info = { "WasmModule", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWasmModule) };
    4343
    44 JSWASMModule::JSWASMModule(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
     44JSWasmModule::JSWasmModule(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
    4545    : Base(vm, structure)
    4646{
    … …  
    4949}
    5050
    51 void JSWASMModule::destroy(JSCell* cell)
     51void JSWasmModule::destroy(JSCell* cell)
    5252{
    53     JSWASMModule* thisObject = jsCast<JSWASMModule*>(cell);
    54     thisObject->JSWASMModule::~JSWASMModule();
     53    JSWasmModule* thisObject = jsCast<JSWasmModule*>(cell);
     54    thisObject->JSWasmModule::~JSWasmModule();
    5555}
    5656
    57 void JSWASMModule::visitChildren(JSCell* cell, SlotVisitor& visitor)
     57void JSWasmModule::visitChildren(JSCell* cell, SlotVisitor& visitor)
    5858{
    59     JSWASMModule* thisObject = jsCast<JSWASMModule*>(cell);
     59    JSWasmModule* thisObject = jsCast<JSWasmModule*>(cell);
    6060    ASSERT_GC_OBJECT_INHERITS(thisObject, info());
    6161    Base::visitChildren(thisObject, visitor);

  • trunk/Source/JavaScriptCore/wasm/JSWasmModule.h

    r207692 r207693  
    2929
    3030#include "JSDestructibleObject.h"
    31 #include "WASMFormat.h"
     31#include "WasmFormat.h"
    3232
    3333namespace JSC {
    3434
    35 class JSWASMModule : public JSDestructibleObject {
     35class JSWasmModule : public JSDestructibleObject {
    3636public:
    3737    typedef JSDestructibleObject Base;
    … …  
    5656    };
    5757
    58     static JSWASMModule* create(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
     58    static JSWasmModule* create(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
    5959    {
    60         JSWASMModule* module = new (NotNull, allocateCell<JSWASMModule>(vm.heap)) JSWASMModule(vm, structure, arrayBuffer);
     60        JSWasmModule* module = new (NotNull, allocateCell<JSWasmModule>(vm.heap)) JSWasmModule(vm, structure, arrayBuffer);
    6161        module->finishCreation(vm);
    6262        return module;
    … …  
    7676    Vector<float>& f32Constants() { return m_f32Constants; }
    7777    Vector<double>& f64Constants() { return m_f64Constants; }
    78     Vector<WASM::Signature>& signatures() { return m_signatures; }
    79     Vector<WASM::FunctionImport>& functionImports() { return m_functionImports; }
    80     Vector<WASM::FunctionImportSignature>& functionImportSignatures() { return m_functionImportSignatures; }
    81     Vector<WASM::Type>& globalVariableTypes() { return m_globalVariableTypes; }
    82     Vector<WASM::FunctionDeclaration>& functionDeclarations() { return m_functionDeclarations; }
    83     Vector<WASM::FunctionPointerTable>& functionPointerTables() { return m_functionPointerTables; }
     78    Vector<Wasm::Signature>& signatures() { return m_signatures; }
     79    Vector<Wasm::FunctionImport>& functionImports() { return m_functionImports; }
     80    Vector<Wasm::FunctionImportSignature>& functionImportSignatures() { return m_functionImportSignatures; }
     81    Vector<Wasm::Type>& globalVariableTypes() { return m_globalVariableTypes; }
     82    Vector<Wasm::FunctionDeclaration>& functionDeclarations() { return m_functionDeclarations; }
     83    Vector<Wasm::FunctionPointerTable>& functionPointerTables() { return m_functionPointerTables; }
    8484
    8585    const JSArrayBuffer* arrayBuffer() const { return m_arrayBuffer.get(); }
    … …  
    9191
    9292private:
    93     JSWASMModule(VM&, Structure*, JSArrayBuffer*);
     93    JSWasmModule(VM&, Structure*, JSArrayBuffer*);
    9494
    9595    Vector<uint32_t> m_i32Constants;
    9696    Vector<float> m_f32Constants;
    9797    Vector<double> m_f64Constants;
    98     Vector<WASM::Signature> m_signatures;
    99     Vector<WASM::FunctionImport> m_functionImports;
    100     Vector<WASM::FunctionImportSignature> m_functionImportSignatures;
    101     Vector<WASM::Type> m_globalVariableTypes;
    102     Vector<WASM::FunctionDeclaration> m_functionDeclarations;
    103     Vector<WASM::FunctionPointerTable> m_functionPointerTables;
     98    Vector<Wasm::Signature> m_signatures;
     99    Vector<Wasm::FunctionImport> m_functionImports;
     100    Vector<Wasm::FunctionImportSignature> m_functionImportSignatures;
     101    Vector<Wasm::Type> m_globalVariableTypes;
     102    Vector<Wasm::FunctionDeclaration> m_functionDeclarations;
     103    Vector<Wasm::FunctionPointerTable> m_functionPointerTables;
    104104
    105105    WriteBarrier<JSArrayBuffer> m_arrayBuffer;

  • trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp

    r207692 r207693  
    2525
    2626#include "config.h"
    27 #include "WASMB3IRGenerator.h"
     27#include "WasmB3IRGenerator.h"
    2828
    2929#if ENABLE(WEBASSEMBLY)
    … …  
    4040#include "B3WasmBoundsCheckValue.h"
    4141#include "VirtualRegister.h"
    42 #include "WASMCallingConvention.h"
    43 #include "WASMFunctionParser.h"
    44 #include "WASMMemory.h"
     42#include "WasmCallingConvention.h"
     43#include "WasmFunctionParser.h"
     44#include "WasmMemory.h"
    4545#include <wtf/Optional.h>
    4646
    … …  
    5151}
    5252
    53 namespace JSC { namespace WASM {
     53namespace JSC { namespace Wasm {
    5454
    5555namespace {
    … …  
    728728}
    729729
    730 } } // namespace JSC::WASM
     730} } // namespace JSC::Wasm
    731731
    732732#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.h

    r207692 r207693  
    3030#include "B3Compilation.h"
    3131#include "VM.h"
    32 #include "WASMFormat.h"
     32#include "WasmFormat.h"
    3333
    3434extern "C" void dumpProcedure(void*);
    3535
    36 namespace JSC { namespace WASM {
     36namespace JSC { namespace Wasm {
    3737
    3838class Memory;
    … …  
    4040std::unique_ptr<FunctionCompilation> parseAndCompile(VM&, Vector<uint8_t>&, Memory*, FunctionInformation, const Vector<FunctionInformation>&, unsigned optLevel = 1);
    4141
    42 } } // namespace JSC::WASM
     42} } // namespace JSC::Wasm
    4343
    4444#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmCallingConvention.cpp

    r207692 r207693  
    2525
    2626#include "config.h"
    27 #include "WASMCallingConvention.h"
     27#include "WasmCallingConvention.h"
    2828
    2929#if ENABLE(WEBASSEMBLY)
    … …  
    3131#include <wtf/NeverDestroyed.h>
    3232
    33 namespace JSC { namespace WASM {
     33namespace JSC { namespace Wasm {
    3434
    3535const JSCCallingConvention& jscCallingConvention()
    … …  
    4444}
    4545
    46 const WASMCallingConvention& wasmCallingConvention()
     46const WasmCallingConvention& wasmCallingConvention()
    4747{
    48     static LazyNeverDestroyed<JSCCallingConvention> staticWASMCallingConvention;
    49     static std::once_flag staticWASMCallingConventionFlag;
    50     std::call_once(staticWASMCallingConventionFlag, [] () {
     48    static LazyNeverDestroyed<JSCCallingConvention> staticWasmCallingConvention;
     49    static std::once_flag staticWasmCallingConventionFlag;
     50    std::call_once(staticWasmCallingConventionFlag, [] () {
    5151        Vector<Reg> gprArgumentRegisters(GPRInfo::numberOfArgumentRegisters);
    5252        for (unsigned i = 0; i < GPRInfo::numberOfArgumentRegisters; ++i)
    … …  
    5757            fprArgumentRegisters[i] = FPRInfo::toArgumentRegister(i);
    5858
    59         staticWASMCallingConvention.construct(WTFMove(gprArgumentRegisters), WTFMove(fprArgumentRegisters), RegisterSet::calleeSaveRegisters());
     59        staticWasmCallingConvention.construct(WTFMove(gprArgumentRegisters), WTFMove(fprArgumentRegisters), RegisterSet::calleeSaveRegisters());
    6060    });
    6161
    62     return staticWASMCallingConvention;
     62    return staticWasmCallingConvention;
    6363}
    6464
    65 } } // namespace JSC::WASM
     65} } // namespace JSC::Wasm
    6666
    6767#endif // ENABLE(B3_JIT)

  • trunk/Source/JavaScriptCore/wasm/WasmCallingConvention.h

    r207692 r207693  
    4040#include "LinkBuffer.h"
    4141#include "RegisterSet.h"
    42 #include "WASMFormat.h"
     42#include "WasmFormat.h"
    4343
    44 namespace JSC { namespace WASM {
     44namespace JSC { namespace Wasm {
    4545
    4646typedef unsigned (*NextOffset)(unsigned currentOffset, B3::Type type);
    … …  
    156156typedef CallingConvention<jscHeaderSize, nextJSCOffset> JSCCallingConvention;
    157157
    158 typedef JSCCallingConvention WASMCallingConvention;
     158typedef JSCCallingConvention WasmCallingConvention;
    159159
    160160const JSCCallingConvention& jscCallingConvention();
    161 const WASMCallingConvention& wasmCallingConvention();
     161const WasmCallingConvention& wasmCallingConvention();
    162162
    163 } } // namespace JSC::WASM
     163} } // namespace JSC::Wasm
    164164
    165165#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmFormat.h

    r207692 r207693  
    5555class JSFunction;
    5656
    57 namespace WASM {
     57namespace Wasm {
    5858
    5959enum Type : uint8_t {
    … …  
    6666};
    6767
    68 static_assert(I32 == 1, "WASM needs I32 to have the value 1");
    69 static_assert(I64 == 2, "WASM needs I64 to have the value 2");
    70 static_assert(F32 == 3, "WASM needs F32 to have the value 3");
    71 static_assert(F64 == 4, "WASM needs F64 to have the value 4");
     68static_assert(I32 == 1, "Wasm needs I32 to have the value 1");
     69static_assert(I64 == 2, "Wasm needs I64 to have the value 2");
     70static_assert(F32 == 3, "Wasm needs F32 to have the value 3");
     71static_assert(F64 == 4, "Wasm needs F64 to have the value 4");
    7272
    7373inline B3::Type toB3Type(Type type)
    … …  
    140140};
    141141
    142 } } // namespace JSC::WASM
     142} } // namespace JSC::Wasm
    143143
    144144#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h

    r207692 r207693  
    2828#if ENABLE(WEBASSEMBLY)
    2929
    30 #include "WASMParser.h"
     30#include "WasmParser.h"
    3131#include <wtf/DataLog.h>
    3232
    33 namespace JSC { namespace WASM {
     33namespace JSC { namespace Wasm {
    3434
    3535enum class BlockType {
    … …  
    390390#undef CREATE_CASE
    391391
    392 } } // namespace JSC::WASM
     392} } // namespace JSC::Wasm
    393393
    394394#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp

    r207692 r207693  
    2525
    2626#include "config.h"
    27 #include "WASMMemory.h"
     27#include "WasmMemory.h"
    2828
    2929#if ENABLE(WEBASSEMBLY)
    3030
    31 namespace JSC { namespace WASM {
     31namespace JSC { namespace Wasm {
    3232
    3333Memory::Memory(uint32_t startingSize, uint32_t capacity, const Vector<unsigned>& pinnedSizeRegisters)
    … …  
    7575} // namespace JSC
    7676
    77 } // namespace WASM
     77} // namespace Wasm
    7878
    7979#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmMemory.h

    r207692 r207693  
    2828#if ENABLE(WEBASSEMBLY)
    2929
    30 #include "WASMCallingConvention.h"
     30#include "WasmCallingConvention.h"
    3131
    3232#include <wtf/Vector.h>
    3333
    34 namespace JSC { namespace WASM {
     34namespace JSC { namespace Wasm {
    3535
    3636struct PinnedSizeRegisterInfo {
    … …  
    9595};
    9696
    97 } } // namespace JSC::WASM
     97} } // namespace JSC::Wasm
    9898
    9999#endif // ENABLE(WEBASSEMLY)

  • trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp

    r207692 r207693  
    2525
    2626#include "config.h"
    27 #include "WASMModuleParser.h"
     27#include "WasmModuleParser.h"
    2828
    2929#if ENABLE(WEBASSEMBLY)
    3030
    31 #include "JSWASMModule.h"
    32 #include "WASMFormat.h"
    33 #include "WASMOps.h"
    34 #include "WASMSections.h"
     31#include "JSWasmModule.h"
     32#include "WasmFormat.h"
     33#include "WasmOps.h"
     34#include "WasmSections.h"
    3535
    3636#include <sys/mman.h>
    3737
    38 namespace JSC { namespace WASM {
     38namespace JSC { namespace Wasm {
    3939
    4040static const bool verbose = false;
    … …  
    287287}
    288288
    289 } } // namespace JSC::WASM
     289} } // namespace JSC::Wasm
    290290
    291291#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmModuleParser.h

    r207692 r207693  
    2828#if ENABLE(WEBASSEMBLY)
    2929
    30 #include "WASMMemory.h"
    31 #include "WASMOps.h"
    32 #include "WASMParser.h"
     30#include "WasmMemory.h"
     31#include "WasmOps.h"
     32#include "WasmParser.h"
    3333#include <wtf/Vector.h>
    3434
    35 namespace JSC { namespace WASM {
     35namespace JSC { namespace Wasm {
    3636
    3737class ModuleParser : public Parser {
    … …  
    6262};
    6363
    64 } } // namespace JSC::WASM
     64} } // namespace JSC::Wasm
    6565
    6666#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmOps.h

    r207692 r207693  
    3232#include <cstdint>
    3333
    34 namespace JSC { namespace WASM {
     34namespace JSC { namespace Wasm {
    3535
    3636#define FOR_EACH_WASM_SPECIAL_OP(macro) \
    … …  
    244244}
    245245
    246 } } // namespace JSC::WASM
     246} } // namespace JSC::Wasm
    247247
    248248#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmParser.h

    r207692 r207693  
    3030#include "B3Compilation.h"
    3131#include "B3Procedure.h"
    32 #include "WASMFormat.h"
    33 #include "WASMOps.h"
    34 #include "WASMSections.h"
     32#include "WasmFormat.h"
     33#include "WasmOps.h"
     34#include "WasmSections.h"
    3535#include <wtf/LEBDecoder.h>
    3636
    37 namespace JSC { namespace WASM {
     37namespace JSC { namespace Wasm {
    3838
    3939class Parser {
    … …  
    129129}
    130130
    131 } } // namespace JSC::WASM
     131} } // namespace JSC::Wasm
    132132
    133133#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp

    r207692 r207693  
    2525
    2626#include "config.h"
    27 #include "WASMPlan.h"
     27#include "WasmPlan.h"
    2828
    2929#if ENABLE(WEBASSEMBLY)
    3030
    3131#include "B3Compilation.h"
    32 #include "WASMB3IRGenerator.h"
    33 #include "WASMCallingConvention.h"
    34 #include "WASMModuleParser.h"
     32#include "WasmB3IRGenerator.h"
     33#include "WasmCallingConvention.h"
     34#include "WasmModuleParser.h"
    3535#include <wtf/DataLog.h>
    3636
    37 namespace JSC { namespace WASM {
     37namespace JSC { namespace Wasm {
    3838
    3939static const bool verbose = false;
    … …  
    6868}
    6969
    70 } } // namespace JSC::WASM
     70} } // namespace JSC::Wasm
    7171
    7272#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmPlan.h

    r207692 r207693  
    3030#include "CompilationResult.h"
    3131#include "VM.h"
    32 #include "WASMFormat.h"
     32#include "WasmFormat.h"
    3333#include <wtf/ThreadSafeRefCounted.h>
    3434#include <wtf/Vector.h>
    3535
    36 namespace JSC { namespace WASM {
     36namespace JSC { namespace Wasm {
    3737class Memory;
    3838
    39 // TODO: This should create a WASM Module not a list of functions.
     39// TODO: This should create a Wasm Module not a list of functions.
    4040class Plan {
    4141public:
    … …  
    4646};
    4747
    48 } } // namespace JSC::WASM
     48} } // namespace JSC::Wasm
    4949
    5050#endif // ENABLE(WEBASSEMBLY)

  • trunk/Source/JavaScriptCore/wasm/WasmSections.h

    r207692 r207693  
    2828#if ENABLE(WEBASSEMBLY)
    2929
    30 namespace JSC { namespace WASM {
     30namespace JSC { namespace Wasm {
    3131
    3232struct Sections {
    … …  
    4646};
    4747
    48 } } // namespace JSC::WASM
     48} } // namespace JSC::Wasm
    4949
    5050#endif // ENABLE(WEBASSEMBLY)
Note: See TracChangeset for help on using the changeset viewer.