fix Issue 7387 - call instruction does not understand $

[WalterBright]

The matching order in the table was wrong, and the old 16 bit code generation was causing trouble.

[dlang-bot]

Thanks for your pull request, @WalterBright!

Bugzilla references

Auto-close	Bugzilla	Severity	Description
✓	7387	normal	call instruction does not understand $

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub run digger -- build "master + dmd#11624"

[Geod24]

Just remove ?

[WalterBright]

I wanted to leave a reminder if I ever ported it back to DMC. That piece is necessary for 16 bit assembler.

[Geod24]

ubuntu/g++ doesn't like this: "block displacement of -157 exceeds the maximum offset of -128 to 127."

[WalterBright]

Yeah, and of course there is no clue what file it was.

[WalterBright]

I was hoping the problem would show up on one of the other tests.

[WalterBright]

I'm ashamed to admit the "block displacement" message is coming from my code :-(

[MoonlightSentinel]

Yeah, and of course there is no clue what file it was.

The failure happens when compiling std.internal.math.biguintx86 (which is explicitly listed in the log files).

A quick use of dustmite (+ manually copy+pasting a mixin) resulted in this reduced test case:

void multibyteMultiplyAccumulate() {

    static immutable int zero, storagenop ;

    asm {
        outer_loop:
        mov EBP, 0;
        mov ECX, 0;
        neg EBX;
        mov EAX, ESI;
        test EBX, 1;
        jnz L_enter_odd;
    }

    // mixin("asm pure nothrow @trusted { " ~ asmMulAdd_innerloop("add", "ESP") ~ "}");
    asm pure nothrow @trusted {
        // Entry point for even length
        add EBX, 1;
        mov EBP, ECX; // carry

        mul int ptr [ESP]; // M
        mov ECX, 0;

        add EBP, EAX;
        mov EAX, [ESI+4*EBX];
        adc ECX, EDX;

        mul int ptr [ESP]; // M
        add [-4+EDI+4*EBX], EBP;
        mov EBP, zero;

        adc ECX, EAX;
        mov EAX, [4+ESI+4*EBX];

        adc EBP, EDX;
        add EBX, 2;
        jnl L_done;
        L1:
        mul int ptr [ESP];
        add [-8+EDI+4*EBX], ECX;
        adc EBP, EAX;
        mov ECX, zero;
        mov EAX, [ESI+4*EBX];
        adc ECX, EDX;
        mov storagenop, EDX;
        mul int ptr [ESP];
        add [-4+EDI+4*EBX], EBP;
        mov EBP, zero;

        adc ECX, EAX;
        mov EAX, [4+ESI+4*EBX];

        adc EBP, EDX;
        add EBX, 2;
        jl L1;
        L_done: add [-8+EDI+4*EBX], ECX;
        adc EBP, 0;
    }

    asm {
        jmp outer_loop;
    }
    L_enter_odd:
}

[WalterBright]

Thanks, @MoonlightSentinel . It looks like the jmp outer_loop is the problem.

[ghost]

amend + force push please, in order to get it merged.

[WalterBright]

autotester win32 failed with:

../dmd/generated/windows/release/32/dmd.exe -debug -debug=INVARIANT -debug=PTRCHECK -debug=PTRCHECK2 -m32 -g -conf= -Isrc -defaultlib=lib\druntime.lib -unittest -version=CoreUnittest -main -ofinvariant.exe src/gc/impl/conservative/gc.d src/rt/lifetime.d src/object.d
Error: linker exited with status 1

Gah, what does that have to do with this patch?

[ghost]

what does that have to do with this patch?

Nothing but in this case the only way to get the PR merged is to restart the auto-test check.

[wilzbach]

what does that have to do with this patch?

Nothing but in this case the only way to get the PR merged is to restart the auto-test check.

No, once auto-merge is applied the PR has a higher priority at the auto-tester and auto-tester will continuously build the PR until its merged. It's different to normal CIs.