Reformat OptPass6.CC

This commit is contained in:
TomAwezome 2020-07-26 11:44:37 -05:00 committed by VoidNV
parent eb11ecc6e2
commit e60caba02f
3 changed files with 163 additions and 138 deletions

View file

@ -1,185 +1,209 @@
Bool OptIC6(CIntermediateCode *tmpi)
{
CIntermediateCode *tmpil1;
if (tmpi->ic_code<IC_IMM_I64 || !(tmpil1=OptLag1(tmpi)))
if (tmpi->ic_code < IC_IMM_I64 || !(tmpil1 = OptLag1(tmpi)))
return FALSE;
if (tmpil1->ic_code==IC_ADD_CONST && tmpi->ic_code==IC_DEREF &&
tmpi->ic_flags&ICF_ARG1_WAS_STACK && tmpi->arg1.type&MDF_REG &&
tmpil1->res.type&MDF_REG && I32_MIN<=tmpil1->ic_data<=I32_MAX &&
!Bt(&cmp.non_ptr_vars_mask,tmpil1->arg1.reg)) {
if (tmpil1->arg1.type&MDF_REG) {
tmpi->ic_flags=tmpi->ic_flags&~ICF_ARG1_WAS_STACK | tmpil1->ic_flags;
tmpi->ic_code=IC_MOV;
tmpi->arg1.type=MDF_DISP+tmpi->arg1_type_pointed_to;
tmpi->arg1.reg=tmpil1->arg1.reg;
tmpi->arg1.disp=tmpil1->ic_data;
OptSetNOP2(tmpil1,-1);
} else {
tmpil1->ic_code=IC_MOV;
tmpi->ic_code=IC_MOV;
tmpi->arg1.type=MDF_DISP+tmpi->arg1_type_pointed_to;
tmpi->arg1.disp=tmpil1->ic_data;
if (tmpil1->ic_code == IC_ADD_CONST && tmpi->ic_code == IC_DEREF && tmpi->ic_flags & ICF_ARG1_WAS_STACK &&
tmpi->arg1.type & MDF_REG && tmpil1->res.type & MDF_REG && I32_MIN <= tmpil1->ic_data <= I32_MAX &&
!Bt(&cmp.non_ptr_vars_mask, tmpil1->arg1.reg))
{
if (tmpil1->arg1.type & MDF_REG)
{
tmpi->ic_flags = tmpi->ic_flags & ~ICF_ARG1_WAS_STACK | tmpil1->ic_flags;
tmpi->ic_code = IC_MOV;
tmpi->arg1.type = MDF_DISP + tmpi->arg1_type_pointed_to;
tmpi->arg1.reg = tmpil1->arg1.reg;
tmpi->arg1.disp = tmpil1->ic_data;
OptSetNOP2(tmpil1, -1);
}
else
{
tmpil1->ic_code = IC_MOV;
tmpi->ic_code = IC_MOV;
tmpi->arg1.type = MDF_DISP + tmpi->arg1_type_pointed_to;
tmpi->arg1.disp = tmpil1->ic_data;
}
return TRUE;
}
return FALSE;
}
U0 OptPass6Lag(CCompCtrl *cc,CParseStack *ps,CIntermediateCode *tmpi,
I64 *_stack_ptr,I64 reg_stack_size,I64 *_clobbered_reg_mask)
U0 OptPass6Lag(CCompCtrl *cc, CParseStack *ps, CIntermediateCode *tmpi, I64 *_stack_ptr, I64 reg_stack_size,
I64 *_clobbered_reg_mask)
{
I64 stack_ptr=*_stack_ptr,code,
clobbered_stack_tmp_mask,clobbered_reg_mask=*_clobbered_reg_mask;
I64 stack_ptr = *_stack_ptr, code, clobbered_stack_tmp_mask, clobbered_reg_mask = *_clobbered_reg_mask;
CHashFun *tmpf;
code=tmpi->ic_code;
if (tmpi->ic_flags&ICF_PASS_TRACE && Bt(&cc->saved_pass_trace,6)) {
"%2d:",stack_ptr;
ICPut(cc,tmpi);
code = tmpi->ic_code;
if (tmpi->ic_flags & ICF_PASS_TRACE && Bt(&cc->saved_pass_trace, 6))
{
"%2d:", stack_ptr;
ICPut(cc, tmpi);
}
if (code==IC_CALL_START) {
if (reg_stack_size==1 && stack_ptr>0)
clobbered_stack_tmp_mask=REGG_STACK_TMP;
if (code == IC_CALL_START)
{
if (reg_stack_size == 1 && stack_ptr > 0)
clobbered_stack_tmp_mask = REGG_STACK_TMP;
else
clobbered_stack_tmp_mask=0;
if (tmpf=tmpi->ic_data) {
if (Bt(&tmpf->flags,Ff_INTERNAL))
clobbered_stack_tmp_mask=0;
else {
clobbered_stack_tmp_mask&=tmpf->clobbered_reg_mask;
clobbered_reg_mask|=tmpf->clobbered_reg_mask;
clobbered_stack_tmp_mask = 0;
if (tmpf = tmpi->ic_data)
{
if (Bt(&tmpf->flags, Ff_INTERNAL))
clobbered_stack_tmp_mask = 0;
else
{
clobbered_stack_tmp_mask &= tmpf->clobbered_reg_mask;
clobbered_reg_mask |= tmpf->clobbered_reg_mask;
}
}
tmpi->ic_data=clobbered_stack_tmp_mask;
ParsePush(ps,stack_ptr);
ParsePush(ps,clobbered_stack_tmp_mask);
} else if (code==IC_CALL_END) {
tmpi->ic_data=ParsePop(ps);
stack_ptr=ParsePop(ps);
} else if (code==IC_CALL_END2) {
tmpi->ic_data = clobbered_stack_tmp_mask;
ParsePush(ps, stack_ptr);
ParsePush(ps, clobbered_stack_tmp_mask);
}
else if (code == IC_CALL_END)
{
tmpi->ic_data = ParsePop(ps);
stack_ptr = ParsePop(ps);
}
else if (code == IC_CALL_END2)
{
ps->ptr--;
stack_ptr=ParsePop(ps);
stack_ptr = ParsePop(ps);
}
if (intermediate_code_table[code].arg_count==IS_V_ARG)
stack_ptr-=tmpi->ic_data>>3;
if (tmpi->arg2.type&MDF_STACK) {
if (intermediate_code_table[code].arg_count == IS_V_ARG)
stack_ptr -= tmpi->ic_data >> 3;
if (tmpi->arg2.type & MDF_STACK)
{
stack_ptr--;
if (stack_ptr<reg_stack_size) {
tmpi->arg2.type=MDF_REG+tmpi->arg2.type.raw_type;
tmpi->arg2.reg=Bsf(REGG_STACK_TMP);
tmpi->arg2.disp=0;
if (stack_ptr < reg_stack_size)
{
tmpi->arg2.type = MDF_REG + tmpi->arg2.type.raw_type;
tmpi->arg2.reg = Bsf(REGG_STACK_TMP);
tmpi->arg2.disp = 0;
}
}
if (tmpi->arg1.type&MDF_STACK) {
if (tmpi->arg1.type & MDF_STACK)
{
stack_ptr--;
if (stack_ptr<reg_stack_size) {
tmpi->arg1.type=MDF_REG+tmpi->arg1.type.raw_type;
tmpi->arg1.reg=Bsf(REGG_STACK_TMP);
tmpi->arg1.disp=0;
if (stack_ptr < reg_stack_size)
{
tmpi->arg1.type = MDF_REG + tmpi->arg1.type.raw_type;
tmpi->arg1.reg = Bsf(REGG_STACK_TMP);
tmpi->arg1.disp = 0;
}
}
if (tmpi->res.type&MDF_STACK && !(tmpi->ic_flags & ICF_PUSH_RES)) {
if (tmpi->res.type & MDF_STACK && !(tmpi->ic_flags & ICF_PUSH_RES))
{
stack_ptr++;
if (stack_ptr<=reg_stack_size) {
tmpi->res.type=MDF_REG+tmpi->res.type.raw_type;
tmpi->res.reg=Bsf(REGG_STACK_TMP);
clobbered_reg_mask|=REGG_STACK_TMP;
tmpi->res.disp=0;
if (stack_ptr <= reg_stack_size)
{
tmpi->res.type = MDF_REG + tmpi->res.type.raw_type;
tmpi->res.reg = Bsf(REGG_STACK_TMP);
clobbered_reg_mask |= REGG_STACK_TMP;
tmpi->res.disp = 0;
}
}
while (OptIC6(tmpi));
if (tmpi->res.type.raw_type!=RT_F64 && !(tmpi->ic_flags&ICF_USE_F64))
tmpi->ic_flags|=ICF_USE_INT;
*_stack_ptr=stack_ptr;
*_clobbered_reg_mask=clobbered_reg_mask;
if (tmpi->res.type.raw_type != RT_F64 && !(tmpi->ic_flags & ICF_USE_F64))
tmpi->ic_flags |= ICF_USE_INT;
*_stack_ptr = stack_ptr;
*_clobbered_reg_mask = clobbered_reg_mask;
}
U0 OptPass6(CCompCtrl *cc)
{
CIntermediateCode *tmpi,*tmpi_next,*tmpil1,*tmpil2,*old_tmpil2;
I64 stack_ptr=0,reg_stack_size,clobbered_reg_mask=REGG_CLOBBERED;
CParseStack *ps=cc->ps;
ps->ptr=0;
ps->ptr2=0;
if (Bt(&cc->opts,OPTf_NO_REG_VAR) || cc->flags&CCF_NO_REG_OPT)
reg_stack_size=0;
CIntermediateCode *tmpi, *tmpi_next, *tmpil1, *tmpil2, *old_tmpil2;
I64 stack_ptr = 0, reg_stack_size, clobbered_reg_mask = REGG_CLOBBERED;
CParseStack *ps = cc->ps;
ps->ptr = 0;
ps->ptr2 = 0;
if (Bt(&cc->opts, OPTf_NO_REG_VAR) || cc->flags & CCF_NO_REG_OPT)
reg_stack_size = 0;
else
reg_stack_size=1;
#assert REGG_STACK_TMP==1<<9
tmpi=cc->coc.coc_head.next;
old_tmpil2=NULL;
tmpil1=tmpil2=&cmp.ic_nop;
while (tmpi->ic_code) {
if (tmpi->ic_code>IC_NOP2) {
if (tmpil1->ic_code>IC_NOP2)
tmpil2=tmpil1;
tmpil1=tmpi;
if (tmpi->arg2.type&MDF_STACK) {
if (tmpil2->res.type&MDF_STACK &&
!(tmpil2->ic_flags&ICF_PUSH_RES)) {
if (tmpi->ic_code==IC_ASSIGN && tmpi->ic_flags&ICF_BY_VAL &&
tmpi->ic_flags&ICF_RES_NOT_USED &&
tmpil2->ic_code!=IC_CALL_END &&
tmpil2->ic_code!=IC_CALL_END2 &&
tmpil2->ic_code!=IC_RAX_SET &&
!(tmpi->ic_flags&(ICF_ARG2_TO_F64|ICF_ARG2_TO_INT)) &&
!(tmpil2->ic_flags&(ICF_RES_TO_F64|ICF_RES_TO_INT))) {
tmpil2->res.type =tmpi->arg1.type&MDG_MASK+
tmpi->arg1_type_pointed_to;
tmpil2->res.reg =tmpi->arg1.reg;
tmpil2->res.disp =tmpi->arg1.disp;
tmpil2->ic_flags=tmpil2->ic_flags
&~(ICF_RES_NOT_USED|ICF_RES_WAS_STACK)
|tmpi->ic_flags&~(ICF_BY_VAL|ICF_ARG1_WAS_STACK|ICF_ARG2_WAS_STACK);
old_tmpil2=NULL;
reg_stack_size = 1;
#assert REGG_STACK_TMP == 1 << 9
tmpi = cc->coc.coc_head.next;
old_tmpil2 = NULL;
tmpil1 = tmpil2 = &cmp.ic_nop;
while (tmpi->ic_code)
{
if (tmpi->ic_code > IC_NOP2)
{
if (tmpil1->ic_code > IC_NOP2)
tmpil2 = tmpil1;
tmpil1 = tmpi;
if (tmpi->arg2.type & MDF_STACK)
{
if (tmpil2->res.type & MDF_STACK && !(tmpil2->ic_flags & ICF_PUSH_RES))
{
if (tmpi->ic_code == IC_ASSIGN && tmpi->ic_flags & ICF_BY_VAL && tmpi->ic_flags & ICF_RES_NOT_USED &&
tmpil2->ic_code != IC_CALL_END && tmpil2->ic_code != IC_CALL_END2 && tmpil2->ic_code != IC_RAX_SET &&
!(tmpi->ic_flags & (ICF_ARG2_TO_F64 | ICF_ARG2_TO_INT)) &&
!(tmpil2->ic_flags & (ICF_RES_TO_F64 | ICF_RES_TO_INT)))
{
tmpil2->res.type = tmpi->arg1.type & MDG_MASK + tmpi->arg1_type_pointed_to;
tmpil2->res.reg = tmpi->arg1.reg;
tmpil2->res.disp = tmpi->arg1.disp;
tmpil2->ic_flags = tmpil2->ic_flags & ~(ICF_RES_NOT_USED | ICF_RES_WAS_STACK) |
tmpi->ic_flags & ~(ICF_BY_VAL | ICF_ARG1_WAS_STACK | ICF_ARG2_WAS_STACK);
old_tmpil2 = NULL;
OptSetNOP1(tmpi);
} else {
tmpi->arg2.type=MDF_REG+tmpi->arg2.type.raw_type;
tmpi->arg2.reg=REG_RAX;
tmpi->arg2.disp=0;
tmpil2->res.type=MDF_REG+tmpil2->res.type.raw_type;
tmpil2->res.reg=REG_RAX;
tmpil2->res.disp=0;
}
else
{
tmpi->arg2.type = MDF_REG + tmpi->arg2.type.raw_type;
tmpi->arg2.reg = REG_RAX;
tmpi->arg2.disp = 0;
tmpil2->res.type = MDF_REG + tmpil2->res.type.raw_type;
tmpil2->res.reg = REG_RAX;
tmpil2->res.disp = 0;
}
}
} else if (tmpi->arg1.type&MDF_STACK && tmpil2->res.type&MDF_STACK &&
!(tmpil2->ic_flags&ICF_PUSH_RES)) {
tmpi->arg1.type=MDF_REG+tmpi->arg1.type.raw_type;
tmpi->arg1.disp=0;
tmpil2->res.type=MDF_REG+tmpil2->res.type.raw_type;
tmpil2->res.disp=0;
if (intermediate_code_table[tmpi->ic_code].arg_count==IS_2_ARG) {
tmpi->arg1.reg=REG_R8;
tmpil2->res.reg=REG_R8;
} else {
tmpi->arg1.reg=REG_RAX;
tmpil2->res.reg=REG_RAX;
}
else if (tmpi->arg1.type & MDF_STACK && tmpil2->res.type & MDF_STACK && !(tmpil2->ic_flags & ICF_PUSH_RES))
{
tmpi->arg1.type = MDF_REG + tmpi->arg1.type.raw_type;
tmpi->arg1.disp = 0;
tmpil2->res.type = MDF_REG + tmpil2->res.type.raw_type;
tmpil2->res.disp = 0;
if (intermediate_code_table[tmpi->ic_code].arg_count == IS_2_ARG)
{
tmpi->arg1.reg = REG_R8;
tmpil2->res.reg = REG_R8;
}
else
{
tmpi->arg1.reg = REG_RAX;
tmpil2->res.reg = REG_RAX;
}
}
if (tmpi->ic_flags & ICF_PUSH_RES)
tmpi->res.type==MDF_STACK+tmpi->res.type.raw_type;
if (old_tmpil2!=tmpil2) {
if (tmpil2->ic_code>IC_NOP2)
OptPass6Lag(cc,ps,tmpil2,&stack_ptr,reg_stack_size,&clobbered_reg_mask);
old_tmpil2=tmpil2;
tmpi->res.type == MDF_STACK + tmpi->res.type.raw_type;
if (old_tmpil2 != tmpil2)
{
if (tmpil2->ic_code > IC_NOP2)
OptPass6Lag(cc, ps, tmpil2, &stack_ptr, reg_stack_size, &clobbered_reg_mask);
old_tmpil2 = tmpil2;
}
}
tmpi_next=tmpi->next;
if (tmpi->ic_code<=IC_NOP2)
tmpi_next = tmpi->next;
if (tmpi->ic_code <= IC_NOP2)
OptFree(tmpi);
tmpi=tmpi_next;
tmpi = tmpi_next;
}
if (ps->ptr>2) {
"Pass:%d Stack:%08X\n",cc->pass,ps->ptr;
LexExcept(cc,"Compiler Optimization Error at ");
if (ps->ptr > 2)
{
"Pass:%d Stack:%08X\n", cc->pass,ps->ptr;
LexExcept(cc, "Compiler Optimization Error at ");
}
if (cc->htc.fun) {
cc->htc.fun->used_reg_mask&=~REGG_STACK_TMP;
cc->htc.fun->used_reg_mask|=clobbered_reg_mask;
cc->htc.fun->clobbered_reg_mask=clobbered_reg_mask;
if (Bt(&cc->flags,CCf_PASS_TRACE_PRESENT) &&
Bt(&cc->saved_pass_trace,6)) {
"Used Reg Mask:%04X\n",cc->htc.fun->used_reg_mask;
"Clobbered Reg Mask:%04X\n",clobbered_reg_mask;
if (cc->htc.fun)
{
cc->htc.fun->used_reg_mask &= ~REGG_STACK_TMP;
cc->htc.fun->used_reg_mask |= clobbered_reg_mask;
cc->htc.fun->clobbered_reg_mask = clobbered_reg_mask;
if (Bt(&cc->flags, CCf_PASS_TRACE_PRESENT) && Bt(&cc->saved_pass_trace, 6))
{
"Used Reg Mask:%04X\n", cc->htc.fun->used_reg_mask;
"Clobbered Reg Mask:%04X\n", clobbered_reg_mask;
}
}
}

View file

@ -60,6 +60,7 @@ StartOS.CC
OptPass3.CC
OptPass4.CC
OptPass5.CC
OptPass6.CC
OpCodes.DD
CompilerA.HH
CompilerB.HH