diff --git a/Userland/Libraries/LibJS/Bytecode/Builtins.h b/Userland/Libraries/LibJS/Bytecode/Builtins.h index 4832579359..053a280504 100644 --- a/Userland/Libraries/LibJS/Bytecode/Builtins.h +++ b/Userland/Libraries/LibJS/Bytecode/Builtins.h @@ -16,6 +16,7 @@ namespace JS::Bytecode { O(MathAbs, math_abs, Math, abs, 1) \ O(MathLog, math_log, Math, log, 1) \ O(MathPow, math_pow, Math, pow, 2) \ + O(MathCeil, math_ceil, Math, ceil, 1) \ O(MathFloor, math_floor, Math, floor, 1) \ O(MathSqrt, math_sqrt, Math, sqrt, 1) diff --git a/Userland/Libraries/LibJS/JIT/Compiler.cpp b/Userland/Libraries/LibJS/JIT/Compiler.cpp index 7f6136ad5b..69816679ae 100644 --- a/Userland/Libraries/LibJS/JIT/Compiler.cpp +++ b/Userland/Libraries/LibJS/JIT/Compiler.cpp @@ -2676,6 +2676,19 @@ void Compiler::compile_builtin_math_floor(Assembler::Label&, Assembler::Label& e m_assembler.jump(end); } +static Value cxx_math_ceil(VM& vm, Value, Value value) +{ + return TRY_OR_SET_EXCEPTION(MathObject::ceil_impl(vm, value)); +} + +void Compiler::compile_builtin_math_ceil(Assembler::Label&, Assembler::Label& end) +{ + native_call((void*)cxx_math_ceil); + store_accumulator(RET); + check_exception(); + m_assembler.jump(end); +} + void Compiler::compile_builtin_math_abs(Assembler::Label& slow_case, Assembler::Label& end) { branch_if_int32(ARG2, [&] { diff --git a/Userland/Libraries/LibJS/Runtime/MathObject.cpp b/Userland/Libraries/LibJS/Runtime/MathObject.cpp index 31b4dc4f15..6f551ba50b 100644 --- a/Userland/Libraries/LibJS/Runtime/MathObject.cpp +++ b/Userland/Libraries/LibJS/Runtime/MathObject.cpp @@ -33,7 +33,7 @@ void MathObject::initialize(Realm& realm) define_native_function(realm, vm.names.random, random, 0, attr); define_native_function(realm, vm.names.sqrt, sqrt, 1, attr, Bytecode::Builtin::MathSqrt); define_native_function(realm, vm.names.floor, floor, 1, attr, Bytecode::Builtin::MathFloor); - define_native_function(realm, vm.names.ceil, ceil, 1, attr); + define_native_function(realm, vm.names.ceil, ceil, 1, attr, Bytecode::Builtin::MathCeil); define_native_function(realm, vm.names.round, round, 1, attr); define_native_function(realm, vm.names.max, max, 2, attr); define_native_function(realm, vm.names.min, min, 2, attr); @@ -346,10 +346,10 @@ JS_DEFINE_NATIVE_FUNCTION(MathObject::cbrt) } // 21.3.2.10 Math.ceil ( x ), https://tc39.es/ecma262/#sec-math.ceil -JS_DEFINE_NATIVE_FUNCTION(MathObject::ceil) +ThrowCompletionOr MathObject::ceil_impl(VM& vm, Value x) { // 1. Let n be ? ToNumber(x). - auto number = TRY(vm.argument(0).to_number(vm)); + auto number = TRY(x.to_number(vm)); // 2. If n is not finite or n is either +0𝔽 or -0𝔽, return n. if (!number.is_finite_number() || number.as_double() == 0) @@ -364,6 +364,12 @@ JS_DEFINE_NATIVE_FUNCTION(MathObject::ceil) return Value(::ceil(number.as_double())); } +// 21.3.2.10 Math.ceil ( x ), https://tc39.es/ecma262/#sec-math.ceil +JS_DEFINE_NATIVE_FUNCTION(MathObject::ceil) +{ + return ceil_impl(vm, vm.argument(0)); +} + // 21.3.2.11 Math.clz32 ( x ), https://tc39.es/ecma262/#sec-math.clz32 JS_DEFINE_NATIVE_FUNCTION(MathObject::clz32) { diff --git a/Userland/Libraries/LibJS/Runtime/MathObject.h b/Userland/Libraries/LibJS/Runtime/MathObject.h index e02ec4e7c8..5b44f545a5 100644 --- a/Userland/Libraries/LibJS/Runtime/MathObject.h +++ b/Userland/Libraries/LibJS/Runtime/MathObject.h @@ -22,6 +22,7 @@ public: static ThrowCompletionOr sqrt_impl(VM&, Value); static ThrowCompletionOr pow_impl(VM&, Value base, Value exponent); static ThrowCompletionOr floor_impl(VM&, Value); + static ThrowCompletionOr ceil_impl(VM&, Value); private: explicit MathObject(Realm&);