1128820 - Fix checkStackAlignment break code conflict with call c++ tag on Simulator

Status: RESOLVED FIXED

(Core :: JavaScript Engine: JIT, defect)

Description

[hev [:hev]]

Attachment: 0001-IonMonkey-MIPS-Fix-checkStackAlignment-break-code-co.patch

User Agent: Mozilla/5.0 (X11; Linux x86_64; rv:35.0) Gecko/20100101 Firefox/35.0
Build ID: 20150126171358

Steps to reproduce:

On simulator, The break instruction with max code (1023) is to emit a external call to c++ static code. So, I think should change break code to 1 for checkStackAlignment.

Comment 1

[Branislav Rankov [:rankov]]

Comment on attachment 8558308 [details] [diff] [review]
0001-IonMonkey-MIPS-Fix-checkStackAlignment-break-code-co.patch

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

::: js/src/jit/mips/MacroAssembler-mips.cpp
@@ +3355,4 @@
>      Label aligned;
>      as_andi(ScratchRegister, sp, ABIStackAlignment - 1);
>      ma_b(ScratchRegister, zero, &aligned, Equal, ShortJump);
> +    as_break(1);

nit: Just add a constant for this next to MAX_BREAK_CODE. For example :
static const uint32_t BREAK_STACK_UNALIGNED = 1;

Comment 2

[hev [:hev]]

Attachment: 0001-IonMonkey-MIPS-Fix-checkStackAlignment-break-code-co.patch

Comment 3

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/7b8b9ef690b1

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/7b8b9ef690b1