524578 - NJ merge: cumulative changes to finish nanojit merge

Status: VERIFIED FIXED

(Tamarin Graveyard :: Baseline JIT (CodegenLIR), defect, P2)

Description

[Graydon Hoare :graydon]

Attachment: remove the guards and/or rewrite as ARM_VFP uses

These are problematic for a couple reasons. 

First and most importantly, they're being used in a negative sense at a CPP level (#ifndef) as antonyms for ARM_VFP, which is a runtime test on TM. That much simply has to go, it's nonsense and leads us to having to undefine NJ_SOFTFLOAT in order to get the VFP-support code into our builds.

Once those go, the only remaining instance in all of nanojit is in insCall, which is already ARM_VFP guarded, and in TR those appear to be set as compile-time mutual opposites, as they're runtime mutual opposites in TM. To reduce confusion here I'm proposing just removing the guards there as well.

Comment 1

[Graydon Hoare :graydon]

Attachment: cumulative changes

This patch contains corrected guards (tested) and includes, cumulatively, all remaining differences I think TR needs to absorb. Covers the evict issue and the loop-carried exprs issue.

Sorry to be doing all at once, figured your time is scarce.

Comment 2

[Edwin Smith]

Comment on attachment 409149 [details] [diff] [review]
cumulative changes

pushed http://hg.mozilla.org/tamarin-redux/rev/6e89a44f87de

Comment 3

[Edwin Smith]

tamarin-redux and tracemonkey match exactly now.  recording URL's for posterity.

http://hg.mozilla.org/tamarin-redux/rev/6e89a44f87de
http://hg.mozilla.org/tracemonkey/rev/a658f130ad09