luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various fixes to support automatic functions 

Mostly this ensures that a recursive call to a function
is made with the correct types (this may involve generating
code to cast expressions to the correct type).
This commit is contained in:
Nick Gasson 2008-08-20 22:54:53 +01:00
parent a07dc968e7
commit 4ebe09bb72
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tgt-vhdl/expr.cc
View File

@ -192,7 +192,12 @@ static vhdl_expr *translate_numeric(vhdl_expr *lhs, vhdl_expr *rhs,
else if (rhs->get_type()->get_name() == VHDL_TYPE_BOOLEAN) else if (rhs->get_type()->get_name() == VHDL_TYPE_BOOLEAN)
lhs = lhs->cast(&boolean); lhs = lhs->cast(&boolean);
vhdl_type *rtype = new vhdl_type(*lhs->get_type()); vhdl_type *rtype;
if (op == VHDL_BINOP_MULT)
rtype = new vhdl_type(lhs->get_type()->get_name(),
(lhs->get_type()->get_width()*2) - 1, 0);
else
rtype = new vhdl_type(*lhs->get_type());
return new vhdl_binop_expr(lhs, op, rhs, rtype); return new vhdl_binop_expr(lhs, op, rhs, rtype);
} }
@ -438,7 +443,23 @@ static vhdl_expr *translate_ufunc(ivl_expr_t e)
vhdl_type *rettype = expr_to_vhdl_type(e); vhdl_type *rettype = expr_to_vhdl_type(e);
vhdl_fcall *fcall = new vhdl_fcall(funcname, rettype); vhdl_fcall *fcall = new vhdl_fcall(funcname, rettype);
return translate_parms<vhdl_fcall>(fcall, e); int nparams = ivl_expr_parms(e);
for (int i = 0; i < nparams; i++) {
vhdl_expr *param = translate_expr(ivl_expr_parm(e, i));
if (NULL == param)
return NULL;
// Ensure the parameter has the correct VHDL type
ivl_signal_t param_sig = ivl_scope_sig(defscope, i);
vhdl_type *param_type =
vhdl_type::type_for(ivl_signal_width(param_sig),
ivl_signal_signed(param_sig) != 0);
fcall->add_expr(param->cast(param_type));
delete param_type;
}
return fcall;
} }
static vhdl_expr *translate_ternary(ivl_expr_t e) static vhdl_expr *translate_ternary(ivl_expr_t e)