505502 - merge tracemonkey Assembler changes into tamarin-redux

Status: VERIFIED FIXED

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

Description

[Edwin Smith]

mostly minor changes, but introduction of LogControl cleans up verbose-output code.

Comment 1

[Edwin Smith]

Attachment: LabelStateMap needs to free elements in its destructor

Comment 2

[Edwin Smith]

Attachment: labels, patches, and pending_lives dont need to be Assembler members

Moving these to more specific locations shortens their lifetime and simplifies code flow in Assembler.  (not to mention lining up more closely with tracemonkey).

Comment 3

[Edwin Smith]

Attachment: merge logc in assemble() and endAssembly()

The material part of this patch reduces diffs in assemble(), and cleans up the code in endAssembly().  We check error() first thing, and if there is an error we simply free code and get out.  All the rest of the method doesn't need to check error().

Moved Assembler::findVictim() from RegAlloc.cpp to Assembler.cpp (no change).

rename rdr to prev in assemble()

Added the fleshed out assert for valid LIR-ending instructions at the top of gen() from tracemonkey, with additions for tamarin.

added cases for LIR_ldcs, LIR_div, LIR_mod

fixed some whitespace.

Comment 4

[Edwin Smith]

Comment on attachment 390203 [details] [diff] [review]
LabelStateMap needs to free elements in its destructor

http://hg.mozilla.org/tamarin-redux/rev/ef7bc72cf5a9

Comment 5

[Edwin Smith]

Comment on attachment 390207 [details] [diff] [review]
labels, patches, and pending_lives dont need to be Assembler members

http://hg.mozilla.org/tamarin-redux/rev/e0ab9af69c52

Comment 6

[Edwin Smith]

Comment on attachment 390257 [details] [diff] [review]
merge logc in assemble() and endAssembly()

http://hg.mozilla.org/tamarin-redux/rev/fce45ff28af1

Comment 7

[Edwin Smith]

Attachment: change over to LogControl for verbose printing

Removes Assembler._verbose, adds LogControl*, do all logging that way.  most changes are just copied over from tracemonkey directly.

in Assembler.assemble(), add ReverseLister to enable viewing of LIR after each phase of the LirReader pipeline.

Comment 8

[Rick Reitmaier]

Comment on attachment 390454 [details] [diff] [review]
change over to LogControl for verbose printing

i love this string "FIXME-whats-this?"

And if we could only support these log levels via the command-line that would be great.

Might be worth opening a bug on this and propagating the log concept out to the rest of the code.

Comment 9

[Edwin Smith]

(In reply to comment #8)
> And if we could only support these log levels via the command-line that would
> be great.

bug 506298

Comment 10

[Edwin Smith]

http://hg.mozilla.org/tamarin-redux/rev/2ae478f73f51