Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dmd-cxx glue layer minimally to get dmd building with the 2.071 backend #7595

Merged
merged 6 commits into from Feb 18, 2018
Merged

Update dmd-cxx glue layer minimally to get dmd building with the 2.071 backend #7595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc72693
Minimal fixes to get Iain's 2.076.1 C++ frontend building with the 2.…
joakim-noah Jan 4, 2018
e1f38de
Remove genhelpers, toModule* and m* code
ibuclaw Feb 18, 2018
c707b84
backend: add CodeBuilder struct
ibuclaw Feb 18, 2018
e858a7d
fix Issue 16488 - [spec][optimization] broadcast scalar to simd vector
ibuclaw Feb 18, 2018
7891a91
compile dmd with PIC on x86_64
ibuclaw Feb 18, 2018
e97f0d1
fix Issue 10225 - core.simd wrong codegen for XMM.STOUPS with __simd_sto
ibuclaw Feb 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/backend/cgcs.c
View file
Open in desktop
Expand Up @@ -374,6 +374,7 @@ STATIC void ecom(elem **pe)
case OPsqrt: case OPsin: case OPcos:
#endif
case OPoffset: case OPnp_fp: case OPnp_f16p: case OPf16p_np:
case OPvecfill:
ecom(&e->E1);
break;
case OPhalt:
Expand Down
223 changes: 223 additions & 0 deletions src/backend/cgen.c
View file
Open in desktop
Expand Up @@ -27,6 +27,14 @@
static char __file__[] = __FILE__; /* for tassert.h */
#include "tassert.h"

/*********************************
*/
CodeBuilder::CodeBuilder(code *c)
{
head = c;
pTail = c ? &code_last(c)->next : &head;
}

/*************************************
* Handy function to answer the question: who the heck is generating this piece of code?
*/
Expand Down Expand Up @@ -154,6 +162,57 @@ code * cat4(code *c1,code *c2,code *c3,code *c4)
code * cat6(code *c1,code *c2,code *c3,code *c4,code *c5,code *c6)
{ return cat(cat4(c1,c2,c3,c4),cat(c5,c6)); }

/************************************
* Concatenate code.
*/
void CodeBuilder::append(CodeBuilder& cdb)
{
if (cdb.head)
{
*pTail = cdb.head;
pTail = cdb.pTail;
}
}

void CodeBuilder::append(CodeBuilder& cdb1, CodeBuilder& cdb2)
{
append(cdb1);
append(cdb2);
}

void CodeBuilder::append(CodeBuilder& cdb1, CodeBuilder& cdb2, CodeBuilder& cdb3)
{
append(cdb1);
append(cdb2);
append(cdb3);
}

void CodeBuilder::append(CodeBuilder& cdb1, CodeBuilder& cdb2, CodeBuilder& cdb3, CodeBuilder& cdb4)
{
append(cdb1);
append(cdb2);
append(cdb3);
append(cdb4);
}

void CodeBuilder::append(CodeBuilder& cdb1, CodeBuilder& cdb2, CodeBuilder& cdb3, CodeBuilder& cdb4, CodeBuilder& cdb5)
{
append(cdb1);
append(cdb2);
append(cdb3);
append(cdb4);
append(cdb5);
}

void CodeBuilder::append(code *c)
{
if (c)
{
CodeBuilder cdb(c);
append(cdb);
}
}

/*****************************
* Add code to end of linked list.
* Note that unused operands are garbage.
Expand Down Expand Up @@ -188,6 +247,25 @@ code *gen(code *c,code *cs)
return ce;
}

void CodeBuilder::gen(code *cs)
{
#ifdef DEBUG /* this is a high usage routine */
assert(cs);
#endif
#if TX86
assert(I64 || cs->Irex == 0);
#endif
code* ce = code_malloc();
*ce = *cs;
//printf("ce = %p %02x\n", ce, ce->Iop);
ccheck(ce);
simplify_code(ce);
code_next(ce) = CNIL;

*pTail = ce;
pTail = &ce->next;
}

code *gen1(code *c,unsigned op)
{ code *ce,*cstart;

Expand All @@ -206,6 +284,19 @@ code *gen1(code *c,unsigned op)
return ce;
}

void CodeBuilder::gen1(unsigned op)
{
code *ce = code_calloc();
ce->Iop = op;
ccheck(ce);
#if TX86
assert(op != LEA);
#endif

*pTail = ce;
pTail = &ce->next;
}

#if TX86
code *gen2(code *c,unsigned op,unsigned rm)
{ code *ce,*cstart;
Expand All @@ -223,6 +314,17 @@ code *gen2(code *c,unsigned op,unsigned rm)
return cstart;
}

void CodeBuilder::gen2(unsigned op, unsigned rm)
{
code *ce = code_calloc();
ce->Iop = op;
ce->Iea = rm;
ccheck(ce);

*pTail = ce;
pTail = &ce->next;
}

code *gen2sib(code *c,unsigned op,unsigned rm,unsigned sib)
{ code *ce,*cstart;

Expand All @@ -242,6 +344,21 @@ code *gen2sib(code *c,unsigned op,unsigned rm,unsigned sib)
}
return cstart;
}

void CodeBuilder::gen2sib(unsigned op, unsigned rm, unsigned sib)
{
code *ce = code_calloc();
ce->Iop = op;
ce->Irm = rm;
ce->Isib = sib;
ce->Irex = (rm | (sib & (REX_B << 16))) >> 16;
if (sib & (REX_R << 16))
ce->Irex |= REX_X;
ccheck(ce);

*pTail = ce;
pTail = &ce->next;
}
#endif

/********************************
Expand All @@ -260,6 +377,19 @@ code *genasm(code *c,char *s,unsigned slen)
return cat(c,ce);
}

void CodeBuilder::genasm(char *s, unsigned slen)
{
code *ce = code_calloc();
ce->Iop = ASM;
ce->IFL1 = FLasm;
ce->IEV1.as.len = slen;
ce->IEV1.as.bytes = (char *) mem_malloc(slen);
memcpy(ce->IEV1.as.bytes,s,slen);

*pTail = ce;
pTail = &ce->next;
}

#if TX86
code *gencs(code *c,unsigned op,unsigned ea,unsigned FL2,symbol *s)
{ code cs;
Expand All @@ -274,6 +404,19 @@ code *gencs(code *c,unsigned op,unsigned ea,unsigned FL2,symbol *s)
return gen(c,&cs);
}

void CodeBuilder::gencs(unsigned op, unsigned ea, unsigned FL2, symbol *s)
{
code cs;
cs.Iop = op;
cs.Iea = ea;
ccheck(&cs);
cs.IFL2 = FL2;
cs.IEVsym2 = s;
cs.IEVoffset2 = 0;

gen(&cs);
}

code *genc2(code *c,unsigned op,unsigned ea,targ_size_t EV2)
{ code cs;

Expand All @@ -286,6 +429,19 @@ code *genc2(code *c,unsigned op,unsigned ea,targ_size_t EV2)
return gen(c,&cs);
}

void CodeBuilder::genc2(unsigned op, unsigned ea, targ_size_t EV2)
{
code cs;
cs.Iop = op;
cs.Iea = ea;
ccheck(&cs);
cs.Iflags = CFoff;
cs.IFL2 = FLconst;
cs.IEV2.Vsize_t = EV2;

gen(&cs);
}

/*****************
* Generate code.
*/
Expand All @@ -303,6 +459,20 @@ code *genc1(code *c,unsigned op,unsigned ea,unsigned FL1,targ_size_t EV1)
return gen(c,&cs);
}

void CodeBuilder::genc1(unsigned op, unsigned ea, unsigned FL1, targ_size_t EV1)
{
code cs;
assert(FL1 < FLMAX);
cs.Iop = op;
cs.Iflags = CFoff;
cs.Iea = ea;
ccheck(&cs);
cs.IFL1 = FL1;
cs.IEV1.Vsize_t = EV1;

gen(&cs);
}

/*****************
* Generate code.
*/
Expand All @@ -322,6 +492,23 @@ code *genc(code *c,unsigned op,unsigned ea,unsigned FL1,targ_size_t EV1,unsigned
cs.IEV2.Vsize_t = EV2;
return gen(c,&cs);
}

void CodeBuilder::genc(unsigned op, unsigned ea, unsigned FL1, targ_size_t EV1, unsigned FL2, targ_size_t EV2)
{
code cs;
assert(FL1 < FLMAX);
cs.Iop = op;
cs.Iea = ea;
ccheck(&cs);
cs.Iflags = CFoff;
cs.IFL1 = FL1;
cs.IEV1.Vsize_t = EV1;
assert(FL2 < FLMAX);
cs.IFL2 = FL2;
cs.IEV2.Vsize_t = EV2;

gen(&cs);
}
#endif

/********************************
Expand All @@ -339,6 +526,15 @@ code *genlinnum(code *c,Srcpos srcpos)
return gen(c,&cs);
}

void CodeBuilder::genlinnum(Srcpos srcpos)
{
code cs;
//srcpos.print("genlinnum");
cs.Iop = ESCAPE | ESClinnum;
cs.IEV1.Vsrcpos = srcpos;
gen(&cs);
}

/******************************
* Append line number to existing code.
*/
Expand Down Expand Up @@ -375,6 +571,17 @@ code *genadjesp(code *c, int offset)
return c;
}

void CodeBuilder::genadjesp(int offset)
{
if (!I16 && offset)
{
code cs;
cs.Iop = ESCAPE | ESCadjesp;
cs.IEV1.Vint = offset;
gen(&cs);
}
}

#if TX86
/********************************
* Generate 'instruction' which tells the scheduler that the fpu stack has
Expand All @@ -393,6 +600,17 @@ code *genadjfpu(code *c, int offset)
else
return c;
}

void CodeBuilder::genadjfpu(int offset)
{
if (!I16 && offset)
{
code cs;
cs.Iop = ESCAPE | ESCadjfpu;
cs.IEV1.Vint = offset;
gen(&cs);
}
}
#endif

/********************************
Expand All @@ -404,6 +622,11 @@ code *gennop(code *c)
return gen1(c,NOP);
}

void CodeBuilder::gennop()
{
gen1(NOP);
}


/****************************************
* Clean stack after call to codelem().
Expand Down