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

vhdlpp: Added 'image attribute for time type.

This commit is contained in:
Maciej Suminski 2016-01-06 14:08:31 +01:00
parent 214c940a1a
commit ba274936e5
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vhdlpp/expression_emit.cc
View File

@ -392,6 +392,8 @@ int ExpTypeAttribute::emit(ostream&out, Entity*ent, ScopeBase*scope)
out << "%f"; out << "%f";
else if(base_->type_match(&primitive_CHARACTER)) else if(base_->type_match(&primitive_CHARACTER))
out << "'%c'"; out << "'%c'";
else if(base_->type_match(&primitive_TIME))
out << "%+0t";
out << "\","; out << "\",";
args_->front()->emit(out, ent, scope); args_->front()->emit(out, ent, scope);

27
vpi/sys_display.c
View File

@ -621,10 +621,6 @@ static unsigned int get_format_char(char **rtn, int ljust, int plus,
case 't': case 't':
case 'T': case 'T':
*idx += 1; *idx += 1;
if (plus != 0) {
vpi_printf("WARNING: %s:%d: invalid format %s%s.\n",
info->filename, info->lineno, info->name, fmtb);
}
if (*idx >= info->nitems) { if (*idx >= info->nitems) {
vpi_printf("WARNING: %s:%d: missing argument for %s%s.\n", vpi_printf("WARNING: %s:%d: missing argument for %s%s.\n",
info->filename, info->lineno, info->name, fmtb); info->filename, info->lineno, info->name, fmtb);
@ -648,6 +644,29 @@ static unsigned int get_format_char(char **rtn, int ljust, int plus,
} else { } else {
char *tbuf; char *tbuf;
PLI_INT32 time_units = vpi_get(vpiTimeUnit, info->scope); PLI_INT32 time_units = vpi_get(vpiTimeUnit, info->scope);
if (plus != 0) {
/* Icarus-specific extension to print out time units.
* It is needed by vhdlpp to correctly implement time'image(). */
PLI_INT32 time_prec = vpi_get(vpiTimePrecision, info->scope);
if(time_units < -12)
timeformat_info.suff = strdup(" fs");
else if(time_units < -9)
timeformat_info.suff = strdup(" ps");
else if(time_units < -6)
timeformat_info.suff = strdup(" ns");
else if(time_units < -3)
timeformat_info.suff = strdup(" us");
else if(time_units < 0)
timeformat_info.suff = strdup(" ms");
else
timeformat_info.suff = strdup(" s");
/* Adjust shift for get_time(), so the number indeed matches the unit */
time_units += (3 + (time_units % 3)) % 3 + (time_prec - time_units);
}
unsigned swidth, free_flag = 0; unsigned swidth, free_flag = 0;
unsigned suff_len = strlen(timeformat_info.suff); unsigned suff_len = strlen(timeformat_info.suff);
char *cp; char *cp;