summaryrefslogtreecommitdiffstats
path: root/js/src/jit/shared
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--js/src/jit/shared/AtomicOperations-shared-jit.h16
-rw-r--r--js/src/jit/shared/LIR-shared.h98
2 files changed, 65 insertions, 49 deletions
diff --git a/js/src/jit/shared/AtomicOperations-shared-jit.h b/js/src/jit/shared/AtomicOperations-shared-jit.h
index ca66a6f9b9..d5303b2c60 100644
--- a/js/src/jit/shared/AtomicOperations-shared-jit.h
+++ b/js/src/jit/shared/AtomicOperations-shared-jit.h
@@ -23,6 +23,7 @@
#include <stdint.h>
#include "jit/AtomicOperationsGenerated.h"
+#include "vm/Float16.h"
#include "vm/Uint8Clamped.h"
namespace js {
@@ -405,6 +406,14 @@ inline uint8_clamped js::jit::AtomicOperations::loadSafeWhenRacy(
return uint8_clamped(loadSafeWhenRacy((uint8_t*)addr));
}
+// Clang requires a specialization for float16.
+template <>
+inline float16 js::jit::AtomicOperations::loadSafeWhenRacy(float16* addr) {
+ float16 f16;
+ f16.val = loadSafeWhenRacy((uint16_t*)addr);
+ return f16;
+}
+
} // namespace jit
} // namespace js
@@ -464,6 +473,13 @@ inline void js::jit::AtomicOperations::storeSafeWhenRacy(uint8_clamped* addr,
storeSafeWhenRacy((uint8_t*)addr, (uint8_t)val);
}
+// Clang requires a specialization for float16.
+template <>
+inline void js::jit::AtomicOperations::storeSafeWhenRacy(float16* addr,
+ float16 val) {
+ storeSafeWhenRacy((uint16_t*)addr, val.val);
+}
+
} // namespace jit
} // namespace js
diff --git a/js/src/jit/shared/LIR-shared.h b/js/src/jit/shared/LIR-shared.h
index 74c11bd91b..e7e4b0730a 100644
--- a/js/src/jit/shared/LIR-shared.h
+++ b/js/src/jit/shared/LIR-shared.h
@@ -817,19 +817,19 @@ class LConstructArrayGeneric
};
class LApplyArgsNative
- : public LCallInstructionHelper<BOX_PIECES, BOX_PIECES + 2, 2> {
+ : public LCallInstructionHelper<BOX_PIECES, BOX_PIECES + 1, 3> {
public:
LIR_HEADER(ApplyArgsNative)
- LApplyArgsNative(const LAllocation& func, const LAllocation& argc,
- const LBoxAllocation& thisv, const LDefinition& tmpObjReg,
- const LDefinition& tmpCopy)
+ LApplyArgsNative(const LAllocation& argc, const LBoxAllocation& thisv,
+ const LDefinition& tmpObjReg, const LDefinition& tmpCopy,
+ const LDefinition& tmpExtra)
: LCallInstructionHelper(classOpcode) {
- setOperand(0, func);
- setOperand(1, argc);
+ setOperand(0, argc);
setBoxOperand(ThisIndex, thisv);
setTemp(0, tmpObjReg);
setTemp(1, tmpCopy);
+ setTemp(2, tmpExtra);
}
static constexpr bool isConstructing() { return false; }
@@ -838,94 +838,94 @@ class LApplyArgsNative
uint32_t numExtraFormals() const { return mir()->numExtraFormals(); }
- const LAllocation* getFunction() { return getOperand(0); }
- const LAllocation* getArgc() { return getOperand(1); }
+ const LAllocation* getArgc() { return getOperand(0); }
- static const size_t ThisIndex = 2;
+ static const size_t ThisIndex = 1;
const LDefinition* getTempObject() { return getTemp(0); }
const LDefinition* getTempForArgCopy() { return getTemp(1); }
+ const LDefinition* getTempExtra() { return getTemp(2); }
};
class LApplyArgsObjNative
- : public LCallInstructionHelper<BOX_PIECES, BOX_PIECES + 2, 2> {
+ : public LCallInstructionHelper<BOX_PIECES, BOX_PIECES + 1, 3> {
public:
LIR_HEADER(ApplyArgsObjNative)
- LApplyArgsObjNative(const LAllocation& func, const LAllocation& argsObj,
- const LBoxAllocation& thisv, const LDefinition& tmpObjReg,
- const LDefinition& tmpCopy)
+ LApplyArgsObjNative(const LAllocation& argsObj, const LBoxAllocation& thisv,
+ const LDefinition& tmpObjReg, const LDefinition& tmpCopy,
+ const LDefinition& tmpExtra)
: LCallInstructionHelper(classOpcode) {
- setOperand(0, func);
- setOperand(1, argsObj);
+ setOperand(0, argsObj);
setBoxOperand(ThisIndex, thisv);
setTemp(0, tmpObjReg);
setTemp(1, tmpCopy);
+ setTemp(2, tmpExtra);
}
static constexpr bool isConstructing() { return false; }
MApplyArgsObj* mir() const { return mir_->toApplyArgsObj(); }
- const LAllocation* getFunction() { return getOperand(0); }
- const LAllocation* getArgsObj() { return getOperand(1); }
+ const LAllocation* getArgsObj() { return getOperand(0); }
- static const size_t ThisIndex = 2;
+ static const size_t ThisIndex = 1;
const LDefinition* getTempObject() { return getTemp(0); }
const LDefinition* getTempForArgCopy() { return getTemp(1); }
+ const LDefinition* getTempExtra() { return getTemp(2); }
// argc is mapped to the same register as argsObj: argc becomes live as
// argsObj is dying, all registers are calltemps.
- const LAllocation* getArgc() { return getOperand(1); }
+ const LAllocation* getArgc() { return getOperand(0); }
};
class LApplyArrayNative
- : public LCallInstructionHelper<BOX_PIECES, BOX_PIECES + 2, 2> {
+ : public LCallInstructionHelper<BOX_PIECES, BOX_PIECES + 1, 3> {
public:
LIR_HEADER(ApplyArrayNative)
- LApplyArrayNative(const LAllocation& func, const LAllocation& elements,
- const LBoxAllocation& thisv, const LDefinition& tmpObjReg,
- const LDefinition& tmpCopy)
+ LApplyArrayNative(const LAllocation& elements, const LBoxAllocation& thisv,
+ const LDefinition& tmpObjReg, const LDefinition& tmpCopy,
+ const LDefinition& tmpExtra)
: LCallInstructionHelper(classOpcode) {
- setOperand(0, func);
- setOperand(1, elements);
+ setOperand(0, elements);
setBoxOperand(ThisIndex, thisv);
setTemp(0, tmpObjReg);
setTemp(1, tmpCopy);
+ setTemp(2, tmpExtra);
}
static constexpr bool isConstructing() { return false; }
MApplyArray* mir() const { return mir_->toApplyArray(); }
- const LAllocation* getFunction() { return getOperand(0); }
- const LAllocation* getElements() { return getOperand(1); }
+ const LAllocation* getElements() { return getOperand(0); }
- static const size_t ThisIndex = 2;
+ static const size_t ThisIndex = 1;
const LDefinition* getTempObject() { return getTemp(0); }
const LDefinition* getTempForArgCopy() { return getTemp(1); }
+ const LDefinition* getTempExtra() { return getTemp(2); }
// argc is mapped to the same register as elements: argc becomes live as
// elements is dying, all registers are calltemps.
- const LAllocation* getArgc() { return getOperand(1); }
+ const LAllocation* getArgc() { return getOperand(0); }
};
-class LConstructArgsNative : public LCallInstructionHelper<BOX_PIECES, 3, 2> {
+class LConstructArgsNative : public LCallInstructionHelper<BOX_PIECES, 2, 3> {
public:
LIR_HEADER(ConstructArgsNative)
- LConstructArgsNative(const LAllocation& func, const LAllocation& argc,
- const LAllocation& newTarget,
- const LDefinition& tmpObjReg, const LDefinition& tmpCopy)
+ LConstructArgsNative(const LAllocation& argc, const LAllocation& newTarget,
+ const LDefinition& tmpObjReg, const LDefinition& tmpCopy,
+ const LDefinition& tmpExtra)
: LCallInstructionHelper(classOpcode) {
- setOperand(0, func);
- setOperand(1, argc);
- setOperand(2, newTarget);
+ setOperand(0, argc);
+ setOperand(1, newTarget);
setTemp(0, tmpObjReg);
setTemp(1, tmpCopy);
+ setTemp(2, tmpExtra);
}
static constexpr bool isConstructing() { return true; }
@@ -934,44 +934,44 @@ class LConstructArgsNative : public LCallInstructionHelper<BOX_PIECES, 3, 2> {
uint32_t numExtraFormals() const { return mir()->numExtraFormals(); }
- const LAllocation* getFunction() { return getOperand(0); }
- const LAllocation* getArgc() { return getOperand(1); }
- const LAllocation* getNewTarget() { return getOperand(2); }
+ const LAllocation* getArgc() { return getOperand(0); }
+ const LAllocation* getNewTarget() { return getOperand(1); }
const LDefinition* getTempObject() { return getTemp(0); }
const LDefinition* getTempForArgCopy() { return getTemp(1); }
+ const LDefinition* getTempExtra() { return getTemp(2); }
};
-class LConstructArrayNative : public LCallInstructionHelper<BOX_PIECES, 3, 2> {
+class LConstructArrayNative : public LCallInstructionHelper<BOX_PIECES, 2, 3> {
public:
LIR_HEADER(ConstructArrayNative)
- LConstructArrayNative(const LAllocation& func, const LAllocation& elements,
+ LConstructArrayNative(const LAllocation& elements,
const LAllocation& newTarget,
const LDefinition& tmpObjReg,
- const LDefinition& tmpCopy)
+ const LDefinition& tmpCopy, const LDefinition& tmpExtra)
: LCallInstructionHelper(classOpcode) {
- setOperand(0, func);
- setOperand(1, elements);
- setOperand(2, newTarget);
+ setOperand(0, elements);
+ setOperand(1, newTarget);
setTemp(0, tmpObjReg);
setTemp(1, tmpCopy);
+ setTemp(2, tmpExtra);
}
static constexpr bool isConstructing() { return true; }
MConstructArray* mir() const { return mir_->toConstructArray(); }
- const LAllocation* getFunction() { return getOperand(0); }
- const LAllocation* getElements() { return getOperand(1); }
- const LAllocation* getNewTarget() { return getOperand(2); }
+ const LAllocation* getElements() { return getOperand(0); }
+ const LAllocation* getNewTarget() { return getOperand(1); }
const LDefinition* getTempObject() { return getTemp(0); }
const LDefinition* getTempForArgCopy() { return getTemp(1); }
+ const LDefinition* getTempExtra() { return getTemp(2); }
// argc is mapped to the same register as elements: argc becomes live as
// elements is dying, all registers are calltemps.
- const LAllocation* getArgc() { return getOperand(1); }
+ const LAllocation* getArgc() { return getOperand(0); }
};
// Takes in either an integer or boolean input and tests it for truthiness.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 11:03:32 +0000