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

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

This commit is contained in:
Stephen Williams 2012-01-25 17:48:22 -08:00
parent d3df962b2a e9d68098d5
commit 289b1d1bce
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vpi/sys_display.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999-2011 Stephen Williams (steve@icarus.com) * Copyright (c) 1999-2012 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -182,7 +182,6 @@ static char * format_as_string(int ljust, int plus, int ld_zero, int width,
static void get_time(char *rtn, const char *value, int prec, static void get_time(char *rtn, const char *value, int prec,
PLI_INT32 time_units) PLI_INT32 time_units)
{ {
int head, tail;
int shift = time_units - timeformat_info.units; int shift = time_units - timeformat_info.units;
/* Strip any leading zeros, but leave a single zero. */ /* Strip any leading zeros, but leave a single zero. */
@ -203,7 +202,9 @@ static void get_time(char *rtn, const char *value, int prec,
/* We need to scale the number down. */ /* We need to scale the number down. */
} else { } else {
head = strlen(value) + shift; int len = strlen(value);
int head = len + shift;
int tail;
/* We have digits to the left of the decimal point. */ /* We have digits to the left of the decimal point. */
if (head > 0) { if (head > 0) {
strncpy(rtn, value, head); strncpy(rtn, value, head);
@ -222,18 +223,18 @@ static void get_time(char *rtn, const char *value, int prec,
strcpy(rtn, "0"); strcpy(rtn, "0");
if (prec > 0) strcat(rtn, "."); if (prec > 0) strcat(rtn, ".");
/* Add leading zeros as needed. */ /* Add leading zeros as needed. */
head = -shift - 1; head = -head;
if (head > prec) head = prec; if (head > prec) head = prec;
while (head > 0) { while (head > 0) {
strcat(rtn, "0"); strcat(rtn, "0");
head -= 1; head -= 1;
} }
/* Add digits from the value if they fit. */ /* Add digits from the value if they fit. */
tail = prec + shift + 1; tail = prec + len + shift;
if (tail > 0) { if (tail > 0) {
strncat(rtn, value, tail); strncat(rtn, value, tail);
/* Add trailing zeros to fill out the precision. */ /* Add trailing zeros to fill out the precision. */
tail = prec + shift + 1 - strlen(value); tail = prec + shift + 1 - len;
while (tail > 0) { while (tail > 0) {
strcat(rtn, "0"); strcat(rtn, "0");
tail -= 1; tail -= 1;