Merge branch 'master' of github.com:steveicarus/iverilog

This commit is contained in:
Stephen Williams 2014-07-19 17:29:21 -07:00
commit cc9d5f90e0
3 changed files with 11 additions and 3 deletions

View File

@ -360,6 +360,7 @@ static ivl_nexus_t get_lpm_output(ivl_scope_t scope, ivl_lpm_t lpm)
case IVL_LPM_SHIFTR:
case IVL_LPM_SIGN_EXT:
case IVL_LPM_SUB:
case IVL_LPM_SUBSTITUTE:
case IVL_LPM_UFUNC:
/* If the output of this LPM is a local signal then something
* else will request that this be emitted. */
@ -1186,6 +1187,13 @@ static void emit_lpm_as_ca(ivl_scope_t scope, ivl_lpm_t lpm,
emit_nexus_as_ca(scope, ivl_lpm_data(lpm, 1), 0, 0);
fprintf(vlog_out, ")");
break;
case IVL_LPM_SUBSTITUTE:
fprintf(vlog_out, "<unknown>");
fprintf(stderr, "%s:%u: vlog95 sorry: Substitute LPMs are "
"not currently translated.\n",
ivl_lpm_file(lpm), ivl_lpm_lineno(lpm));
vlog_errors += 1;
break;
case IVL_LPM_UFUNC:
emit_scope_path(scope, ivl_lpm_define(lpm));
emit_lpm_func(scope, lpm);

View File

@ -1072,9 +1072,9 @@ if(!sysctl(mib, 2, &v, &length, NULL, 0))
{
v /= 8;
if(v > FST_BREAK_SIZE)
if(v > (int64_t)FST_BREAK_SIZE)
{
if(v > FST_BREAK_SIZE_MAX)
if(v > (int64_t)FST_BREAK_SIZE_MAX)
{
v = FST_BREAK_SIZE_MAX;
}

View File

@ -1057,7 +1057,7 @@ if(!clone)
for(cnt = 0; cnt < lt->break_header_size; cnt += sizeof(buf))
{
seg = lt->break_header_size - cnt;
if(seg > sizeof(buf))
if(seg > (off_t)sizeof(buf))
{
seg = sizeof(buf);
}