805917 - (BaselineX64) BaselineCompiler: x86-64 support

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Kannan Vijayan [:djvj]]

Fix baseline compiler to build on X86-64.

Comment 1

[Kannan Vijayan [:djvj]]

Attachment: Add x64 support.

Basic x64 support.  I'm guessing that you'll be checking in the patch to handle new ops before this patch gets checked in, so I'll probably go back and update the patch to support the new ops before committing, but that should be pretty straightforward.

Comment 2

[Jan de Mooij [:jandem]]

Comment on attachment 680849 [details] [diff] [review]
Add x64 support.

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

I wonder if we can share more stub code between x86/x64, but we can do that in a later bug.

::: js/src/ion/x64/BaselineHelpers-x64.h
@@ +60,5 @@
> +    masm.movq(Operand(BaselineStubReg, (int32_t) ICStub::offsetOfNext()), BaselineStubReg);
> +
> +    // Load stubcode pointer from BaselineStubEntry into BaselineTailCallReg
> +    // BaselineTailCallReg will always be unused in the contexts where IC stub guards fail
> +    masm.movq(Operand(BaselineStubReg, (int32_t) ICStub::offsetOfStubCode()),

Nit: these casts are not necessary.

::: js/src/ion/x64/MacroAssembler-x64.h
@@ +186,5 @@
>          boxValue(type, reg, ScratchReg);
>          push(ScratchReg);
>      }
> +    void pushValue(const Address &addr) {
> +        push(Operand(addr.base, 0));

push(Operand(addr));

Comment 3

[Jan de Mooij [:jandem]]

(Just a heads-up: bug 810946 modified EmitTailCall)

Comment 4

[Tom S [:evilpie]]

Comment on attachment 680849 [details] [diff] [review]
Add x64 support.

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

::: js/src/ion/x64/BaselineHelpers-x64.h
@@ +44,5 @@
> +    masm.addl(Imm32(sizeof(void *)), ScratchReg);
> +    masm.makeFrameDescriptor(ScratchReg, IonFrame_BaselineJS);
> +    masm.push(ScratchReg);
> +    masm.push(BaselineTailCallReg);
> +    masm.jmp(target);

I think this should work right after the recent changes. As long as we can actually use rdx.

        // We an assume during this that R0 and R1 have been pushed.
        masm.movl(BaselineFrameReg, ScratchReg);
        masm.addl(Imm32(BaselineFrame::FramePointerOffset), ScratchReg);
        masm.subl(BaselineStackReg, ScratchReg);
     
        // Store frame size without VMFunction arguments for GC marking.
        masm.movl(ScratchReg, rdx);
        masm.subl(Imm32(argSize), rdx);
        masm.store32(rdx, Operand(BaselineFrameReg, BaselineFrame::reverseOffsetOfFrameSize()));
     
        masm.makeFrameDescriptor(ScratchReg, IonFrame_BaselineJS);
        masm.push(ScratchReg);
        masm.push(BaselineTailCallReg);
        masm.jmp(target);

Comment 5

[Kannan Vijayan [:djvj]]

Thanks Tom, I've rolled in those changes, with some minor adjustments.

https://hg.mozilla.org/projects/ionmonkey/rev/4d42c3ef72f5