Changeset 239940 in webkit
- Timestamp:
- Jan 14, 2019 1:34:47 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
-
JSTests/ChangeLog (modified) (1 diff)
-
JSTests/stress/regexp-compile-oom.js (modified) (1 diff)
-
Source/JavaScriptCore/ChangeLog (modified) (1 diff)
-
Source/JavaScriptCore/interpreter/CLoopStack.cpp (modified) (1 diff)
-
Source/JavaScriptCore/llint/LowLevelInterpreter.asm (modified) (1 diff)
-
Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (modified) (10 diffs)
-
Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (modified) (7 diffs)
-
Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (modified) (5 diffs)
-
Source/JavaScriptCore/offlineasm/cloop.rb (modified) (30 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/JSTests/ChangeLog
r239882 r239940 1 2019-01-14 Mark Lam <mark.lam@apple.com> 2 3 Fix all CLoop JSC test failures (including some LLInt bugs due to recent bytecode format change). 4 https://bugs.webkit.org/show_bug.cgi?id=193402 5 <rdar://problem/46012309> 6 7 Reviewed by Keith Miller. 8 9 * stress/regexp-compile-oom.js: 10 - Skip this test for !$jitTests because it is tuned for stack usage when the JIT 11 is enabled. As a result, it will fail on cloop builds though there is no bug. 12 1 13 2019-01-11 Saam barati <sbarati@apple.com> 2 14 -
trunk/JSTests/stress/regexp-compile-oom.js
r238508 r239940 1 //@ skip if $hostOS != "darwin" or $architecture == "arm" or $architecture == "x86" 1 //@ skip if $hostOS != "darwin" or $architecture == "arm" or $architecture == "x86" or not $jitTests 2 2 // Test that throw an OOM exception when compiling a pathological, but valid nested RegExp. 3 3 -
trunk/Source/JavaScriptCore/ChangeLog
r239933 r239940 1 2019-01-14 Mark Lam <mark.lam@apple.com> 2 3 Fix all CLoop JSC test failures (including some LLInt bugs due to recent bytecode format change). 4 https://bugs.webkit.org/show_bug.cgi?id=193402 5 <rdar://problem/46012309> 6 7 Reviewed by Keith Miller. 8 9 The CLoop builds via build-jsc were previously completely disabled after our 10 change to enable ASM LLInt build without the JIT. As a result, JSC tests have 11 regressed on CLoop builds. The CLoop builds and tests will be re-enabled when 12 the fix for https://bugs.webkit.org/show_bug.cgi?id=192955 lands. This patch 13 fixes all the regressions (and some old bugs) so that the CLoop test bots won't 14 be red when CLoop build gets re-enabled. 15 16 In this patch, we do the following: 17 18 1. Change CLoopStack::grow() to set the new CLoop stack top at the maximum 19 allocated capacity (after discounting the reserved zone) as opposed to setting 20 it only at the level that the client requested. 21 22 This fixes a small performance bug that I happened to noticed when I was 23 debugging a stack issue. It does not affect correctness. 24 25 2. In LowLevelInterpreter32_64.asm: 26 27 1. Fix loadConstantOrVariableTag() to use subi for computing the constant 28 index because the VirtualRegister offset and FirstConstantRegisterIndex 29 values it is operating on are both signed ints. This is just to be 30 pedantic. The previous use of subu will still produce a correct value. 31 32 2. Fix llintOpWithReturn() to use getu (instead of get) for reading 33 OpIsCellWithType::type because it is of type JSType, which is a uint8_t. 34 35 3. Fix llintOpWithMetadata() to use loadis for loading 36 OpGetById::Metadata::modeMetadata.protoLoadMode.cachedOffset[t5] because it 37 is of type PropertyOffset, which is a signed int. 38 39 4. Fix commonCallOp() to use getu for loading fields argv and argc because they 40 are of type unsigned for OpCall, OpConstruct, and OpTailCall, which are the 41 clients of commonCallOp. 42 43 5. Fix llintOpWithMetadata() and getClosureVar() to use loadp for loading 44 OpGetFromScope::Metadata::operand because it is of type uintptr_t. 45 46 3. In LowLevelInterpreter64.asm: 47 48 1. Fix llintOpWithReturn() to use getu for reading OpIsCellWithType::type 49 because it is of type JSType, which is a uint8_t. 50 51 2. Fix llintOpWithMetadata() to use loadi for loading 52 OpGetById::Metadata::modeMetadata.protoLoadMode.structure[t2] because it is 53 of type StructureID, which is a uint32_t. 54 55 Fix llintOpWithMetadata() to use loadis for loading 56 OpGetById::Metadata::modeMetadata.protoLoadMode.cachedOffset[t2] because it 57 is of type PropertyOffset, which is a signed int. 58 59 3. commonOp() should reload the metadataTable for op_catch because unlike 60 for the ASM LLInt, the exception unwinding code is not able to restore 61 "callee saved registers" for the CLoop interpreter because the CLoop uses 62 pseudo-registers (see the CLoopRegister class). 63 64 This was the source of many exotic Cloop failures after the bytecode format 65 change (which introduced the metadataTable callee saved register). Hence, 66 we fix it by reloading metadataTable's value on re-entry via op_catch for 67 exception handling. We already take care of restoring it in op_ret. 68 69 4. Fix llintOpWithMetadata() and getClosureVar() to use loadp for loading 70 OpGetFromScope::Metadata::operand because it is of type uintptr_t. 71 72 4. In LowLevelInterpreter.asm: 73 74 Fix metadata() to use loadi for loading metadataTable offsets because they are 75 of type unsigned. This was also a source of many exotic CLoop test failures. 76 77 5. Change CLoopRegister into a class with a uintptr_t as its storage element. 78 Previously, we were using a union to convert between various value types that 79 we would store in this pseudo-register. This method of type conversion is 80 undefined behavior according to the C++ spec. As a result, the C++ compiler 81 may choose to elide some CLoop statements, thereby resulting in some exotic 82 bugs. 83 84 We fix this by now always using accessor methods and assignment operators to 85 ensure that we use bitwise_cast to do the type conversions. Since bitwise_cast 86 uses a memcpy, this ensures that there's no undefined behavior, and that CLoop 87 statements won't get elided willy-nilly by the compiler. 88 89 Ditto for the CloopDobleRegisters. 90 91 Similarly, use bitwise_cast for ints2Double() and double2Ints() utility 92 functions. 93 94 Also use bitwise_cast (instead of reinterpret_cast) for the CLoop CAST macro. 95 96 6. Fix cloop.rb to use the new CLoopRegister and CLoopDoubleRegister classes. 97 98 Add a clLValue accessor for offlineasm operand types to distinguish 99 LValue use of the operands from RValue uses. 100 101 Replace the use of clearHighWord() with simply casting to uint32_t. This is 102 more efficient for the C++ compiler (and help speed up debug build runs). 103 104 Also fix 32-bit arithmetic operations to only set the lower 32-bit value of 105 the pseudo registers. This fixes some CLoop JSC test failures. 106 107 This patch has been manually tested with the JSC tests on the following builds: 108 64bit X86 ASM LLLint (without JIT), 64bit and 32bit X86 CLoop, and ARMv7 Cloop. 109 110 * interpreter/CLoopStack.cpp: 111 (JSC::CLoopStack::grow): 112 * llint/LowLevelInterpreter.asm: 113 * llint/LowLevelInterpreter.cpp: 114 (JSC::CLoopRegister::i const): 115 (JSC::CLoopRegister::u const): 116 (JSC::CLoopRegister::i32 const): 117 (JSC::CLoopRegister::u32 const): 118 (JSC::CLoopRegister::i8 const): 119 (JSC::CLoopRegister::u8 const): 120 (JSC::CLoopRegister::ip const): 121 (JSC::CLoopRegister::i8p const): 122 (JSC::CLoopRegister::vp const): 123 (JSC::CLoopRegister::cvp const): 124 (JSC::CLoopRegister::callFrame const): 125 (JSC::CLoopRegister::execState const): 126 (JSC::CLoopRegister::instruction const): 127 (JSC::CLoopRegister::vm const): 128 (JSC::CLoopRegister::cell const): 129 (JSC::CLoopRegister::protoCallFrame const): 130 (JSC::CLoopRegister::nativeFunc const): 131 (JSC::CLoopRegister::i64 const): 132 (JSC::CLoopRegister::u64 const): 133 (JSC::CLoopRegister::encodedJSValue const): 134 (JSC::CLoopRegister::opcode const): 135 (JSC::CLoopRegister::operator ExecState*): 136 (JSC::CLoopRegister::operator const Instruction*): 137 (JSC::CLoopRegister::operator JSCell*): 138 (JSC::CLoopRegister::operator ProtoCallFrame*): 139 (JSC::CLoopRegister::operator Register*): 140 (JSC::CLoopRegister::operator VM*): 141 (JSC::CLoopRegister::operator=): 142 (JSC::CLoopRegister::bitsAsDouble const): 143 (JSC::CLoopRegister::bitsAsInt64 const): 144 (JSC::CLoopDoubleRegister::operator T const): 145 (JSC::CLoopDoubleRegister::d const): 146 (JSC::CLoopDoubleRegister::bitsAsInt64 const): 147 (JSC::CLoopDoubleRegister::operator=): 148 (JSC::LLInt::ints2Double): 149 (JSC::LLInt::double2Ints): 150 (JSC::LLInt::decodeResult): 151 (JSC::CLoop::execute): 152 (JSC::LLInt::Ints2Double): Deleted. 153 (JSC::LLInt::Double2Ints): Deleted. 154 (JSC::CLoopRegister::CLoopRegister): Deleted. 155 (JSC::CLoopRegister::clearHighWord): Deleted. 156 * llint/LowLevelInterpreter32_64.asm: 157 * llint/LowLevelInterpreter64.asm: 158 * offlineasm/cloop.rb: 159 1 160 2019-01-14 Keith Miller <keith_miller@apple.com> 2 161 -
trunk/Source/JavaScriptCore/interpreter/CLoopStack.cpp
r238595 r239940 104 104 addToCommittedByteCount(delta); 105 105 m_commitTop = newCommitTop; 106 newTopOfStack = m_commitTop + m_softReservedZoneSizeInRegisters; 106 107 setCLoopStackLimit(newTopOfStack); 107 108 return true; -
trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
r238439 r239940 345 345 346 346 macro metadata(size, opcode, dst, scratch) 347 load pconstexpr %opcode%::opcodeID * 4[metadataTable], dst # offset = metadataTable<unsigned*>[opcodeID]347 loadi constexpr %opcode%::opcodeID * 4[metadataTable], dst # offset = metadataTable<unsigned*>[opcodeID] 348 348 getu(size, opcode, metadataID, scratch) # scratch = bytecode.metadataID 349 349 muli sizeof %opcode%::Metadata, scratch # scratch *= sizeof(Op::Metadata) -
trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
r239199 r239940 124 124 #define OFFLINE_ASM_LOCAL_LABEL(label) label: TRACE_LABEL("OFFLINE_ASM_LOCAL_LABEL", #label); USE_LABEL(label); 125 125 126 127 //============================================================================128 // Some utilities:129 //130 131 126 namespace JSC { 132 namespace LLInt {133 134 #if USE(JSVALUE32_64)135 static double Ints2Double(uint32_t lo, uint32_t hi)136 {137 union {138 double dval;139 uint64_t ival64;140 } u;141 u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;142 return u.dval;143 }144 145 static void Double2Ints(double val, uint32_t& lo, uint32_t& hi)146 {147 union {148 double dval;149 uint64_t ival64;150 } u;151 u.dval = val;152 hi = static_cast<uint32_t>(u.ival64 >> 32);153 lo = static_cast<uint32_t>(u.ival64);154 }155 #endif // USE(JSVALUE32_64)156 157 } // namespace LLint158 159 127 160 128 //============================================================================ … … 163 131 // pseudo register, as well as hides endianness differences. 164 132 165 struct CLoopRegister { 166 CLoopRegister() { i = static_cast<intptr_t>(0xbadbeef0baddbeef); } 167 union { 168 intptr_t i; 169 uintptr_t u; 133 class CLoopRegister { 134 public: 135 ALWAYS_INLINE intptr_t i() const { return m_value; }; 136 ALWAYS_INLINE uintptr_t u() const { return m_value; } 137 ALWAYS_INLINE int32_t i32() const { return m_value; } 138 ALWAYS_INLINE uint32_t u32() const { return m_value; } 139 ALWAYS_INLINE int8_t i8() const { return m_value; } 140 ALWAYS_INLINE uint8_t u8() const { return m_value; } 141 142 ALWAYS_INLINE intptr_t* ip() const { return bitwise_cast<intptr_t*>(m_value); } 143 ALWAYS_INLINE int8_t* i8p() const { return bitwise_cast<int8_t*>(m_value); } 144 ALWAYS_INLINE void* vp() const { return bitwise_cast<void*>(m_value); } 145 ALWAYS_INLINE const void* cvp() const { return bitwise_cast<const void*>(m_value); } 146 ALWAYS_INLINE CallFrame* callFrame() const { return bitwise_cast<CallFrame*>(m_value); } 147 ALWAYS_INLINE ExecState* execState() const { return bitwise_cast<ExecState*>(m_value); } 148 ALWAYS_INLINE const void* instruction() const { return bitwise_cast<const void*>(m_value); } 149 ALWAYS_INLINE VM* vm() const { return bitwise_cast<VM*>(m_value); } 150 ALWAYS_INLINE JSCell* cell() const { return bitwise_cast<JSCell*>(m_value); } 151 ALWAYS_INLINE ProtoCallFrame* protoCallFrame() const { return bitwise_cast<ProtoCallFrame*>(m_value); } 152 ALWAYS_INLINE NativeFunction nativeFunc() const { return bitwise_cast<NativeFunction>(m_value); } 170 153 #if USE(JSVALUE64) 171 #if CPU(BIG_ENDIAN) 172 struct { 173 int32_t i32padding; 174 int32_t i32; 175 }; 176 struct { 177 uint32_t u32padding; 178 uint32_t u32; 179 }; 180 struct { 181 int8_t i8padding[7]; 182 int8_t i8; 183 }; 184 struct { 185 uint8_t u8padding[7]; 186 uint8_t u8; 187 }; 188 #else // !CPU(BIG_ENDIAN) 189 struct { 190 int32_t i32; 191 int32_t i32padding; 192 }; 193 struct { 194 uint32_t u32; 195 uint32_t u32padding; 196 }; 197 struct { 198 int8_t i8; 199 int8_t i8padding[7]; 200 }; 201 struct { 202 uint8_t u8; 203 uint8_t u8padding[7]; 204 }; 205 #endif // !CPU(BIG_ENDIAN) 206 #else // !USE(JSVALUE64) 207 int32_t i32; 208 uint32_t u32; 209 210 #if CPU(BIG_ENDIAN) 211 struct { 212 int8_t i8padding[3]; 213 int8_t i8; 214 }; 215 struct { 216 uint8_t u8padding[3]; 217 uint8_t u8; 218 }; 219 220 #else // !CPU(BIG_ENDIAN) 221 struct { 222 int8_t i8; 223 int8_t i8padding[3]; 224 }; 225 struct { 226 uint8_t u8; 227 uint8_t u8padding[3]; 228 }; 229 #endif // !CPU(BIG_ENDIAN) 230 #endif // !USE(JSVALUE64) 231 232 intptr_t* ip; 233 int8_t* i8p; 234 void* vp; 235 const void* cvp; 236 CallFrame* callFrame; 237 ExecState* execState; 238 const void* instruction; 239 VM* vm; 240 JSCell* cell; 241 ProtoCallFrame* protoCallFrame; 242 NativeFunction nativeFunc; 154 ALWAYS_INLINE int64_t i64() const { return m_value; } 155 ALWAYS_INLINE uint64_t u64() const { return m_value; } 156 ALWAYS_INLINE EncodedJSValue encodedJSValue() const { return bitwise_cast<EncodedJSValue>(m_value); } 157 #endif 158 ALWAYS_INLINE Opcode opcode() const { return bitwise_cast<Opcode>(m_value); } 159 160 operator ExecState*() { return bitwise_cast<ExecState*>(m_value); } 161 operator const Instruction*() { return bitwise_cast<const Instruction*>(m_value); } 162 operator JSCell*() { return bitwise_cast<JSCell*>(m_value); } 163 operator ProtoCallFrame*() { return bitwise_cast<ProtoCallFrame*>(m_value); } 164 operator Register*() { return bitwise_cast<Register*>(m_value); } 165 operator VM*() { return bitwise_cast<VM*>(m_value); } 166 167 template<typename T, typename = std::enable_if_t<sizeof(T) == sizeof(uintptr_t)>> 168 ALWAYS_INLINE void operator=(T value) { m_value = bitwise_cast<uintptr_t>(value); } 243 169 #if USE(JSVALUE64) 244 int64_t i64; 245 uint64_t u64; 246 EncodedJSValue encodedJSValue; 247 double castToDouble; 248 #endif 249 Opcode opcode; 250 }; 251 252 operator ExecState*() { return execState; } 253 operator const Instruction*() { return reinterpret_cast<const Instruction*>(instruction); } 254 operator VM*() { return vm; } 255 operator ProtoCallFrame*() { return protoCallFrame; } 256 operator Register*() { return reinterpret_cast<Register*>(vp); } 257 operator JSCell*() { return cell; } 170 ALWAYS_INLINE void operator=(int32_t value) { m_value = static_cast<intptr_t>(value); } 171 ALWAYS_INLINE void operator=(uint32_t value) { m_value = static_cast<uintptr_t>(value); } 172 #endif 173 ALWAYS_INLINE void operator=(int16_t value) { m_value = static_cast<intptr_t>(value); } 174 ALWAYS_INLINE void operator=(uint16_t value) { m_value = static_cast<uintptr_t>(value); } 175 ALWAYS_INLINE void operator=(int8_t value) { m_value = static_cast<intptr_t>(value); } 176 ALWAYS_INLINE void operator=(uint8_t value) { m_value = static_cast<uintptr_t>(value); } 177 ALWAYS_INLINE void operator=(bool value) { m_value = static_cast<uintptr_t>(value); } 258 178 259 179 #if USE(JSVALUE64) 260 inline void clearHighWord() { i32padding = 0; } 261 #else 262 inline void clearHighWord() { } 263 #endif 180 ALWAYS_INLINE double bitsAsDouble() const { return bitwise_cast<double>(m_value); } 181 ALWAYS_INLINE int64_t bitsAsInt64() const { return bitwise_cast<int64_t>(m_value); } 182 #endif 183 184 private: 185 uintptr_t m_value { static_cast<uintptr_t>(0xbadbeef0baddbeef) }; 264 186 }; 187 188 class CLoopDoubleRegister { 189 public: 190 template<typename T> 191 explicit operator T() const { return bitwise_cast<T>(m_value); } 192 193 ALWAYS_INLINE double d() const { return m_value; } 194 ALWAYS_INLINE int64_t bitsAsInt64() const { return bitwise_cast<int64_t>(m_value); } 195 196 ALWAYS_INLINE void operator=(double value) { m_value = value; } 197 198 template<typename T, typename = std::enable_if_t<sizeof(T) == sizeof(uintptr_t) && std::is_integral<T>::value>> 199 ALWAYS_INLINE void operator=(T value) { m_value = bitwise_cast<double>(value); } 200 201 private: 202 double m_value; 203 }; 204 205 //============================================================================ 206 // Some utilities: 207 // 208 209 namespace LLInt { 210 211 #if USE(JSVALUE32_64) 212 static double ints2Double(uint32_t lo, uint32_t hi) 213 { 214 uint64_t value = (static_cast<uint64_t>(hi) << 32) | lo; 215 return bitwise_cast<double>(value); 216 } 217 218 static void double2Ints(double val, CLoopRegister& lo, CLoopRegister& hi) 219 { 220 uint64_t value = bitwise_cast<uint64_t>(val); 221 hi = static_cast<uint32_t>(value >> 32); 222 lo = static_cast<uint32_t>(value); 223 } 224 #endif // USE(JSVALUE32_64) 225 226 static void decodeResult(SlowPathReturnType result, CLoopRegister& t0, CLoopRegister& t1) 227 { 228 const void* t0Result; 229 const void* t1Result; 230 JSC::decodeResult(result, t0Result, t1Result); 231 t0 = t0Result; 232 t1 = t1Result; 233 } 234 235 } // namespace LLint 265 236 266 237 //============================================================================ … … 270 241 JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, ProtoCallFrame* protoCallFrame, bool isInitializationPass) 271 242 { 272 #define CAST reinterpret_cast 273 #define SIGN_BIT32(x) ((x) & 0x80000000) 243 #define CAST bitwise_cast 274 244 275 245 // One-time initialization of our address tables. We have to put this code … … 317 287 // Define the pseudo registers used by the LLINT C Loop backend: 318 288 ASSERT(sizeof(CLoopRegister) == sizeof(intptr_t)); 319 320 union CLoopDoubleRegister {321 double d;322 #if USE(JSVALUE64)323 int64_t castToInt64;324 #endif325 };326 289 327 290 // The CLoop llint backend is initially based on the ARMv7 backend, and … … 349 312 // 3. 64 bit result values will be in t0. 350 313 351 CLoopRegister t0, t1, t2, t3, t5, t7,sp, cfr, lr, pc;314 CLoopRegister t0, t1, t2, t3, t5, sp, cfr, lr, pc; 352 315 #if USE(JSVALUE64) 353 316 CLoopRegister pcBase, tagTypeNumber, tagMask; … … 375 338 StackPointerScope stackPointerScope(cloopStack); 376 339 377 lr .opcode= getOpcode(llint_return_to_host);378 sp .vp= cloopStack.currentStackPointer();379 cfr .callFrame= vm->topCallFrame;340 lr = getOpcode(llint_return_to_host); 341 sp = cloopStack.currentStackPointer(); 342 cfr = vm->topCallFrame; 380 343 #ifndef NDEBUG 381 void* startSP = sp.vp ;382 CallFrame* startCFR = cfr.callFrame ;344 void* startSP = sp.vp(); 345 CallFrame* startCFR = cfr.callFrame(); 383 346 #endif 384 347 385 348 // Initialize the incoming args for doVMEntryToJavaScript: 386 t0 .vp= executableAddress;387 t1 .vm= vm;388 t2 .protoCallFrame= protoCallFrame;349 t0 = executableAddress; 350 t1 = vm; 351 t2 = protoCallFrame; 389 352 390 353 #if USE(JSVALUE64) 391 354 // For the ASM llint, JITStubs takes care of this initialization. We do 392 355 // it explicitly here for the C loop: 393 tagTypeNumber .i= 0xFFFF000000000000;394 tagMask .i= 0xFFFF000000000002;356 tagTypeNumber = 0xFFFF000000000000; 357 tagMask = 0xFFFF000000000002; 395 358 #endif // USE(JSVALUE64) 396 359 … … 402 365 #define PUSH(cloopReg) \ 403 366 do { \ 404 sp .ip--; \405 *sp.ip = cloopReg.i; \367 sp = sp.ip() - 1; \ 368 *sp.ip() = cloopReg.i(); \ 406 369 } while (false) 407 370 408 371 #define POP(cloopReg) \ 409 372 do { \ 410 cloopReg .i = *sp.ip; \411 sp .ip++; \373 cloopReg = *sp.ip(); \ 374 sp = sp.ip() + 1; \ 412 375 } while (false) 413 376 … … 474 437 OFFLINE_ASM_GLUE_LABEL(llint_return_to_host) 475 438 { 476 ASSERT(startSP == sp.vp );477 ASSERT(startCFR == cfr.callFrame );439 ASSERT(startSP == sp.vp()); 440 ASSERT(startCFR == cfr.callFrame()); 478 441 #if USE(JSVALUE32_64) 479 return JSValue(t1.i , t0.i); // returning JSValue(tag, payload);480 #else 481 return JSValue::decode(t0.encodedJSValue );442 return JSValue(t1.i(), t0.i()); // returning JSValue(tag, payload); 443 #else 444 return JSValue::decode(t0.encodedJSValue()); 482 445 #endif 483 446 } … … 491 454 JSValue result = vm->hostCallReturnValue; 492 455 #if USE(JSVALUE32_64) 493 t1 .i= result.tag();494 t0 .i= result.payload();495 #else 496 t0 .encodedJSValue= JSValue::encode(result);497 #endif 498 opcode = lr.opcode ;456 t1 = result.tag(); 457 t0 = result.payload(); 458 #else 459 t0 = JSValue::encode(result); 460 #endif 461 opcode = lr.opcode(); 499 462 DISPATCH_OPCODE(); 500 463 } … … 524 487 #undef CHECK_FOR_TIMEOUT 525 488 #undef CAST 526 #undef SIGN_BIT32527 489 528 490 return JSValue(); // to suppress a compiler warning. -
trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
r239867 r239940 471 471 loadp CodeBlock[cfr], tag 472 472 loadp CodeBlock::m_constantRegisters + VectorBufferOffset[tag], tag 473 sub pFirstConstantRegisterIndex, index473 subi FirstConstantRegisterIndex, index 474 474 loadp TagOffset[tag, index, 8], tag 475 475 .done: … … 487 487 loadp CodeBlock[cfr], tag 488 488 loadp CodeBlock::m_constantRegisters + VectorBufferOffset[tag], tag 489 sub pFirstConstantRegisterIndex, index489 subi FirstConstantRegisterIndex, index 490 490 lshifti 3, index 491 491 addp index, tag … … 1266 1266 loadConstantOrVariable(size, t1, t0, t3) 1267 1267 bineq t0, CellTag, .notCellCase 1268 get (type, t0)1268 getu(size, OpIsCellWithType, type, t0) 1269 1269 cbeq JSCell::m_type[t3], t0, t1 1270 1270 return(BooleanTag, t1) … … 1352 1352 loadi OpGetById::Metadata::modeMetadata.protoLoadMode.structure[t5], t1 1353 1353 loadConstantOrVariablePayload(size, t0, CellTag, t3, .opGetByIdSlow) 1354 loadi OpGetById::Metadata::modeMetadata.protoLoadMode.cachedOffset[t5], t21354 loadis OpGetById::Metadata::modeMetadata.protoLoadMode.cachedOffset[t5], t2 1355 1355 bineq JSCell::m_structureID[t3], t1, .opGetByIdSlow 1356 1356 loadp OpGetById::Metadata::modeMetadata.protoLoadMode.cachedSlot[t5], t3 … … 1914 1914 loadConstantOrVariablePayload(size, t0, CellTag, t3, .opCallSlow) 1915 1915 bineq t3, t2, .opCallSlow 1916 get (argv, t3)1916 getu(size, op, argv, t3) 1917 1917 lshifti 3, t3 1918 1918 negi t3 1919 1919 addp cfr, t3 # t3 contains the new value of cfr 1920 1920 storei t2, Callee + PayloadOffset[t3] 1921 get (argc, t2)1921 getu(size, op, argc, t2) 1922 1922 storei PC, ArgumentCount + TagOffset[cfr] 1923 1923 storei t2, ArgumentCount + PayloadOffset[t3] … … 2249 2249 llintOpWithMetadata(op_get_from_scope, OpGetFromScope, macro (size, get, dispatch, metadata, return) 2250 2250 macro getProperty() 2251 load isOpGetFromScope::Metadata::operand[t5], t32251 loadp OpGetFromScope::Metadata::operand[t5], t3 2252 2252 loadPropertyAtVariableOffset(t3, t0, t1, t2) 2253 2253 valueProfile(OpGetFromScope, t5, t1, t2) … … 2265 2265 2266 2266 macro getClosureVar() 2267 load isOpGetFromScope::Metadata::operand[t5], t32267 loadp OpGetFromScope::Metadata::operand[t5], t3 2268 2268 loadp JSLexicalEnvironment_variables + TagOffset[t0, t3, 8], t1 2269 2269 loadp JSLexicalEnvironment_variables + PayloadOffset[t0, t3, 8], t2 -
trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
r239761 r239940 1216 1216 1217 1217 llintOpWithReturn(op_is_cell_with_type, OpIsCellWithType, macro (size, get, dispatch, return) 1218 get (type, t0)1218 getu(size, OpIsCellWithType, type, t0) 1219 1219 get(operand, t1) 1220 1220 loadConstantOrVariable(size, t1, t3) … … 1303 1303 bbneq t1, constexpr GetByIdMode::ProtoLoad, .opGetByIdArrayLength 1304 1304 loadi JSCell::m_structureID[t3], t1 1305 loadi sOpGetById::Metadata::modeMetadata.protoLoadMode.structure[t2], t31305 loadi OpGetById::Metadata::modeMetadata.protoLoadMode.structure[t2], t3 1306 1306 bineq t3, t1, .opGetByIdSlow 1307 loadi OpGetById::Metadata::modeMetadata.protoLoadMode.cachedOffset[t2], t11307 loadis OpGetById::Metadata::modeMetadata.protoLoadMode.cachedOffset[t2], t1 1308 1308 loadp OpGetById::Metadata::modeMetadata.protoLoadMode.cachedSlot[t2], t3 1309 1309 loadPropertyAtVariableOffset(t1, t3, t0) … … 2069 2069 2070 2070 loadp CodeBlock[cfr], PB 2071 loadp CodeBlock::m_metadata[PB], metadataTable 2071 2072 loadp CodeBlock::m_instructionsRawPointer[PB], PB 2072 2073 unpoison(_g_CodeBlockPoison, PB, t2) … … 2312 2313 2313 2314 macro getProperty() 2314 load isOpGetFromScope::Metadata::operand[t5], t12315 loadp OpGetFromScope::Metadata::operand[t5], t1 2315 2316 loadPropertyAtVariableOffset(t1, t0, t2) 2316 2317 valueProfile(OpGetFromScope, t5, t2) … … 2327 2328 2328 2329 macro getClosureVar() 2329 load isOpGetFromScope::Metadata::operand[t5], t12330 loadp OpGetFromScope::Metadata::operand[t5], t1 2330 2331 loadq JSLexicalEnvironment_variables[t0, t1, 8], t0 2331 2332 valueProfile(OpGetFromScope, t5, t0) -
trunk/Source/JavaScriptCore/offlineasm/cloop.rb
r238543 r239940 34 34 def cloopMapType(type) 35 35 case type 36 when :int; ".i "37 when :uint; ".u "38 when :int32; ".i32 "39 when :uint32; ".u32 "40 when :int64; ".i64 "41 when :uint64; ".u64 "42 when :int8; ".i8 "43 when :uint8; ".u8 "44 when :int8Ptr; ".i8p "45 when :voidPtr; ".vp "46 when :nativeFunc; ".nativeFunc "47 when :double; ".d "48 when : castToDouble; ".castToDouble"49 when : castToInt64; ".castToInt64"50 when :opcode; ".opcode "36 when :int; ".i()" 37 when :uint; ".u()" 38 when :int32; ".i32()" 39 when :uint32; ".u32()" 40 when :int64; ".i64()" 41 when :uint64; ".u64()" 42 when :int8; ".i8()" 43 when :uint8; ".u8()" 44 when :int8Ptr; ".i8p()" 45 when :voidPtr; ".vp()" 46 when :nativeFunc; ".nativeFunc()" 47 when :double; ".d()" 48 when :bitsAsDouble; ".bitsAsDouble()" 49 when :bitsAsInt64; ".bitsAsInt64()" 50 when :opcode; ".opcode()" 51 51 else; 52 52 raise "Unsupported type" … … 56 56 57 57 class SpecialRegister < NoChildren 58 def clLValue(type=:int) 59 clDump 60 end 58 61 def clDump 59 62 @name … … 101 104 end 102 105 end 106 def clLValue(type=:int) 107 clDump 108 end 103 109 def clValue(type=:int) 104 110 clDump + cloopMapType(type) … … 125 131 end 126 132 end 133 def clLValue(type=:int) 134 clDump 135 end 127 136 def clValue(type=:int) 128 137 clDump + cloopMapType(type) … … 133 142 def clDump 134 143 "#{value}" 144 end 145 def clLValue(type=:int) 146 raise "Immediate cannot be used as an LValue" 135 147 end 136 148 def clValue(type=:int) … … 165 177 def clDump 166 178 "[#{base.clDump}, #{offset.value}]" 179 end 180 def clLValue(type=:int) 181 clValue(type) 167 182 end 168 183 def clValue(type=:int) … … 236 251 "[#{base.clDump}, #{offset.clDump}, #{index.clDump} << #{scaleShift}]" 237 252 end 253 def clLValue(type=:int) 254 clValue(type) 255 end 238 256 def clValue(type=:int) 239 257 case type … … 300 318 "#{codeOriginString}" 301 319 end 320 def clLValue(type=:int) 321 clValue(type) 322 end 302 323 def clValue 303 324 clDump … … 310 331 end 311 332 def cloopEmitLea(destination, type) 312 $asm.putc "#{destination.cl Value(:voidPtr)} = CAST<void*>(&#{cLabel});"333 $asm.putc "#{destination.clLValue(:voidPtr)} = CAST<void*>(&#{cLabel});" 313 334 end 314 335 end … … 322 343 def cloopEmitLea(destination, type) 323 344 if destination == base 324 $asm.putc "#{destination.cl Value(:int8Ptr)} += #{offset.clValue(type)};"345 $asm.putc "#{destination.clLValue(:int8Ptr)} += #{offset.clValue(type)};" 325 346 else 326 $asm.putc "#{destination.cl Value(:int8Ptr)} = #{base.clValue(:int8Ptr)} + #{offset.clValue(type)};"347 $asm.putc "#{destination.clLValue(:int8Ptr)} = #{base.clValue(:int8Ptr)} + #{offset.clValue(type)};" 327 348 end 328 349 end … … 332 353 def cloopEmitLea(destination, type) 333 354 raise "Malformed BaseIndex, offset should be zero at #{codeOriginString}" unless offset.value == 0 334 $asm.putc "#{destination.cl Value(:int8Ptr)} = #{base.clValue(:int8Ptr)} + (#{index.clValue} << #{scaleShift});"355 $asm.putc "#{destination.clLValue(:int8Ptr)} = #{base.clValue(:int8Ptr)} + (#{index.clValue} << #{scaleShift});" 335 356 end 336 357 end … … 368 389 type == :int64 || type == :uint64 || type == :double 369 390 if operands.size == 3 370 $asm.putc "#{operands[2].clValue(type)} = #{operands[0].clValue(type)} #{operator} #{operands[1].clValue(type)};" 371 if operands[2].is_a? RegisterID and (type == :int32 or type == :uint32) 372 $asm.putc "#{operands[2].clDump}.clearHighWord();" # Just clear it. It does nothing on the 32-bit port. 373 end 391 op1 = operands[0] 392 op2 = operands[1] 393 dst = operands[2] 374 394 else 375 395 raise unless operands.size == 2 376 raise unless not operands[1].is_a? Immediate 377 $asm.putc "#{operands[1].clValue(type)} = #{operands[1].clValue(type)} #{operator} #{operands[0].clValue(type)};" 378 if operands[1].is_a? RegisterID and (type == :int32 or type == :uint32) 379 $asm.putc "#{operands[1].clDump}.clearHighWord();" # Just clear it. It does nothing on the 32-bit port. 380 end 381 end 396 op1 = operands[1] 397 op2 = operands[0] 398 dst = operands[1] 399 end 400 raise unless not dst.is_a? Immediate 401 if dst.is_a? RegisterID and (type == :int32 or type == :uint32) 402 truncationHeader = "(uint32_t)(" 403 truncationFooter = ")" 404 else 405 truncationHeader = "" 406 truncationFooter = "" 407 end 408 $asm.putc "#{dst.clLValue(type)} = #{truncationHeader}#{op1.clValue(type)} #{operator} #{op2.clValue(type)}#{truncationFooter};" 382 409 end 383 410 … … 385 412 raise unless type == :int || type == :uint || type == :int32 || type == :uint32 || type == :int64 || type == :uint64 386 413 if operands.size == 3 387 $asm.putc "#{operands[2].clValue(type)} = #{operands[1].clValue(type)} #{operator} (#{operands[0].clValue(:int)} & 0x1f);" 388 if operands[2].is_a? RegisterID and (type == :int32 or type == :uint32) 389 $asm.putc "#{operands[2].clDump}.clearHighWord();" # Just clear it. It does nothing on the 32-bit port. 390 end 414 op1 = operands[0] 415 op2 = operands[1] 416 dst = operands[2] 391 417 else 392 raise unless operands.size == 2 393 raise unless not operands[1].is_a? Immediate 394 $asm.putc "#{operands[1].clValue(type)} = #{operands[1].clValue(type)} #{operator} (#{operands[0].clValue(:int)} & 0x1f);" 395 if operands[1].is_a? RegisterID and (type == :int32 or type == :uint32) 396 $asm.putc "#{operands[1].clDump}.clearHighWord();" # Just clear it. It does nothing on the 32-bit port. 397 end 398 end 418 op1 = operands[1] 419 op2 = operands[0] 420 dst = operands[1] 421 end 422 if dst.is_a? RegisterID and (type == :int32 or type == :uint32) 423 truncationHeader = "(uint32_t)(" 424 truncationFooter = ")" 425 else 426 truncationHeader = "" 427 truncationFooter = "" 428 end 429 $asm.putc "#{dst.clLValue(type)} = #{truncationHeader}#{operands[1].clValue(type)} #{operator} (#{operands[0].clValue(:int)} & 0x1f)#{truncationFooter};" 399 430 end 400 431 … … 403 434 raise unless operands.size == 1 404 435 raise unless not operands[0].is_a? Immediate 405 $asm.putc "#{operands[0].clValue(type)} = #{operator}#{operands[0].clValue(type)};" 406 if operands[0].is_a? RegisterID and (type == :int32 or type == :uint32) 407 $asm.putc "#{operands[0].clDump}.clearHighWord();" # Just clear it. It does nothing on the 32-bit port. 408 end 436 op = operands[0] 437 dst = operands[0] 438 if dst.is_a? RegisterID and (type == :int32 or type == :uint32) 439 truncationHeader = "(uint32_t)(" 440 truncationFooter = ")" 441 else 442 truncationHeader = "" 443 truncationFooter = "" 444 end 445 $asm.putc "#{dst.clLValue(type)} = #{truncationHeader}#{operator}#{op.clValue(type)}#{truncationFooter};" 409 446 end 410 447 … … 419 456 # The result is a boolean. Hence, it doesn't need to be based on the type 420 457 # of the arguments being compared. 421 $asm.putc "#{operands[2].cl Value} = (#{operands[0].clValue(type)} #{comparator} #{operands[1].clValue(type)});"458 $asm.putc "#{operands[2].clLValue(type)} = (#{operands[0].clValue(type)} #{comparator} #{operands[1].clValue(type)});" 422 459 end 423 460 … … 460 497 # the condition test. 461 498 conditionExpr = cloopGenerateConditionExpression(operands, type, conditionTest) 462 $asm.putc "#{operands[-1].cl Value} = (#{conditionExpr});"499 $asm.putc "#{operands[-1].clLValue} = (#{conditionExpr});" 463 500 end 464 501 … … 472 509 end 473 510 474 op1 = operands[0].clValue(type)475 op2 = operands[1].clValue(type)476 477 511 $asm.putc "{" 478 $asm.putc " #{tempType} temp = #{op 2} #{operator} #{op1};"479 $asm.putc " #{op 2} = temp;"512 $asm.putc " #{tempType} temp = #{operands[1].clValue(type)} #{operator} #{operands[0].clValue(type)};" 513 $asm.putc " #{operands[1].clLValue(type)} = temp;" 480 514 $asm.putc " if (temp #{conditionTest})" 481 515 $asm.putc " goto #{operands[2].cLabel};" … … 487 521 when :int32 488 522 tempType = "int32_t" 523 truncationHeader = "(uint32_t)(" 524 truncationFooter = ")" 489 525 else 490 526 raise "Unimplemented type" … … 502 538 end 503 539 504 $asm.putc " if (!WTF::ArithmeticOperations<#{tempType}, #{tempType}, #{tempType}>::#{operation}(#{operands[1].clValue(type)}, #{operands[0].clValue(type)}, #{operands[1].clValue(type)}))" 540 $asm.putc " #{tempType} result;" 541 $asm.putc " bool success = WTF::ArithmeticOperations<#{tempType}, #{tempType}, #{tempType}>::#{operation}(#{operands[1].clValue(type)}, #{operands[0].clValue(type)}, result);" 542 $asm.putc " #{operands[1].clLValue(type)} = #{truncationHeader}result#{truncationFooter};" 543 $asm.putc " if (!success)" 505 544 $asm.putc " goto #{operands[2].cLabel};" 506 545 $asm.putc "}" … … 510 549 def cloopEmitCallSlowPath(operands) 511 550 $asm.putc "{" 512 $asm.putc " cloopStack.setCurrentStackPointer(sp.vp );"551 $asm.putc " cloopStack.setCurrentStackPointer(sp.vp());" 513 552 $asm.putc " SlowPathReturnType result = #{operands[0].cLabel}(#{operands[1].clDump}, #{operands[2].clDump});" 514 $asm.putc " decodeResult(result, t0 .cvp, t1.cvp);"553 $asm.putc " decodeResult(result, t0, t1);" 515 554 $asm.putc "}" 516 555 end 517 556 518 557 def cloopEmitCallSlowPathVoid(operands) 519 $asm.putc "cloopStack.setCurrentStackPointer(sp.vp );"558 $asm.putc "cloopStack.setCurrentStackPointer(sp.vp());" 520 559 $asm.putc "#{operands[0].cLabel}(#{operands[1].clDump}, #{operands[2].clDump});" 521 560 end … … 598 637 599 638 when "loadi" 600 $asm.putc "#{operands[1].cl Value(:uint)} = #{operands[0].uint32MemRef};"639 $asm.putc "#{operands[1].clLValue(:uint32)} = #{operands[0].uint32MemRef};" 601 640 # There's no need to call clearHighWord() here because the above will 602 641 # automatically take care of 0 extension. 603 642 when "loadis" 604 $asm.putc "#{operands[1].cl Value(:int)} = #{operands[0].int32MemRef};"643 $asm.putc "#{operands[1].clLValue(:int32)} = #{operands[0].int32MemRef};" 605 644 when "loadq" 606 $asm.putc "#{operands[1].cl Value(:int64)} = #{operands[0].int64MemRef};"645 $asm.putc "#{operands[1].clLValue(:int64)} = #{operands[0].int64MemRef};" 607 646 when "loadp" 608 $asm.putc "#{operands[1].cl Value(:int)} = #{operands[0].intMemRef};"647 $asm.putc "#{operands[1].clLValue} = #{operands[0].intMemRef};" 609 648 when "storei" 610 649 $asm.putc "#{operands[1].int32MemRef} = #{operands[0].clValue(:int32)};" … … 614 653 $asm.putc "#{operands[1].intMemRef} = #{operands[0].clValue(:int)};" 615 654 when "loadb" 616 $asm.putc "#{operands[1].clValue(:int)} = #{operands[0].uint8MemRef};" 617 when "loadbs", "loadbsp" 618 $asm.putc "#{operands[1].clValue(:int)} = #{operands[0].int8MemRef};" 655 $asm.putc "#{operands[1].clLValue(:int)} = #{operands[0].uint8MemRef};" 656 when "loadbs" 657 $asm.putc "#{operands[1].clLValue(:int)} = (uint32_t)(#{operands[0].int8MemRef});" 658 when "loadbsp" 659 $asm.putc "#{operands[1].clLValue(:int)} = #{operands[0].int8MemRef};" 619 660 when "storeb" 620 661 $asm.putc "#{operands[1].uint8MemRef} = #{operands[0].clValue(:int8)};" 621 662 when "loadh" 622 $asm.putc "#{operands[1].cl Value(:int)} = #{operands[0].uint16MemRef};"663 $asm.putc "#{operands[1].clLValue(:int)} = #{operands[0].uint16MemRef};" 623 664 when "loadhs" 624 $asm.putc "#{operands[1].cl Value(:int)} = #{operands[0].int16MemRef};"665 $asm.putc "#{operands[1].clLValue(:int)} = (uint32_t)(#{operands[0].int16MemRef});" 625 666 when "storeh" 626 667 $asm.putc "*#{operands[1].uint16MemRef} = #{operands[0].clValue(:int16)};" 627 668 when "loadd" 628 $asm.putc "#{operands[1].cl Value(:double)} = #{operands[0].dblMemRef};"669 $asm.putc "#{operands[1].clLValue(:double)} = #{operands[0].dblMemRef};" 629 670 when "stored" 630 671 $asm.putc "#{operands[1].dblMemRef} = #{operands[0].clValue(:double)};" … … 641 682 # Convert an int value to its double equivalent, and store it in a double register. 642 683 when "ci2d" 643 $asm.putc "#{operands[1].cl Value(:double)} = #{operands[0].clValue(:int32)};"644 684 $asm.putc "#{operands[1].clLValue(:double)} = (double)#{operands[0].clValue(:int32)}; // ci2d" 685 645 686 when "bdeq" 646 687 cloopEmitCompareAndBranch(operands, :double, "==") … … 670 711 671 712 when "td2i" 672 $asm.putc "#{operands[1].clValue(:int)} = #{operands[0].clValue(:double)};" 673 $asm.putc "#{operands[1].clDump}.clearHighWord();" 713 $asm.putc "#{operands[1].clLValue(:int)} = (uint32_t)(intptr_t)#{operands[0].clValue(:double)}; // td2i" 674 714 675 715 when "bcd2i" # operands: srcDbl dstInt slowPath 676 $asm.putc "{ "716 $asm.putc "{ // bcd2i" 677 717 $asm.putc " double d = #{operands[0].clValue(:double)};" 678 718 $asm.putc " const int32_t asInt32 = int32_t(d);" 679 719 $asm.putc " if (asInt32 != d || (!asInt32 && std::signbit(d))) // true for -0.0" 680 720 $asm.putc " goto #{operands[2].cLabel};" 681 $asm.putc " #{operands[1].clValue} = asInt32;" 682 $asm.putc " #{operands[1].clDump}.clearHighWord();" 721 $asm.putc " #{operands[1].clLValue} = (uint32_t)asInt32;" 683 722 $asm.putc "}" 684 723 685 724 when "move" 686 $asm.putc "#{operands[1].cl Value(:int)} = #{operands[0].clValue(:int)};"725 $asm.putc "#{operands[1].clLValue(:int)} = #{operands[0].clValue(:int)};" 687 726 when "sxi2q" 688 $asm.putc "#{operands[1].cl Value(:int64)} = #{operands[0].clValue(:int32)};"727 $asm.putc "#{operands[1].clLValue(:int64)} = #{operands[0].clValue(:int32)};" 689 728 when "zxi2q" 690 $asm.putc "#{operands[1].cl Value(:uint64)} = #{operands[0].clValue(:uint32)};"729 $asm.putc "#{operands[1].clLValue(:uint64)} = #{operands[0].clValue(:uint32)};" 691 730 when "nop" 692 731 $asm.putc "// nop" … … 832 871 $asm.putc "CRASH(); // break instruction not implemented." 833 872 when "ret" 834 $asm.putc "opcode = lr.opcode ;"873 $asm.putc "opcode = lr.opcode();" 835 874 $asm.putc "DISPATCH_OPCODE();" 836 875 … … 956 995 # the lower 32 bits of t1. Leave the upper 32 bits of t0 and t1 unchanged. 957 996 when "cdqi" 958 $asm.putc "{" 959 $asm.putc " int64_t temp = t0.i32; // sign extend the low 32bit" 960 $asm.putc " t0.i32 = temp; // low word" 961 $asm.putc " t0.clearHighWord();" 962 $asm.putc " t1.i32 = uint64_t(temp) >> 32; // high word" 963 $asm.putc " t1.clearHighWord();" 997 $asm.putc "{ // cdqi" 998 $asm.putc " int64_t temp = t0.i32(); // sign extend the low 32bit" 999 $asm.putc " t0 = (uint32_t)temp; // low word" 1000 $asm.putc " t1 = (uint32_t)(temp >> 32); // high word" 964 1001 $asm.putc "}" 965 1002 … … 977 1014 # Divide t1,t0 (EDX,EAX) by the specified arg, and store the remainder in t1, 978 1015 # and quotient in t0: 979 $asm.putc "{ "980 $asm.putc " int64_t dividend = (int64_t(t1.u32 ) << 32) | t0.u32;"1016 $asm.putc "{ // idivi" 1017 $asm.putc " int64_t dividend = (int64_t(t1.u32()) << 32) | t0.u32();" 981 1018 $asm.putc " int64_t divisor = #{operands[0].clValue(:int)};" 982 $asm.putc " t1.i32 = dividend % divisor; // remainder" 983 $asm.putc " t1.clearHighWord();" 984 $asm.putc " t0.i32 = dividend / divisor; // quotient" 985 $asm.putc " t0.clearHighWord();" 1019 $asm.putc " t1 = (uint32_t)(dividend % divisor); // remainder" 1020 $asm.putc " t0 = (uint32_t)(dividend / divisor); // quotient" 986 1021 $asm.putc "}" 987 1022 … … 989 1024 # Decode 2 32-bit ints (low and high) into a 64-bit double. 990 1025 when "fii2d" 991 $asm.putc "#{operands[2].cl Value(:double)} = Ints2Double(#{operands[0].clValue(:uint32)}, #{operands[1].clValue(:uint32)});"1026 $asm.putc "#{operands[2].clLValue(:double)} = ints2Double(#{operands[0].clValue(:uint32)}, #{operands[1].clValue(:uint32)}); // fii2d" 992 1027 993 1028 # 32-bit instruction: f2dii dblOp int32LoOp int32HiOp (based on ARMv7) 994 1029 # Encode a 64-bit double into 2 32-bit ints (low and high). 995 1030 when "fd2ii" 996 $asm.putc " Double2Ints(#{operands[0].clValue(:double)}, #{operands[1].clValue(:uint32)}, #{operands[2].clValue(:uint32)});"1031 $asm.putc "double2Ints(#{operands[0].clValue(:double)}, #{operands[1].clDump}, #{operands[2].clDump}); // fd2ii" 997 1032 998 1033 # 64-bit instruction: fq2d int64Op dblOp (based on X64) 999 1034 # Copy a bit-encoded double in a 64-bit int register to a double register. 1000 1035 when "fq2d" 1001 $asm.putc "#{operands[1].cl Value(:double)} = #{operands[0].clValue(:castToDouble)};"1036 $asm.putc "#{operands[1].clLValue(:double)} = #{operands[0].clValue(:bitsAsDouble)}; // fq2d" 1002 1037 1003 1038 # 64-bit instruction: fd2q dblOp int64Op (based on X64 instruction set) 1004 1039 # Copy a double as a bit-encoded double into a 64-bit int register. 1005 1040 when "fd2q" 1006 $asm.putc "#{operands[1].cl Value(:int64)} = #{operands[0].clValue(:castToInt64)};"1041 $asm.putc "#{operands[1].clLValue(:int64)} = #{operands[0].clValue(:bitsAsInt64)}; // fd2q" 1007 1042 1008 1043 when "leai" … … 1080 1115 when "cloopCallJSFunction" 1081 1116 uid = $asm.newUID 1082 $asm.putc "lr .opcode= getOpcode(llint_cloop_did_return_from_js_#{uid});"1117 $asm.putc "lr = getOpcode(llint_cloop_did_return_from_js_#{uid});" 1083 1118 $asm.putc "opcode = #{operands[0].clValue(:opcode)};" 1084 1119 $asm.putc "DISPATCH_OPCODE();" … … 1089 1124 # have a fixed prototype of 1 args: the passed ExecState. 1090 1125 when "cloopCallNative" 1091 $asm.putc "cloopStack.setCurrentStackPointer(sp.vp );"1126 $asm.putc "cloopStack.setCurrentStackPointer(sp.vp());" 1092 1127 $asm.putc "nativeFunc = #{operands[0].clValue(:nativeFunc)};" 1093 $asm.putc "functionReturnValue = JSValue::decode(nativeFunc(t0.execState ));"1128 $asm.putc "functionReturnValue = JSValue::decode(nativeFunc(t0.execState()));" 1094 1129 $asm.putc "#if USE(JSVALUE32_64)" 1095 $asm.putc " t1 .i= functionReturnValue.tag();"1096 $asm.putc " t0 .i= functionReturnValue.payload();"1130 $asm.putc " t1 = functionReturnValue.tag();" 1131 $asm.putc " t0 = functionReturnValue.payload();" 1097 1132 $asm.putc "#else // USE_JSVALUE64)" 1098 $asm.putc " t0 .encodedJSValue= JSValue::encode(functionReturnValue);"1099 $asm.putc "#endif // USE_JSVALUE64)" 1133 $asm.putc " t0 = JSValue::encode(functionReturnValue);" 1134 $asm.putc "#endif // USE_JSVALUE64)" 1100 1135 1101 1136 # We can't do generic function calls with an arbitrary set of args, but
Note: See TracChangeset
for help on using the changeset viewer.
