Changeset 204180 in webkit
- Timestamp:
- Aug 5, 2016 11:53:49 AM (8 years ago)
- Location:
- trunk/Source
- Files:
-
- 10 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/CMakeLists.txt
r204084 r204180 840 840 841 841 wasm/JSWASMModule.cpp 842 wasm/WASMFunctionParser.cpp843 wasm/WASMModuleParser.cpp844 wasm/WASMReader.cpp845 842 846 843 yarr/RegularExpression.cpp -
trunk/Source/JavaScriptCore/ChangeLog
r204176 r204180 1 2016-08-05 Keith Miller <keith_miller@apple.com> 2 3 Delete out of date WASM code. 4 https://bugs.webkit.org/show_bug.cgi?id=160603 5 6 Reviewed by Saam Barati. 7 8 This patch removes a bunch of the wasm files that we are unlikey to use 9 with the newer wasm spec. If we end up needing any of the deleted code 10 later we can restore it at that time. 11 12 * CMakeLists.txt: 13 * JavaScriptCore.xcodeproj/project.pbxproj: 14 * jit/JITOperations.cpp: 15 * jsc.cpp: 16 (GlobalObject::finishCreation): Deleted. 17 (functionLoadWebAssembly): Deleted. 18 * llint/LLIntSlowPaths.cpp: 19 (JSC::LLInt::setUpCall): Deleted. 20 * runtime/Executable.cpp: 21 (JSC::WebAssemblyExecutable::prepareForExecution): Deleted. 22 * runtime/JSGlobalObject.cpp: 23 (JSC::JSGlobalObject::init): Deleted. 24 (JSC::JSGlobalObject::visitChildren): Deleted. 25 * runtime/JSGlobalObject.h: 26 (JSC::JSGlobalObject::wasmModuleStructure): Deleted. 27 * wasm/WASMConstants.h: Removed. 28 * wasm/WASMFunctionB3IRGenerator.h: Removed. 29 (JSC::WASMFunctionB3IRGenerator::MemoryAddress::MemoryAddress): Deleted. 30 (JSC::WASMFunctionB3IRGenerator::startFunction): Deleted. 31 (JSC::WASMFunctionB3IRGenerator::endFunction): Deleted. 32 (JSC::WASMFunctionB3IRGenerator::buildSetLocal): Deleted. 33 (JSC::WASMFunctionB3IRGenerator::buildSetGlobal): Deleted. 34 (JSC::WASMFunctionB3IRGenerator::buildReturn): Deleted. 35 (JSC::WASMFunctionB3IRGenerator::buildImmediateI32): Deleted. 36 (JSC::WASMFunctionB3IRGenerator::buildImmediateF32): Deleted. 37 (JSC::WASMFunctionB3IRGenerator::buildImmediateF64): Deleted. 38 (JSC::WASMFunctionB3IRGenerator::buildGetLocal): Deleted. 39 (JSC::WASMFunctionB3IRGenerator::buildGetGlobal): Deleted. 40 (JSC::WASMFunctionB3IRGenerator::buildConvertType): Deleted. 41 (JSC::WASMFunctionB3IRGenerator::buildLoad): Deleted. 42 (JSC::WASMFunctionB3IRGenerator::buildStore): Deleted. 43 (JSC::WASMFunctionB3IRGenerator::buildUnaryI32): Deleted. 44 (JSC::WASMFunctionB3IRGenerator::buildUnaryF32): Deleted. 45 (JSC::WASMFunctionB3IRGenerator::buildUnaryF64): Deleted. 46 (JSC::WASMFunctionB3IRGenerator::buildBinaryI32): Deleted. 47 (JSC::WASMFunctionB3IRGenerator::buildBinaryF32): Deleted. 48 (JSC::WASMFunctionB3IRGenerator::buildBinaryF64): Deleted. 49 (JSC::WASMFunctionB3IRGenerator::buildRelationalI32): Deleted. 50 (JSC::WASMFunctionB3IRGenerator::buildRelationalF32): Deleted. 51 (JSC::WASMFunctionB3IRGenerator::buildRelationalF64): Deleted. 52 (JSC::WASMFunctionB3IRGenerator::buildMinOrMaxI32): Deleted. 53 (JSC::WASMFunctionB3IRGenerator::buildMinOrMaxF64): Deleted. 54 (JSC::WASMFunctionB3IRGenerator::buildCallInternal): Deleted. 55 (JSC::WASMFunctionB3IRGenerator::buildCallIndirect): Deleted. 56 (JSC::WASMFunctionB3IRGenerator::buildCallImport): Deleted. 57 (JSC::WASMFunctionB3IRGenerator::appendExpressionList): Deleted. 58 (JSC::WASMFunctionB3IRGenerator::discard): Deleted. 59 (JSC::WASMFunctionB3IRGenerator::linkTarget): Deleted. 60 (JSC::WASMFunctionB3IRGenerator::jumpToTarget): Deleted. 61 (JSC::WASMFunctionB3IRGenerator::jumpToTargetIf): Deleted. 62 (JSC::WASMFunctionB3IRGenerator::startLoop): Deleted. 63 (JSC::WASMFunctionB3IRGenerator::endLoop): Deleted. 64 (JSC::WASMFunctionB3IRGenerator::startSwitch): Deleted. 65 (JSC::WASMFunctionB3IRGenerator::endSwitch): Deleted. 66 (JSC::WASMFunctionB3IRGenerator::startLabel): Deleted. 67 (JSC::WASMFunctionB3IRGenerator::endLabel): Deleted. 68 (JSC::WASMFunctionB3IRGenerator::breakTarget): Deleted. 69 (JSC::WASMFunctionB3IRGenerator::continueTarget): Deleted. 70 (JSC::WASMFunctionB3IRGenerator::breakLabelTarget): Deleted. 71 (JSC::WASMFunctionB3IRGenerator::continueLabelTarget): Deleted. 72 (JSC::WASMFunctionB3IRGenerator::buildSwitch): Deleted. 73 * wasm/WASMFunctionCompiler.h: Removed. 74 (JSC::operationConvertJSValueToInt32): Deleted. 75 (JSC::operationConvertJSValueToDouble): Deleted. 76 (JSC::operationDiv): Deleted. 77 (JSC::operationMod): Deleted. 78 (JSC::operationUnsignedDiv): Deleted. 79 (JSC::operationUnsignedMod): Deleted. 80 (JSC::operationConvertUnsignedInt32ToDouble): Deleted. 81 (JSC::sizeOfMemoryType): Deleted. 82 (JSC::WASMFunctionCompiler::MemoryAddress::MemoryAddress): Deleted. 83 (JSC::WASMFunctionCompiler::WASMFunctionCompiler): Deleted. 84 (JSC::WASMFunctionCompiler::startFunction): Deleted. 85 (JSC::WASMFunctionCompiler::endFunction): Deleted. 86 (JSC::WASMFunctionCompiler::buildSetLocal): Deleted. 87 (JSC::WASMFunctionCompiler::buildSetGlobal): Deleted. 88 (JSC::WASMFunctionCompiler::buildReturn): Deleted. 89 (JSC::WASMFunctionCompiler::buildImmediateI32): Deleted. 90 (JSC::WASMFunctionCompiler::buildImmediateF32): Deleted. 91 (JSC::WASMFunctionCompiler::buildImmediateF64): Deleted. 92 (JSC::WASMFunctionCompiler::buildGetLocal): Deleted. 93 (JSC::WASMFunctionCompiler::buildGetGlobal): Deleted. 94 (JSC::WASMFunctionCompiler::buildConvertType): Deleted. 95 (JSC::WASMFunctionCompiler::buildLoad): Deleted. 96 (JSC::WASMFunctionCompiler::buildStore): Deleted. 97 (JSC::WASMFunctionCompiler::buildUnaryI32): Deleted. 98 (JSC::WASMFunctionCompiler::buildUnaryF32): Deleted. 99 (JSC::WASMFunctionCompiler::buildUnaryF64): Deleted. 100 (JSC::WASMFunctionCompiler::buildBinaryI32): Deleted. 101 (JSC::WASMFunctionCompiler::buildBinaryF32): Deleted. 102 (JSC::WASMFunctionCompiler::buildBinaryF64): Deleted. 103 (JSC::WASMFunctionCompiler::buildRelationalI32): Deleted. 104 (JSC::WASMFunctionCompiler::buildRelationalF32): Deleted. 105 (JSC::WASMFunctionCompiler::buildRelationalF64): Deleted. 106 (JSC::WASMFunctionCompiler::buildMinOrMaxI32): Deleted. 107 (JSC::WASMFunctionCompiler::buildMinOrMaxF64): Deleted. 108 (JSC::WASMFunctionCompiler::buildCallInternal): Deleted. 109 (JSC::WASMFunctionCompiler::buildCallIndirect): Deleted. 110 (JSC::WASMFunctionCompiler::buildCallImport): Deleted. 111 (JSC::WASMFunctionCompiler::appendExpressionList): Deleted. 112 (JSC::WASMFunctionCompiler::discard): Deleted. 113 (JSC::WASMFunctionCompiler::linkTarget): Deleted. 114 (JSC::WASMFunctionCompiler::jumpToTarget): Deleted. 115 (JSC::WASMFunctionCompiler::jumpToTargetIf): Deleted. 116 (JSC::WASMFunctionCompiler::startLoop): Deleted. 117 (JSC::WASMFunctionCompiler::endLoop): Deleted. 118 (JSC::WASMFunctionCompiler::startSwitch): Deleted. 119 (JSC::WASMFunctionCompiler::endSwitch): Deleted. 120 (JSC::WASMFunctionCompiler::startLabel): Deleted. 121 (JSC::WASMFunctionCompiler::endLabel): Deleted. 122 (JSC::WASMFunctionCompiler::breakTarget): Deleted. 123 (JSC::WASMFunctionCompiler::continueTarget): Deleted. 124 (JSC::WASMFunctionCompiler::breakLabelTarget): Deleted. 125 (JSC::WASMFunctionCompiler::continueLabelTarget): Deleted. 126 (JSC::WASMFunctionCompiler::buildSwitch): Deleted. 127 (JSC::WASMFunctionCompiler::localAddress): Deleted. 128 (JSC::WASMFunctionCompiler::temporaryAddress): Deleted. 129 (JSC::WASMFunctionCompiler::appendCall): Deleted. 130 (JSC::WASMFunctionCompiler::appendCallWithExceptionCheck): Deleted. 131 (JSC::WASMFunctionCompiler::emitNakedCall): Deleted. 132 (JSC::WASMFunctionCompiler::appendCallSetResult): Deleted. 133 (JSC::WASMFunctionCompiler::callOperation): Deleted. 134 (JSC::WASMFunctionCompiler::boxArgumentsAndAdjustStackPointer): Deleted. 135 (JSC::WASMFunctionCompiler::callAndUnboxResult): Deleted. 136 (JSC::WASMFunctionCompiler::convertValueToInt32): Deleted. 137 (JSC::WASMFunctionCompiler::convertValueToDouble): Deleted. 138 (JSC::WASMFunctionCompiler::convertDoubleToValue): Deleted. 139 * wasm/WASMFunctionParser.cpp: Removed. 140 (JSC::nameOfType): Deleted. 141 (JSC::WASMFunctionParser::checkSyntax): Deleted. 142 (JSC::WASMFunctionParser::compile): Deleted. 143 (JSC::WASMFunctionParser::parseFunction): Deleted. 144 (JSC::WASMFunctionParser::parseLocalVariables): Deleted. 145 (JSC::WASMFunctionParser::parseStatement): Deleted. 146 (JSC::WASMFunctionParser::parseReturnStatement): Deleted. 147 (JSC::WASMFunctionParser::parseBlockStatement): Deleted. 148 (JSC::WASMFunctionParser::parseIfStatement): Deleted. 149 (JSC::WASMFunctionParser::parseIfElseStatement): Deleted. 150 (JSC::WASMFunctionParser::parseWhileStatement): Deleted. 151 (JSC::WASMFunctionParser::parseDoStatement): Deleted. 152 (JSC::WASMFunctionParser::parseLabelStatement): Deleted. 153 (JSC::WASMFunctionParser::parseBreakStatement): Deleted. 154 (JSC::WASMFunctionParser::parseBreakLabelStatement): Deleted. 155 (JSC::WASMFunctionParser::parseContinueStatement): Deleted. 156 (JSC::WASMFunctionParser::parseContinueLabelStatement): Deleted. 157 (JSC::WASMFunctionParser::parseSwitchStatement): Deleted. 158 (JSC::WASMFunctionParser::parseExpression): Deleted. 159 (JSC::WASMFunctionParser::parseExpressionI32): Deleted. 160 (JSC::WASMFunctionParser::parseConstantPoolIndexExpressionI32): Deleted. 161 (JSC::WASMFunctionParser::parseImmediateExpressionI32): Deleted. 162 (JSC::WASMFunctionParser::parseUnaryExpressionI32): Deleted. 163 (JSC::WASMFunctionParser::parseBinaryExpressionI32): Deleted. 164 (JSC::WASMFunctionParser::parseRelationalI32ExpressionI32): Deleted. 165 (JSC::WASMFunctionParser::parseRelationalF32ExpressionI32): Deleted. 166 (JSC::WASMFunctionParser::parseRelationalF64ExpressionI32): Deleted. 167 (JSC::WASMFunctionParser::parseMinOrMaxExpressionI32): Deleted. 168 (JSC::WASMFunctionParser::parseExpressionF32): Deleted. 169 (JSC::WASMFunctionParser::parseConstantPoolIndexExpressionF32): Deleted. 170 (JSC::WASMFunctionParser::parseImmediateExpressionF32): Deleted. 171 (JSC::WASMFunctionParser::parseUnaryExpressionF32): Deleted. 172 (JSC::WASMFunctionParser::parseBinaryExpressionF32): Deleted. 173 (JSC::WASMFunctionParser::parseExpressionF64): Deleted. 174 (JSC::WASMFunctionParser::parseConstantPoolIndexExpressionF64): Deleted. 175 (JSC::WASMFunctionParser::parseImmediateExpressionF64): Deleted. 176 (JSC::WASMFunctionParser::parseUnaryExpressionF64): Deleted. 177 (JSC::WASMFunctionParser::parseBinaryExpressionF64): Deleted. 178 (JSC::WASMFunctionParser::parseMinOrMaxExpressionF64): Deleted. 179 (JSC::WASMFunctionParser::parseExpressionVoid): Deleted. 180 (JSC::WASMFunctionParser::parseGetLocalExpression): Deleted. 181 (JSC::WASMFunctionParser::parseGetGlobalExpression): Deleted. 182 (JSC::WASMFunctionParser::parseSetLocal): Deleted. 183 (JSC::WASMFunctionParser::parseSetGlobal): Deleted. 184 (JSC::WASMFunctionParser::parseMemoryAddress): Deleted. 185 (JSC::WASMFunctionParser::parseLoad): Deleted. 186 (JSC::WASMFunctionParser::parseStore): Deleted. 187 (JSC::WASMFunctionParser::parseCallArguments): Deleted. 188 (JSC::WASMFunctionParser::parseCallInternal): Deleted. 189 (JSC::WASMFunctionParser::parseCallIndirect): Deleted. 190 (JSC::WASMFunctionParser::parseCallImport): Deleted. 191 (JSC::WASMFunctionParser::parseConditional): Deleted. 192 (JSC::WASMFunctionParser::parseComma): Deleted. 193 (JSC::WASMFunctionParser::parseConvertType): Deleted. 194 * wasm/WASMFunctionParser.h: Removed. 195 (JSC::WASMFunctionParser::WASMFunctionParser): Deleted. 196 * wasm/WASMFunctionSyntaxChecker.h: Removed. 197 (JSC::WASMFunctionSyntaxChecker::MemoryAddress::MemoryAddress): Deleted. 198 (JSC::WASMFunctionSyntaxChecker::startFunction): Deleted. 199 (JSC::WASMFunctionSyntaxChecker::endFunction): Deleted. 200 (JSC::WASMFunctionSyntaxChecker::buildSetLocal): Deleted. 201 (JSC::WASMFunctionSyntaxChecker::buildSetGlobal): Deleted. 202 (JSC::WASMFunctionSyntaxChecker::buildReturn): Deleted. 203 (JSC::WASMFunctionSyntaxChecker::buildImmediateI32): Deleted. 204 (JSC::WASMFunctionSyntaxChecker::buildImmediateF32): Deleted. 205 (JSC::WASMFunctionSyntaxChecker::buildImmediateF64): Deleted. 206 (JSC::WASMFunctionSyntaxChecker::buildGetLocal): Deleted. 207 (JSC::WASMFunctionSyntaxChecker::buildGetGlobal): Deleted. 208 (JSC::WASMFunctionSyntaxChecker::buildConvertType): Deleted. 209 (JSC::WASMFunctionSyntaxChecker::buildLoad): Deleted. 210 (JSC::WASMFunctionSyntaxChecker::buildStore): Deleted. 211 (JSC::WASMFunctionSyntaxChecker::buildUnaryI32): Deleted. 212 (JSC::WASMFunctionSyntaxChecker::buildUnaryF32): Deleted. 213 (JSC::WASMFunctionSyntaxChecker::buildUnaryF64): Deleted. 214 (JSC::WASMFunctionSyntaxChecker::buildBinaryI32): Deleted. 215 (JSC::WASMFunctionSyntaxChecker::buildBinaryF32): Deleted. 216 (JSC::WASMFunctionSyntaxChecker::buildBinaryF64): Deleted. 217 (JSC::WASMFunctionSyntaxChecker::buildRelationalI32): Deleted. 218 (JSC::WASMFunctionSyntaxChecker::buildRelationalF32): Deleted. 219 (JSC::WASMFunctionSyntaxChecker::buildRelationalF64): Deleted. 220 (JSC::WASMFunctionSyntaxChecker::buildMinOrMaxI32): Deleted. 221 (JSC::WASMFunctionSyntaxChecker::buildMinOrMaxF64): Deleted. 222 (JSC::WASMFunctionSyntaxChecker::buildCallInternal): Deleted. 223 (JSC::WASMFunctionSyntaxChecker::buildCallImport): Deleted. 224 (JSC::WASMFunctionSyntaxChecker::buildCallIndirect): Deleted. 225 (JSC::WASMFunctionSyntaxChecker::appendExpressionList): Deleted. 226 (JSC::WASMFunctionSyntaxChecker::discard): Deleted. 227 (JSC::WASMFunctionSyntaxChecker::linkTarget): Deleted. 228 (JSC::WASMFunctionSyntaxChecker::jumpToTarget): Deleted. 229 (JSC::WASMFunctionSyntaxChecker::jumpToTargetIf): Deleted. 230 (JSC::WASMFunctionSyntaxChecker::startLoop): Deleted. 231 (JSC::WASMFunctionSyntaxChecker::endLoop): Deleted. 232 (JSC::WASMFunctionSyntaxChecker::startSwitch): Deleted. 233 (JSC::WASMFunctionSyntaxChecker::endSwitch): Deleted. 234 (JSC::WASMFunctionSyntaxChecker::startLabel): Deleted. 235 (JSC::WASMFunctionSyntaxChecker::endLabel): Deleted. 236 (JSC::WASMFunctionSyntaxChecker::breakTarget): Deleted. 237 (JSC::WASMFunctionSyntaxChecker::continueTarget): Deleted. 238 (JSC::WASMFunctionSyntaxChecker::breakLabelTarget): Deleted. 239 (JSC::WASMFunctionSyntaxChecker::continueLabelTarget): Deleted. 240 (JSC::WASMFunctionSyntaxChecker::buildSwitch): Deleted. 241 (JSC::WASMFunctionSyntaxChecker::stackHeight): Deleted. 242 (JSC::WASMFunctionSyntaxChecker::updateTempStackHeight): Deleted. 243 (JSC::WASMFunctionSyntaxChecker::updateTempStackHeightForCall): Deleted. 244 * wasm/WASMModuleParser.cpp: Removed. 245 (JSC::WASMModuleParser::WASMModuleParser): Deleted. 246 (JSC::WASMModuleParser::parse): Deleted. 247 (JSC::WASMModuleParser::parseModule): Deleted. 248 (JSC::WASMModuleParser::parseConstantPoolSection): Deleted. 249 (JSC::WASMModuleParser::parseSignatureSection): Deleted. 250 (JSC::WASMModuleParser::parseFunctionImportSection): Deleted. 251 (JSC::WASMModuleParser::parseGlobalSection): Deleted. 252 (JSC::WASMModuleParser::parseFunctionDeclarationSection): Deleted. 253 (JSC::WASMModuleParser::parseFunctionPointerTableSection): Deleted. 254 (JSC::WASMModuleParser::parseFunctionDefinitionSection): Deleted. 255 (JSC::WASMModuleParser::parseFunctionDefinition): Deleted. 256 (JSC::WASMModuleParser::parseExportSection): Deleted. 257 (JSC::WASMModuleParser::getImportedValue): Deleted. 258 (JSC::parseWebAssembly): Deleted. 259 * wasm/WASMModuleParser.h: Removed. 260 * wasm/WASMReader.cpp: Removed. 261 (JSC::WASMReader::readUInt32): Deleted. 262 (JSC::WASMReader::readFloat): Deleted. 263 (JSC::WASMReader::readDouble): Deleted. 264 (JSC::WASMReader::readCompactInt32): Deleted. 265 (JSC::WASMReader::readCompactUInt32): Deleted. 266 (JSC::WASMReader::readString): Deleted. 267 (JSC::WASMReader::readType): Deleted. 268 (JSC::WASMReader::readExpressionType): Deleted. 269 (JSC::WASMReader::readExportFormat): Deleted. 270 (JSC::WASMReader::readByte): Deleted. 271 (JSC::WASMReader::readOpStatement): Deleted. 272 (JSC::WASMReader::readOpExpressionI32): Deleted. 273 (JSC::WASMReader::readOpExpressionF32): Deleted. 274 (JSC::WASMReader::readOpExpressionF64): Deleted. 275 (JSC::WASMReader::readOpExpressionVoid): Deleted. 276 (JSC::WASMReader::readVariableTypes): Deleted. 277 (JSC::WASMReader::readOp): Deleted. 278 (JSC::WASMReader::readSwitchCase): Deleted. 279 * wasm/WASMReader.h: Removed. 280 (JSC::WASMReader::WASMReader): Deleted. 281 (JSC::WASMReader::offset): Deleted. 282 (JSC::WASMReader::setOffset): Deleted. 283 1 284 2016-08-05 Keith Miller <keith_miller@apple.com> 2 285 -
trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r203953 r204180 1306 1306 79F8FC1E1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79F8FC1C1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp */; }; 1307 1307 79F8FC1F1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 79F8FC1D1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h */; }; 1308 7B0247551B8682DD00542440 /* WASMConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B0247521B8682D500542440 /* WASMConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };1309 7B0247561B8682E100542440 /* WASMFunctionParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B0247531B8682D500542440 /* WASMFunctionParser.cpp */; };1310 7B0247571B8682E400542440 /* WASMFunctionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B0247541B8682D500542440 /* WASMFunctionParser.h */; settings = {ATTRIBUTES = (Private, ); }; };1311 7B0247591B868EB700542440 /* WASMFunctionSyntaxChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B0247581B868EAE00542440 /* WASMFunctionSyntaxChecker.h */; settings = {ATTRIBUTES = (Private, ); }; };1312 7B2E010E1B97AA6900EF5D5C /* WASMFunctionCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B2E010D1B97AA5800EF5D5C /* WASMFunctionCompiler.h */; };1313 7B39F76D1B62DE2E00360FB4 /* WASMModuleParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B39F7691B62DE2200360FB4 /* WASMModuleParser.cpp */; };1314 7B39F76E1B62DE3200360FB4 /* WASMModuleParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B39F76A1B62DE2200360FB4 /* WASMModuleParser.h */; settings = {ATTRIBUTES = (Private, ); }; };1315 7B39F7701B62DE3200360FB4 /* WASMReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B39F76C1B62DE2200360FB4 /* WASMReader.h */; settings = {ATTRIBUTES = (Private, ); }; };1316 7B39F7721B63574D00360FB4 /* WASMReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B39F7711B63574B00360FB4 /* WASMReader.cpp */; };1317 7B8329BF1BB21FE300649A6E /* WASMFunctionB3IRGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B8329BE1BB21FD100649A6E /* WASMFunctionB3IRGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };1318 1308 7B98D1361B60CD5F0023B1A4 /* JSWASMModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */; }; 1319 1309 7B98D1371B60CD620023B1A4 /* JSWASMModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 1759 1749 A790DD70182F499700588807 /* JSSetIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = A790DD6A182F499700588807 /* JSSetIterator.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1760 1750 A7986D5717A0BB1E00A95DD0 /* DFGEdgeUsesStructure.h in Headers */ = {isa = PBXBuildFile; fileRef = A7986D5617A0BB1E00A95DD0 /* DFGEdgeUsesStructure.h */; }; 1751 A79D3ED9C5064DD0A8466A3A /* ModuleScopeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 000BEAF0DF604481AF6AB68C /* ModuleScopeData.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1761 1752 A7A4AE0817973B26005612B1 /* MacroAssemblerX86Common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7A4AE0717973B26005612B1 /* MacroAssemblerX86Common.cpp */; }; 1762 1753 A7A8AF3417ADB5F3005AB174 /* ArrayBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7A8AF2517ADB5F2005AB174 /* ArrayBuffer.cpp */; }; … … 2131 2122 FED94F2F171E3E2300BE77A4 /* Watchdog.h in Headers */ = {isa = PBXBuildFile; fileRef = FED94F2C171E3E2300BE77A4 /* Watchdog.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2132 2123 FEF040511AAE662D00BD28B0 /* CompareAndSwapTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEF040501AAE662D00BD28B0 /* CompareAndSwapTest.cpp */; }; 2133 A79D3ED9C5064DD0A8466A3A /* ModuleScopeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 000BEAF0DF604481AF6AB68C /* ModuleScopeData.h */; settings = {ATTRIBUTES = (Private, ); }; };2134 2124 /* End PBXBuildFile section */ 2135 2125 … … 2276 2266 2277 2267 /* Begin PBXFileReference section */ 2268 000BEAF0DF604481AF6AB68C /* ModuleScopeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleScopeData.h; sourceTree = "<group>"; }; 2278 2269 0F0123301944EA1B00843A0C /* DFGValueStrength.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGValueStrength.cpp; path = dfg/DFGValueStrength.cpp; sourceTree = "<group>"; }; 2279 2270 0F0123311944EA1B00843A0C /* DFGValueStrength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGValueStrength.h; path = dfg/DFGValueStrength.h; sourceTree = "<group>"; }; … … 3514 3505 79F8FC1C1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGMaximalFlushInsertionPhase.cpp; path = dfg/DFGMaximalFlushInsertionPhase.cpp; sourceTree = "<group>"; }; 3515 3506 79F8FC1D1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGMaximalFlushInsertionPhase.h; path = dfg/DFGMaximalFlushInsertionPhase.h; sourceTree = "<group>"; }; 3516 7B0247521B8682D500542440 /* WASMConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMConstants.h; sourceTree = "<group>"; };3517 7B0247531B8682D500542440 /* WASMFunctionParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMFunctionParser.cpp; sourceTree = "<group>"; };3518 7B0247541B8682D500542440 /* WASMFunctionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMFunctionParser.h; sourceTree = "<group>"; };3519 7B0247581B868EAE00542440 /* WASMFunctionSyntaxChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMFunctionSyntaxChecker.h; sourceTree = "<group>"; };3520 7B2E010D1B97AA5800EF5D5C /* WASMFunctionCompiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMFunctionCompiler.h; sourceTree = "<group>"; };3521 7B39F7691B62DE2200360FB4 /* WASMModuleParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMModuleParser.cpp; sourceTree = "<group>"; };3522 7B39F76A1B62DE2200360FB4 /* WASMModuleParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMModuleParser.h; sourceTree = "<group>"; };3523 7B39F76C1B62DE2200360FB4 /* WASMReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMReader.h; sourceTree = "<group>"; };3524 7B39F7711B63574B00360FB4 /* WASMReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMReader.cpp; sourceTree = "<group>"; };3525 7B8329BE1BB21FD100649A6E /* WASMFunctionB3IRGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMFunctionB3IRGenerator.h; sourceTree = "<group>"; };3526 3507 7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWASMModule.cpp; sourceTree = "<group>"; }; 3527 3508 7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWASMModule.h; sourceTree = "<group>"; }; … … 4419 4400 FEF040501AAE662D00BD28B0 /* CompareAndSwapTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CompareAndSwapTest.cpp; path = API/tests/CompareAndSwapTest.cpp; sourceTree = "<group>"; }; 4420 4401 FEF040521AAEC4ED00BD28B0 /* CompareAndSwapTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompareAndSwapTest.h; path = API/tests/CompareAndSwapTest.h; sourceTree = "<group>"; }; 4421 000BEAF0DF604481AF6AB68C /* ModuleScopeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ModuleScopeData.h; path = ModuleScopeData.h; sourceTree = "<group>"; };4422 4402 /* End PBXFileReference section */ 4423 4403 … … 5522 5502 7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */, 5523 5503 7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */, 5524 7B0247521B8682D500542440 /* WASMConstants.h */,5525 5504 7BC547D21B69599B00959B58 /* WASMFormat.h */, 5526 7B2E010D1B97AA5800EF5D5C /* WASMFunctionCompiler.h */,5527 7B8329BE1BB21FD100649A6E /* WASMFunctionB3IRGenerator.h */,5528 7B0247531B8682D500542440 /* WASMFunctionParser.cpp */,5529 7B0247541B8682D500542440 /* WASMFunctionParser.h */,5530 7B0247581B868EAE00542440 /* WASMFunctionSyntaxChecker.h */,5531 7B39F7691B62DE2200360FB4 /* WASMModuleParser.cpp */,5532 7B39F76A1B62DE2200360FB4 /* WASMModuleParser.h */,5533 7B39F7711B63574B00360FB4 /* WASMReader.cpp */,5534 7B39F76C1B62DE2200360FB4 /* WASMReader.h */,5535 5505 ); 5536 5506 path = wasm; … … 8191 8161 658D3A5619638268003C45D6 /* VMEntryRecord.h in Headers */, 8192 8162 FE5932A8183C5A2600A1ECCC /* VMEntryScope.h in Headers */, 8193 7B0247551B8682DD00542440 /* WASMConstants.h in Headers */,8194 8163 7BC547D31B6959A100959B58 /* WASMFormat.h in Headers */, 8195 7B2E010E1B97AA6900EF5D5C /* WASMFunctionCompiler.h in Headers */,8196 7B8329BF1BB21FE300649A6E /* WASMFunctionB3IRGenerator.h in Headers */,8197 7B0247571B8682E400542440 /* WASMFunctionParser.h in Headers */,8198 8164 0F6B8ADD1C4EFAC300969052 /* B3SSACalculator.h in Headers */, 8199 7B0247591B868EB700542440 /* WASMFunctionSyntaxChecker.h in Headers */,8200 7B39F76E1B62DE3200360FB4 /* WASMModuleParser.h in Headers */,8201 8165 0F2BBD9A1C5FF3F50023EF23 /* B3VariableValue.h in Headers */, 8202 7B39F7701B62DE3200360FB4 /* WASMReader.h in Headers */,8203 8166 FED94F2F171E3E2300BE77A4 /* Watchdog.h in Headers */, 8204 8167 0F919D2615853CE3004A4E7D /* Watchpoint.h in Headers */, … … 9497 9460 E18E3A590DF9278C00D90B34 /* VM.cpp in Sources */, 9498 9461 FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */, 9499 7B0247561B8682E100542440 /* WASMFunctionParser.cpp in Sources */,9500 9462 FE187A011BFBE55E0038BBCA /* JITMulGenerator.cpp in Sources */, 9501 7B39F76D1B62DE2E00360FB4 /* WASMModuleParser.cpp in Sources */,9502 7B39F7721B63574D00360FB4 /* WASMReader.cpp in Sources */,9503 9463 26718BA41BE99F780052017B /* AirIteratedRegisterCoalescing.cpp in Sources */, 9504 9464 FED94F2E171E3E2300BE77A4 /* Watchdog.cpp in Sources */, -
trunk/Source/JavaScriptCore/jit/JITOperations.cpp
r204162 r204180 881 881 } else if (executable->isWebAssemblyExecutable()) { 882 882 WebAssemblyExecutable* webAssemblyExecutable = static_cast<WebAssemblyExecutable*>(executable); 883 webAssemblyExecutable->prepareForExecution(execCallee);884 883 codeBlock = webAssemblyExecutable->codeBlockForCall(); 885 884 ASSERT(codeBlock); … … 972 971 reinterpret_cast<void*>(KeepTheFrame)); 973 972 } 974 975 WebAssemblyExecutable* webAssemblyExecutable = static_cast<WebAssemblyExecutable*>(executable);976 webAssemblyExecutable->prepareForExecution(execCallee);977 973 #endif 978 974 } -
trunk/Source/JavaScriptCore/jsc.cpp
r203957 r204180 62 62 #include "TestRunnerUtils.h" 63 63 #include "TypeProfilerLog.h" 64 #include "WASMModuleParser.h"65 64 #include <locale.h> 66 65 #include <math.h> … … 625 624 static EncodedJSValue JSC_HOST_CALL functionDrainMicrotasks(ExecState*); 626 625 static EncodedJSValue JSC_HOST_CALL functionIs32BitPlatform(ExecState*); 627 #if ENABLE(WEBASSEMBLY)628 static EncodedJSValue JSC_HOST_CALL functionLoadWebAssembly(ExecState*);629 #endif630 626 static EncodedJSValue JSC_HOST_CALL functionLoadModule(ExecState*); 631 627 static EncodedJSValue JSC_HOST_CALL functionCheckModuleSyntax(ExecState*); … … 854 850 addFunction(vm, "is32BitPlatform", functionIs32BitPlatform, 0); 855 851 856 #if ENABLE(WEBASSEMBLY)857 addFunction(vm, "loadWebAssembly", functionLoadWebAssembly, 3);858 #endif859 852 addFunction(vm, "loadModule", functionLoadModule, 1); 860 853 addFunction(vm, "checkModuleSyntax", functionCheckModuleSyntax, 1); … … 1782 1775 } 1783 1776 1784 #if ENABLE(WEBASSEMBLY)1785 EncodedJSValue JSC_HOST_CALL functionLoadWebAssembly(ExecState* exec)1786 {1787 String fileName = exec->argument(0).toWTFString(exec);1788 if (exec->hadException())1789 return JSValue::encode(jsUndefined());1790 Vector<char> buffer;1791 if (!fillBufferWithContentsOfFile(fileName, buffer))1792 return JSValue::encode(exec->vm().throwException(exec, createError(exec, ASCIILiteral("Could not open file."))));1793 RefPtr<WebAssemblySourceProvider> sourceProvider = WebAssemblySourceProvider::create(reinterpret_cast<Vector<uint8_t>&>(buffer), fileName);1794 SourceCode source(sourceProvider);1795 JSObject* imports = exec->argument(1).getObject();1796 JSArrayBuffer* arrayBuffer = jsDynamicCast<JSArrayBuffer*>(exec->argument(2));1797 1798 String errorMessage;1799 JSWASMModule* module = parseWebAssembly(exec, source, imports, arrayBuffer, errorMessage);1800 if (!module)1801 return JSValue::encode(exec->vm().throwException(exec, createSyntaxError(exec, errorMessage)));1802 return JSValue::encode(module);1803 }1804 #endif1805 1806 1777 EncodedJSValue JSC_HOST_CALL functionLoadModule(ExecState* exec) 1807 1778 { -
trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
r204162 r204180 1282 1282 #if ENABLE(WEBASSEMBLY) 1283 1283 WebAssemblyExecutable* webAssemblyExecutable = static_cast<WebAssemblyExecutable*>(executable); 1284 webAssemblyExecutable->prepareForExecution(execCallee);1285 1284 codeBlock = webAssemblyExecutable->codeBlockForCall(); 1286 1285 ASSERT(codeBlock); -
trunk/Source/JavaScriptCore/runtime/Executable.cpp
r204162 r204180 38 38 #include "TypeProfiler.h" 39 39 #include "VMInlines.h" 40 #include "WASMFunctionParser.h"41 40 #include <wtf/CommaPrinter.h> 42 41 #include <wtf/Vector.h> … … 767 766 visitor.append(&thisObject->m_module); 768 767 } 769 770 void WebAssemblyExecutable::prepareForExecution(ExecState* exec)771 {772 if (hasJITCodeForCall())773 return;774 775 VM& vm = exec->vm();776 DeferGC deferGC(vm.heap);777 778 WebAssemblyCodeBlock* codeBlock = WebAssemblyCodeBlock::create(&vm,779 this, exec->lexicalGlobalObject());780 781 WASMFunctionParser::compile(vm, codeBlock, m_module.get(), m_source, m_functionIndex);782 783 m_jitCodeForCall = codeBlock->jitCode();784 m_jitCodeForCallWithArityCheck = MacroAssemblerCodePtr();785 m_numParametersForCall = codeBlock->numParameters();786 787 m_codeBlockForCall.set(vm, this, codeBlock);788 789 Heap::heap(this)->writeBarrier(this);790 }791 768 #endif 792 769 -
trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
r203375 r204180 513 513 } 514 514 m_proxyRevokeStructure.set(vm, this, ProxyRevoke::createStructure(vm, this, m_functionPrototype.get())); 515 516 #if ENABLE(WEBASSEMBLY)517 m_wasmModuleStructure.set(vm, this, JSWASMModule::createStructure(vm, this));518 #endif519 515 520 516 m_parseIntFunction.set(vm, this, JSFunction::create(vm, this, 2, vm.propertyNames->parseInt.string(), globalFuncParseInt, NoIntrinsic)); … … 1101 1097 visitor.append(&thisObject->m_callableProxyObjectStructure); 1102 1098 visitor.append(&thisObject->m_proxyRevokeStructure); 1103 #if ENABLE(WEBASSEMBLY)1104 visitor.append(&thisObject->m_wasmModuleStructure);1105 #endif1106 1099 1107 1100 #define VISIT_SIMPLE_TYPE(CapitalName, lowerName, properName, instanceType, jsName) \ -
trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h
r203081 r204180 308 308 WriteBarrier<Structure> m_callableProxyObjectStructure; 309 309 WriteBarrier<Structure> m_proxyRevokeStructure; 310 #if ENABLE(WEBASSEMBLY)311 WriteBarrier<Structure> m_wasmModuleStructure;312 #endif313 310 314 311 #define DEFINE_STORAGE_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \ … … 584 581 Structure* callableProxyObjectStructure() const { return m_callableProxyObjectStructure.get(); } 585 582 Structure* proxyRevokeStructure() const { return m_proxyRevokeStructure.get(); } 586 #if ENABLE(WEBASSEMBLY)587 Structure* wasmModuleStructure() const { return m_wasmModuleStructure.get(); }588 #endif589 583 590 584 JS_EXPORT_PRIVATE void setRemoteDebuggingEnabled(bool); -
trunk/Source/WTF/ChangeLog
r204084 r204180 1 2016-08-05 Keith Miller <keith_miller@apple.com> 2 3 Delete out of date WASM code. 4 https://bugs.webkit.org/show_bug.cgi?id=160603 5 6 Reviewed by Saam Barati. 7 8 Add Feature define for WebAssembly on mac. 9 10 * wtf/FeatureDefines.h: 11 1 12 2016-08-03 Csaba Osztrogonác <ossy@webkit.org> 2 13 -
trunk/Source/WTF/wtf/FeatureDefines.h
r202096 r204180 223 223 #endif 224 224 225 #if !defined(ENABLE_WEBASSEMBLY) 226 #define ENABLE_WEBASSEMBLY 0 227 #endif 228 225 229 #if !defined(ENABLE_WEB_ARCHIVE) 226 230 #define ENABLE_WEB_ARCHIVE 1
Note: See TracChangeset
for help on using the changeset viewer.