diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/v8/src/runtime/runtime-futex.cc | |
parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/v8/src/runtime/runtime-futex.cc')
-rw-r--r-- | chromium/v8/src/runtime/runtime-futex.cc | 44 |
1 files changed, 10 insertions, 34 deletions
diff --git a/chromium/v8/src/runtime/runtime-futex.cc b/chromium/v8/src/runtime/runtime-futex.cc index a9664125195..a93bb23645b 100644 --- a/chromium/v8/src/runtime/runtime-futex.cc +++ b/chromium/v8/src/runtime/runtime-futex.cc @@ -12,12 +12,12 @@ // Implement Futex API for SharedArrayBuffers as defined in the // SharedArrayBuffer draft spec, found here: -// https://github.com/lars-t-hansen/ecmascript_sharedmem +// https://github.com/tc39/ecmascript_sharedmem namespace v8 { namespace internal { -RUNTIME_FUNCTION(Runtime_AtomicsFutexWait) { +RUNTIME_FUNCTION(Runtime_AtomicsWait) { HandleScope scope(isolate); DCHECK(args.length() == 4); CONVERT_ARG_HANDLE_CHECKED(JSTypedArray, sta, 0); @@ -25,67 +25,43 @@ RUNTIME_FUNCTION(Runtime_AtomicsFutexWait) { CONVERT_INT32_ARG_CHECKED(value, 2); CONVERT_DOUBLE_ARG_CHECKED(timeout, 3); CHECK(sta->GetBuffer()->is_shared()); - CHECK_LT(index, NumberToSize(isolate, sta->length())); + CHECK_LT(index, NumberToSize(sta->length())); CHECK_EQ(sta->type(), kExternalInt32Array); CHECK(timeout == V8_INFINITY || !std::isnan(timeout)); Handle<JSArrayBuffer> array_buffer = sta->GetBuffer(); - size_t addr = (index << 2) + NumberToSize(isolate, sta->byte_offset()); + size_t addr = (index << 2) + NumberToSize(sta->byte_offset()); return FutexEmulation::Wait(isolate, array_buffer, addr, value, timeout); } - -RUNTIME_FUNCTION(Runtime_AtomicsFutexWake) { +RUNTIME_FUNCTION(Runtime_AtomicsWake) { HandleScope scope(isolate); DCHECK(args.length() == 3); CONVERT_ARG_HANDLE_CHECKED(JSTypedArray, sta, 0); CONVERT_SIZE_ARG_CHECKED(index, 1); CONVERT_INT32_ARG_CHECKED(count, 2); CHECK(sta->GetBuffer()->is_shared()); - CHECK_LT(index, NumberToSize(isolate, sta->length())); + CHECK_LT(index, NumberToSize(sta->length())); CHECK_EQ(sta->type(), kExternalInt32Array); Handle<JSArrayBuffer> array_buffer = sta->GetBuffer(); - size_t addr = (index << 2) + NumberToSize(isolate, sta->byte_offset()); + size_t addr = (index << 2) + NumberToSize(sta->byte_offset()); return FutexEmulation::Wake(isolate, array_buffer, addr, count); } - -RUNTIME_FUNCTION(Runtime_AtomicsFutexWakeOrRequeue) { - HandleScope scope(isolate); - DCHECK(args.length() == 5); - CONVERT_ARG_HANDLE_CHECKED(JSTypedArray, sta, 0); - CONVERT_SIZE_ARG_CHECKED(index1, 1); - CONVERT_INT32_ARG_CHECKED(count, 2); - CONVERT_INT32_ARG_CHECKED(value, 3); - CONVERT_SIZE_ARG_CHECKED(index2, 4); - CHECK(sta->GetBuffer()->is_shared()); - CHECK_LT(index1, NumberToSize(isolate, sta->length())); - CHECK_LT(index2, NumberToSize(isolate, sta->length())); - CHECK_EQ(sta->type(), kExternalInt32Array); - - Handle<JSArrayBuffer> array_buffer = sta->GetBuffer(); - size_t addr1 = (index1 << 2) + NumberToSize(isolate, sta->byte_offset()); - size_t addr2 = (index2 << 2) + NumberToSize(isolate, sta->byte_offset()); - - return FutexEmulation::WakeOrRequeue(isolate, array_buffer, addr1, count, - value, addr2); -} - - -RUNTIME_FUNCTION(Runtime_AtomicsFutexNumWaitersForTesting) { +RUNTIME_FUNCTION(Runtime_AtomicsNumWaitersForTesting) { HandleScope scope(isolate); DCHECK(args.length() == 2); CONVERT_ARG_HANDLE_CHECKED(JSTypedArray, sta, 0); CONVERT_SIZE_ARG_CHECKED(index, 1); CHECK(sta->GetBuffer()->is_shared()); - CHECK_LT(index, NumberToSize(isolate, sta->length())); + CHECK_LT(index, NumberToSize(sta->length())); CHECK_EQ(sta->type(), kExternalInt32Array); Handle<JSArrayBuffer> array_buffer = sta->GetBuffer(); - size_t addr = (index << 2) + NumberToSize(isolate, sta->byte_offset()); + size_t addr = (index << 2) + NumberToSize(sta->byte_offset()); return FutexEmulation::NumWaitersForTesting(isolate, array_buffer, addr); } |