godzil/dcc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced return type of insertCallGraph with bool

Browse Source 
renamed two locals in newRegArg, and used range based for in it
This commit is contained in:
Artur K 2012-03-13 00:43:05 +01:00
parent fe250a822d
commit d3e62a99aa
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dcc.h
View File

@ -54,8 +54,8 @@ public:
} }
public: public:
void writeNodeCallGraph(int indIdx); void writeNodeCallGraph(int indIdx);
boolT insertCallGraph(ilFunction caller, ilFunction callee); bool insertCallGraph(ilFunction caller, ilFunction callee);
boolT insertCallGraph(Function *caller, ilFunction callee); bool insertCallGraph(Function *caller, ilFunction callee);
void insertArc(ilFunction newProc); void insertArc(ilFunction newProc);
}; };
//#define NUM_PROCS_DELTA 5 /* delta # procs a proc invokes */ //#define NUM_PROCS_DELTA 5 /* delta # procs a proc invokes */

1
include/machine_x86.h
View File

@ -62,4 +62,5 @@ public:
} }
} }
static bool isMemOff(eReg r);
}; };

4
src/machine_x86.cpp
View File

@ -54,3 +54,7 @@ bool Machine_X86::physicalReg(eReg r)
{ {
return (r>=rAX) && (r<rTMP); return (r>=rAX) && (r<rTMP);
} }
bool Machine_X86::isMemOff(eReg r)
{
return r == 0 || r >= INDEX_BX_SI;
}

40
src/procs.cpp
View File

@ -40,7 +40,7 @@ void CALL_GRAPH::insertArc (ilFunction newProc)
/* Inserts a (caller, callee) arc in the call graph tree. */ /* Inserts a (caller, callee) arc in the call graph tree. */
boolT CALL_GRAPH::insertCallGraph(ilFunction caller, ilFunction callee) bool CALL_GRAPH::insertCallGraph(ilFunction caller, ilFunction callee)
{ {
int i; int i;
@ -58,7 +58,7 @@ boolT CALL_GRAPH::insertCallGraph(ilFunction caller, ilFunction callee)
} }
} }
boolT CALL_GRAPH::insertCallGraph(Function *caller, ilFunction callee) bool CALL_GRAPH::insertCallGraph(Function *caller, ilFunction callee)
{ {
auto iter = std::find_if(pProcList.begin(),pProcList.end(), auto iter = std::find_if(pProcList.begin(),pProcList.end(),
[caller](const Function &f)->bool {return caller==&f;}); [caller](const Function &f)->bool {return caller==&f;});
@ -97,7 +97,7 @@ void CALL_GRAPH::write()
void Function::newRegArg(iICODE picode, iICODE ticode) void Function::newRegArg(iICODE picode, iICODE ticode)
{ {
COND_EXPR *lhs; COND_EXPR *lhs;
STKFRAME * ps, *ts; STKFRAME * call_args_stackframe, *target_stackframe;
ID *id; ID *id;
int i, tidx; int i, tidx;
boolT regExist; boolT regExist;
@ -110,8 +110,8 @@ void Function::newRegArg(iICODE picode, iICODE ticode)
tproc->flg |= REG_ARGS; tproc->flg |= REG_ARGS;
/* Get registers and index into target procedure's local list */ /* Get registers and index into target procedure's local list */
ps = ticode->hl()->call.args; call_args_stackframe = ticode->hl()->call.args;
ts = &tproc->args; target_stackframe = &tproc->args;
lhs = picode->hl()->asgn.lhs; lhs = picode->hl()->asgn.lhs;
type = lhs->expr.ident.idType; type = lhs->expr.ident.idType;
if (type == REGISTER) if (type == REGISTER)
@ -132,33 +132,33 @@ void Function::newRegArg(iICODE picode, iICODE ticode)
/* Check if register argument already on the formal argument list */ /* Check if register argument already on the formal argument list */
regExist = false; regExist = false;
for (i = 0; i < ts->sym.size(); i++) for(STKSYM &tgt_sym : target_stackframe->sym)
{ {
if (type == REGISTER) if (type == REGISTER)
{ {
if ((ts->sym[i].regs != NULL) && if ((tgt_sym.regs != NULL) &&
(ts->sym[i].regs->expr.ident.idNode.regiIdx == tidx)) (tgt_sym.regs->expr.ident.idNode.regiIdx == tidx))
{ {
regExist = true; regExist = true;
i = ts->sym.size();
} }
} }
else if (type == LONG_VAR) else if (type == LONG_VAR)
{ {
if ((ts->sym[i].regs != NULL) && if ((tgt_sym.regs != NULL) &&
(ts->sym[i].regs->expr.ident.idNode.longIdx == tidx)) (tgt_sym.regs->expr.ident.idNode.longIdx == tidx))
{ {
regExist = true; regExist = true;
i = ts->sym.size();
} }
} }
if(regExist == true)
break;
} }
/* Do ts (formal arguments) */ /* Do ts (formal arguments) */
if (regExist == false) if (regExist == false)
{ {
STKSYM newsym; STKSYM newsym;
sprintf (newsym.name, "arg%ld", ts->sym.size()); sprintf (newsym.name, "arg%ld", target_stackframe->sym.size());
if (type == REGISTER) if (type == REGISTER)
{ {
if (regL < rAL) if (regL < rAL)
@ -171,23 +171,23 @@ void Function::newRegArg(iICODE picode, iICODE ticode)
newsym.type = TYPE_BYTE_SIGN; newsym.type = TYPE_BYTE_SIGN;
newsym.regs = COND_EXPR::idRegIdx(tidx, BYTE_REG); newsym.regs = COND_EXPR::idRegIdx(tidx, BYTE_REG);
} }
sprintf (tproc->localId.id_arr[tidx].name, "arg%ld", ts->sym.size()); sprintf (tproc->localId.id_arr[tidx].name, "arg%ld", target_stackframe->sym.size());
} }
else if (type == LONG_VAR) else if (type == LONG_VAR)
{ {
newsym.regs = COND_EXPR::idLongIdx (tidx); newsym.regs = COND_EXPR::idLongIdx (tidx);
newsym.type = TYPE_LONG_SIGN; newsym.type = TYPE_LONG_SIGN;
sprintf (tproc->localId.id_arr[tidx].name, "arg%ld", ts->sym.size()); sprintf (tproc->localId.id_arr[tidx].name, "arg%ld", target_stackframe->sym.size());
tproc->localId.propLongId (regL, regH, tproc->localId.propLongId (regL, regH,
tproc->localId.id_arr[tidx].name); tproc->localId.id_arr[tidx].name);
} }
ts->sym.push_back(newsym); target_stackframe->sym.push_back(newsym);
ts->numArgs++; target_stackframe->numArgs++;
} }
/* Do ps (actual arguments) */ /* Do ps (actual arguments) */
STKSYM newsym; STKSYM newsym;
sprintf (newsym.name, "arg%ld", ps->sym.size()); sprintf (newsym.name, "arg%ld", call_args_stackframe->sym.size());
newsym.actual = picode->hl()->asgn.rhs; newsym.actual = picode->hl()->asgn.rhs;
newsym.regs = lhs; newsym.regs = lhs;
/* Mask off high and low register(s) in picode */ /* Mask off high and low register(s) in picode */
@ -207,8 +207,8 @@ void Function::newRegArg(iICODE picode, iICODE ticode)
newsym.type = TYPE_LONG_SIGN; newsym.type = TYPE_LONG_SIGN;
break; break;
} }
ps->sym.push_back(newsym); call_args_stackframe->sym.push_back(newsym);
ps->numArgs++; call_args_stackframe->numArgs++;
} }