Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 142 additions & 4 deletions nova_vm/src/ecmascript/builtins/structured_data/atomics_object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

use ecmascript_atomics::Ordering;

use crate::{
ecmascript::{
abstract_operations::type_conversion::{
Expand All @@ -10,7 +12,7 @@ use crate::{
builders::ordinary_object_builder::OrdinaryObjectBuilder,
builtins::{
ArgumentsList, Behaviour, Builtin,
array_buffer::get_modify_set_value_in_buffer,
array_buffer::{get_modify_set_value_in_buffer, get_value_from_buffer},
indexed_collections::typed_array_objects::abstract_operations::{
TypedArrayAbstractOperations, TypedArrayWithBufferWitnessRecords,
make_typed_array_with_buffer_witness_record, validate_typed_array,
Expand Down Expand Up @@ -219,13 +221,92 @@ impl AtomicsObject {
Err(agent.todo("Atomics.isLockFree", gc.into_nogc()))
}

/// ### [25.4.9 Atomics.load ( typedArray, index )](https://tc39.es/ecma262/#sec-atomics.load)
fn load<'gc>(
agent: &mut Agent,
_this_value: Value,
_arguments: ArgumentsList,
gc: GcScope<'gc, '_>,
arguments: ArgumentsList,
mut gc: GcScope<'gc, '_>,
) -> JsResult<'gc, Value<'gc>> {
Err(agent.todo("Atomics.load", gc.into_nogc()))
let arguments = arguments.bind(gc.nogc());
let typed_array = arguments.get(0);
let index = arguments.get(1);
// 1. Let byteIndexInBuffer be ? ValidateAtomicAccessOnIntegerTypedArray(typedArray, index).
let ta_record = validate_typed_array(
agent,
typed_array,
ecmascript_atomics::Ordering::Unordered,
gc.nogc(),
)
.unbind()?
.bind(gc.nogc());
// a. Let type be TypedArrayElementType(typedArray).
// b. If IsUnclampedIntegerElementType(type) is false and
// IsBigIntElementType(type) is false, throw a TypeError exception.
if !ta_record.object.is_integer() {
return Err(agent.throw_exception_with_static_message(
ExceptionType::TypeError,
"cannot use TypedArray in Atomics",
gc.into_nogc(),
));
}
// 1. Let length be TypedArrayLength(taRecord).
let length = ta_record.typed_array_length(agent);
let (byte_index_in_buffer, typed_array) = if let Value::Integer(index) = index {
// 7. Let offset be typedArray.[[ByteOffset]].
let typed_array = ta_record.object.bind(gc.nogc());
// 2. Let accessIndex be ? ToIndex(requestIndex).
let access_index = validate_index(agent, index.into_i64(), gc.nogc()).unbind()?;
// 3. If accessIndex ≥ length, throw a RangeError exception.
if access_index >= length as u64 {
return Err(agent.throw_exception_with_static_message(
ExceptionType::RangeError,
"accessIndex out of bounds",
gc.into_nogc(),
));
}
let access_index = access_index as usize;
// 5. Let typedArray be taRecord.[[Object]].
let offset = typed_array.byte_offset(agent);
let byte_index_in_buffer =
offset + access_index * typed_array.typed_array_element_size();
(byte_index_in_buffer, typed_array)
} else {
// 2. Perform ? RevalidateAtomicAccess(typedArray, byteIndexInBuffer).
atomic_load_slow(
agent,
ta_record.unbind(),
index.unbind(),
length,
gc.reborrow(),
)
.unbind()?
.bind(gc.nogc())
};
let typed_array = typed_array.unbind();
let gc = gc.into_nogc();
let typed_array = typed_array.bind(gc);
// 3. Let buffer be typedArray.[[ViewedArrayBuffer]].
let buffer = typed_array.viewed_array_buffer(agent);
// 4. Let elementType be TypedArrayElementType(typedArray).
// 5. Return GetValueFromBuffer(buffer, byteIndexInBuffer, elementType, true, seq-cst).
Ok(for_any_typed_array!(
typed_array,
_t,
{
get_value_from_buffer::<ElementType>(
agent,
buffer,
byte_index_in_buffer,
true,
Ordering::SeqCst,
None,
gc,
)
},
ElementType
)
.into_value())
}

fn or<'gc>(
Expand Down Expand Up @@ -671,3 +752,60 @@ fn atomic_read_modify_write_slow<'gc>(
}
Ok((byte_index_in_buffer, typed_array, v))
}

#[inline(never)]
#[cold]
fn atomic_load_slow<'gc>(
agent: &mut Agent,
ta_record: TypedArrayWithBufferWitnessRecords,
index: Value,
length: usize,
mut gc: GcScope<'gc, '_>,
) -> JsResult<'gc, (usize, AnyTypedArray<'gc>)> {
let mut ta_record = ta_record.bind(gc.nogc());
let index = index.bind(gc.nogc());
let mut revalidate = false;

// 2. Let accessIndex be ? ToIndex(requestIndex).
let access_index =
if let Some(index) = try_result_into_js(try_to_index(agent, index, gc.nogc())).unbind()? {
index
} else {
let ta = ta_record.object.scope(agent, gc.nogc());
let cached_buffer_byte_length = ta_record.cached_buffer_byte_length;
let access_index = to_index(agent, index.unbind(), gc.reborrow()).unbind()?;
revalidate = true;
// SAFETY: not shared.
ta_record = unsafe {
TypedArrayWithBufferWitnessRecords {
object: ta.take(agent),
cached_buffer_byte_length,
}
};
access_index
};
// 3. Assert: accessIndex ≥ 0.
// 4. If accessIndex ≥ length, throw a RangeError exception.
if access_index >= length as u64 {
return Err(agent.throw_exception_with_static_message(
ExceptionType::RangeError,
"accessIndex out of bounds",
gc.into_nogc(),
));
}
let access_index = access_index as usize;
// 5. Let typedArray be taRecord.[[Object]].
// 6. Let elementSize be TypedArrayElementSize(typedArray).
// 7. Let offset be typedArray.[[ByteOffset]].
let offset = ta_record.object.byte_offset(agent);
// 8. Return (accessIndex × elementSize) + offset.
let byte_index_in_buffer = offset + access_index * ta_record.object.typed_array_element_size();
let typed_array = ta_record.object.unbind();
let gc = gc.into_nogc();
let typed_array = typed_array.bind(gc);
if revalidate {
// 2. Perform ? RevalidateAtomicAccess(typedArray, byteIndexInBuffer).
revalidate_atomic_access(agent, typed_array, byte_index_in_buffer, gc)?;
}
Ok((byte_index_in_buffer, typed_array))
}
18 changes: 0 additions & 18 deletions tests/expectations.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,9 @@
"built-ins/AsyncIteratorPrototype/Symbol.asyncDispose/throw-return-getter.js": "FAIL",
"built-ins/AsyncIteratorPrototype/Symbol.asyncDispose/throw-return.js": "FAIL",
"built-ins/Atomics/add/bigint/good-views.js": "FAIL",
"built-ins/Atomics/add/bigint/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/add/good-views.js": "FAIL",
"built-ins/Atomics/add/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/and/bigint/good-views.js": "FAIL",
"built-ins/Atomics/and/bigint/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/and/good-views.js": "FAIL",
"built-ins/Atomics/and/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/compareExchange/bad-range.js": "FAIL",
"built-ins/Atomics/compareExchange/bigint/bad-range.js": "FAIL",
"built-ins/Atomics/compareExchange/bigint/good-views.js": "FAIL",
Expand All @@ -259,22 +255,12 @@
"built-ins/Atomics/compareExchange/validate-arraytype-before-index-coercion.js": "FAIL",
"built-ins/Atomics/compareExchange/validate-arraytype-before-replacementValue-coercion.js": "FAIL",
"built-ins/Atomics/exchange/bigint/good-views.js": "FAIL",
"built-ins/Atomics/exchange/bigint/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/exchange/good-views.js": "FAIL",
"built-ins/Atomics/exchange/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/isLockFree/bigint/expected-return-value.js": "FAIL",
"built-ins/Atomics/isLockFree/corner-cases.js": "FAIL",
"built-ins/Atomics/isLockFree/expected-return-value.js": "FAIL",
"built-ins/Atomics/load/bad-range.js": "FAIL",
"built-ins/Atomics/load/bigint/bad-range.js": "FAIL",
"built-ins/Atomics/load/bigint/good-views.js": "FAIL",
"built-ins/Atomics/load/bigint/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/load/expected-return-value.js": "FAIL",
"built-ins/Atomics/load/good-views.js": "FAIL",
"built-ins/Atomics/load/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/load/non-shared-int-views-throws.js": "FAIL",
"built-ins/Atomics/load/non-views.js": "FAIL",
"built-ins/Atomics/load/validate-arraytype-before-index-coercion.js": "FAIL",
"built-ins/Atomics/notify/bad-range.js": "FAIL",
"built-ins/Atomics/notify/bigint/bad-range.js": "FAIL",
"built-ins/Atomics/notify/bigint/non-bigint64-typedarray-throws.js": "FAIL",
Expand Down Expand Up @@ -323,9 +309,7 @@
"built-ins/Atomics/notify/validate-arraytype-before-count-coercion.js": "FAIL",
"built-ins/Atomics/notify/validate-arraytype-before-index-coercion.js": "FAIL",
"built-ins/Atomics/or/bigint/good-views.js": "FAIL",
"built-ins/Atomics/or/bigint/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/or/good-views.js": "FAIL",
"built-ins/Atomics/or/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/pause/descriptor.js": "FAIL",
"built-ins/Atomics/pause/length.js": "FAIL",
"built-ins/Atomics/pause/name.js": "FAIL",
Expand Down Expand Up @@ -519,9 +503,7 @@
"built-ins/Atomics/waitAsync/waiterlist-block-indexedposition-wake.js": "FAIL",
"built-ins/Atomics/waitAsync/was-woken-before-timeout.js": "FAIL",
"built-ins/Atomics/xor/bigint/good-views.js": "FAIL",
"built-ins/Atomics/xor/bigint/non-shared-bufferdata.js": "FAIL",
"built-ins/Atomics/xor/good-views.js": "FAIL",
"built-ins/Atomics/xor/non-shared-bufferdata.js": "FAIL",
"built-ins/BigInt/asUintN/arithmetic.js": "CRASH",
"built-ins/Boolean/proto-from-ctor-realm.js": "FAIL",
"built-ins/DataView/proto-from-ctor-realm-sab.js": "FAIL",
Expand Down
8 changes: 4 additions & 4 deletions tests/metrics.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"results": {
"crash": 107,
"fail": 8003,
"pass": 39250,
"fail": 7986,
"pass": 39267,
"skip": 3325,
"timeout": 14,
"timeout": 13,
"unresolved": 34
},
"total": 50733
}
}
Loading