wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1010334 - Add recover functionality for Rsh; r=bbouvier

Browse Source
This commit is contained in:
Inanc Seylan 2014-05-27 11:39:50 +02:00
parent cfca93a164
commit 0e6bd2134e
4 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jit-test/tests/ion/dce-with-rinstructions.js
View File

@ -88,6 +88,25 @@ function rlsh_object(i) {
return i;
}
var uceFault_rsh_number = eval(uneval(uceFault).replace('uceFault', 'uceFault_rsh_number'));
function rrsh_number(i) {
var x = i >> 1;
if (uceFault_rsh_number(i) || uceFault_rsh_number(i))
assertEq(x, 49 /* = 99 >> 1 */);
return i;
}
var uceFault_rsh_object = eval(uneval(uceFault).replace('uceFault', 'uceFault_rsh_object'));
function rrsh_object(i) {
var t = i;
var o = { valueOf: function () { return t; } };
var x = o >> 1; /* computed with t == i, not 1000 */
t = 1000;
if (uceFault_rsh_object(i) || uceFault_rsh_object(i))
assertEq(x, 49 /* = 99 >> 1 */);
return i;
}
var uceFault_ursh_number = eval(uneval(uceFault).replace('uceFault', 'uceFault_ursh_number'));
function rursh_number(i) {
var x = i >>> 1;
@ -153,6 +172,8 @@ for (i = 0; i < 100; i++) {
rbitxor_object(i);
rlsh_number(i);
rlsh_object(i);
rrsh_number(i);
rrsh_object(i);
rursh_number(i);
rursh_object(i);
radd_number(i);

5
js/src/jit/MIR.h
View File

@ -3685,6 +3685,11 @@ class MRsh : public MShiftInstruction
return getOperand(0);
}
void computeRange(TempAllocator &alloc);
bool writeRecoverData(CompactBufferWriter &writer) const;
bool canRecoverOnBailout() const {
return specialization_ < MIRType_Object;
}
};
class MUrsh : public MShiftInstruction

27
js/src/jit/Recover.cpp
View File

@ -243,6 +243,33 @@ RLsh::recover(JSContext *cx, SnapshotIterator &iter) const
return true;
}
bool
MRsh::writeRecoverData(CompactBufferWriter &writer) const
{
MOZ_ASSERT(canRecoverOnBailout());
writer.writeUnsigned(uint32_t(RInstruction::Recover_Rsh));
return true;
}
RRsh::RRsh(CompactBufferReader &reader)
{ }
bool
RRsh::recover(JSContext *cx, SnapshotIterator &iter) const
{
RootedValue lhs(cx, iter.read());
RootedValue rhs(cx, iter.read());
MOZ_ASSERT(!lhs.isObject() && !rhs.isObject());
int32_t result;
if (!js::BitRsh(cx, lhs, rhs, &result))
return false;
RootedValue rootedResult(cx, js::Int32Value(result));
iter.storeInstructionResult(rootedResult);
return true;
}
bool
MUrsh::writeRecoverData(CompactBufferWriter &writer) const
{

13
js/src/jit/Recover.h
View File

@ -22,6 +22,7 @@ namespace jit {
_(BitOr) \
_(BitXor) \
_(Lsh) \
_(Rsh) \
_(Ursh) \
_(Add) \
_(NewObject) \
@ -141,6 +142,18 @@ class RLsh MOZ_FINAL : public RInstruction
bool recover(JSContext *cx, SnapshotIterator &iter) const;
};
class RRsh MOZ_FINAL : public RInstruction
{
public:
RINSTRUCTION_HEADER_(Rsh)
virtual uint32_t numOperands() const {
return 2;
}
bool recover(JSContext *cx, SnapshotIterator &iter) const;
};
class RUrsh MOZ_FINAL : public RInstruction
{
public: