1125837 - Merge SimulatorRuntime into Simulator (ARM, probably MIPS)

Status: RESOLVED FIXED

(Core :: JavaScript Engine: JIT, defect)

Description

[Lars T Hansen [:lth]]

From https://bugzilla.mozilla.org/show_bug.cgi?id=1118604#c10, this is fallout from removing PJS and moving per-thread fields back into JSRuntime:

We can now simplify the simulator(s) by merging Simulator and SimulatorRuntime. I think we can just move everything in SimulatorRuntime to Simulator. Maybe we can then rename CreateSimulatorRuntime to CreateSimulator, that way we can assume we always have a non-null simulator in Simulator::Current().

We can also remove AutoLockSimulatorRuntime, might be nice for performance.

Comment 1

[Lars T Hansen [:lth]]

Attachment: Smush SimulatorRuntime into Simulator on ARM and MIPS

Pretty straightforward.  I moved the stack limit field out of JSRuntime into the simulator too, so the simulators are pretty self-contained now.

(I'm not real happy about leaving Simulator::Simulator() and Simulator::~Simulator() public but didn't yet find a simple way to hide them while making them accessible to the memory management, and it doesn't seem like a big deal.)

Comment 2

[Jan de Mooij [:jandem]]

Comment on attachment 8555800 [details] [diff] [review]
Smush SimulatorRuntime into Simulator on ARM and MIPS

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

Very nice.

::: js/src/jit/arm/Simulator-arm.cpp
@@ +1120,5 @@
>      ABIFunctionType type() const { return type_; }
>  
>      static Redirection *Get(void *nativeFunction, ABIFunctionType type) {
>          PerThreadData *pt = TlsPerThreadData.get();
> +        Simulator *sim = pt->simulator();

Nit: I think we can remove |pt| and make this:

Simulator *sim = Simulator::Current();

Comment 3

[Lars T Hansen [:lth]]

With nits:  https://hg.mozilla.org/integration/mozilla-inbound/rev/b0e9b9113cb0

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/b0e9b9113cb0