IonMonkey: (ARM) X%Y does not properly return -0.0

RESOLVED FIXED

Status

()

Core
JavaScript Engine
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: mjrosenb, Unassigned)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Reporter)

Description

5 years ago
Created attachment 632207 [details] [diff] [review]
/home/mrosenberg/patches/fixModulus-r0.patch

A check is needed to see when a result of 0 is supposed to be -0.0
Attachment #632207 - Flags: review?(Jacob.Bramley)
Comment on attachment 632207 [details] [diff] [review]
/home/mrosenberg/patches/fixModulus-r0.patch

Review of attachment 632207 [details] [diff] [review]:
-----------------------------------------------------------------

It looks good. Some comments and unconditional 'if' statements need cleaning up, and I think you need to add an assertion, but the logic looks correct.

::: js/src/ion/arm/CodeGenerator-arm.cpp
@@ +540,5 @@
>      // Extract the registers from this instruction
>      Register lhs = ToRegister(ins->lhs());
>      Register rhs = ToRegister(ins->rhs());
> +    Register callTemp = ToRegister(ins->getTemp(2));
> +    if (true) { // mir->canBeNegativeZero()

What's that comment for? Should it be a TODO? If it's just leftover development code, remove the 'if' statement since it always executes.

@@ +571,5 @@
>      masm.passABIArg(lhs);
>      masm.passABIArg(rhs);
>      masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, __aeabi_idivmod));
> +    // If X%Y == 0 and X < 0, then we *actually* wanted to return -0.0
> +    if (true) { // mir->canBeNegativeZero()

Ditto.

::: js/src/ion/arm/LIR-arm.h
@@ +124,5 @@
>  // so we can modify them (and the function will).
>  // The other thre registers that can be trashed are marked as such. For the time
>  // being, the link register is not marked as trashed because we never allocate
>  // to the link register.
> +class LDivI : public LBinaryMath<3>

You didn't include any changes (other than whitespace) for ::visitDivI, only for ::visitModI. Did you intend to?

@@ +136,5 @@
>          setOperand(0, lhs);
>          setOperand(1, rhs);
>          setTemp(0, temp1);
>          setTemp(1, temp2);
> +        setTemp(2, callTemp);

Why not temp3? What's special about it? Is it callee-saved? (It needs to be.)

::: js/src/ion/arm/Lowering-arm.cpp
@@ +306,5 @@
>              return (assignSnapshot(lir) && define(lir, mod));
>          }
>      }
>      LModI *lir = new LModI(useFixed(mod->lhs(), r0), use(mod->rhs(), r1),
> +                           tempFixed(r2), tempFixed(r3), temp(LDefinition::GENERAL));

Does LDefinition::GENERAL make it callee-saved? I think you need to ASSERT in ::visitModI that the register is callee-saved, since things will break subtlely (and horribly) if a caller gets this wrong.
Attachment #632207 - Flags: review?(Jacob.Bramley) → review+
(Reporter)

Comment 2

5 years ago
(In reply to Jacob Bramley [:jbramley] from comment #1)
> Comment on attachment 632207 [details] [diff] [review]
> /home/mrosenberg/patches/fixModulus-r0.patch
> 
> Review of attachment 632207 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> It looks good. Some comments and unconditional 'if' statements need cleaning
> up, and I think you need to add an assertion, but the logic looks correct.
> 
> ::: js/src/ion/arm/CodeGenerator-arm.cpp
> @@ +540,5 @@
> >      // Extract the registers from this instruction
> >      Register lhs = ToRegister(ins->lhs());
> >      Register rhs = ToRegister(ins->rhs());
> > +    Register callTemp = ToRegister(ins->getTemp(2));
> > +    if (true) { // mir->canBeNegativeZero()
> 
> What's that comment for? Should it be a TODO? If it's just leftover
> development code, remove the 'if' statement since it always executes.
> 
yeah, I'll file a bug on that.  This is a method that exists for divi, but not modi, and it should probably exist for modi as well.
> @@ +571,5 @@
> >      masm.passABIArg(lhs);
> >      masm.passABIArg(rhs);
> >      masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, __aeabi_idivmod));
> > +    // If X%Y == 0 and X < 0, then we *actually* wanted to return -0.0
> > +    if (true) { // mir->canBeNegativeZero()
> 
> Ditto.
> 
> ::: js/src/ion/arm/LIR-arm.h
> @@ +124,5 @@
> >  // so we can modify them (and the function will).
> >  // The other thre registers that can be trashed are marked as such. For the time
> >  // being, the link register is not marked as trashed because we never allocate
> >  // to the link register.
> > +class LDivI : public LBinaryMath<3>
> 
> You didn't include any changes (other than whitespace) for ::visitDivI, only
> for ::visitModI. Did you intend to?
After inspecting it closer, it does not have the bug that modi has, and shouldn't have been modified.
> 
> @@ +136,5 @@
> >          setOperand(0, lhs);
> >          setOperand(1, rhs);
> >          setTemp(0, temp1);
> >          setTemp(1, temp2);
> > +        setTemp(2, callTemp);
> 
> Why not temp3? What's special about it? Is it callee-saved? (It needs to be.)
> 
I didn't give the other two meaningful names because they are simply there to make sure that none of the caller saved registers have any useful data in them.  Since I needed to reserve another register to hold a useful value, I decided to give it a someowhat meaningful name (I'm pretty bad at choosing good names)
> ::: js/src/ion/arm/Lowering-arm.cpp
> @@ +306,5 @@
> >              return (assignSnapshot(lir) && define(lir, mod));
> >          }
> >      }
> >      LModI *lir = new LModI(useFixed(mod->lhs(), r0), use(mod->rhs(), r1),
> > +                           tempFixed(r2), tempFixed(r3), temp(LDefinition::GENERAL));
> 
> Does LDefinition::GENERAL make it callee-saved? I think you need to ASSERT
> in ::visitModI that the register is callee-saved, since things will break
> subtlely (and horribly) if a caller gets this wrong.
I'll add the assertion, but there shouldn't be any way that we can assign a caller saved register to that register.
(Reporter)

Comment 3

5 years ago
landed: http://hg.mozilla.org/projects/ionmonkey/rev/488cdd2e2267
Status: NEW → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.