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

Fix word register leak.

This commit is contained in:
steve 2003-04-23 02:22:47 +00:00
parent f1cc9d865b
commit 3aa3d03397
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tgt-vvp/draw_vpi.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#ifdef HAVE_CVS_IDENT #ifdef HAVE_CVS_IDENT
#ident "$Id: draw_vpi.c,v 1.7 2003/04/22 04:48:30 steve Exp $" #ident "$Id: draw_vpi.c,v 1.8 2003/04/23 02:22:47 steve Exp $"
#endif #endif
# include "vvp_priv.h" # include "vvp_priv.h"
@ -250,6 +250,8 @@ static void draw_vpi_taskfunc_args(const char*call_string,
for (idx = 0; idx < vecs; idx++) { for (idx = 0; idx < vecs; idx++) {
if (vec[idx].wid > 0) if (vec[idx].wid > 0)
clr_vector(vec[idx]); clr_vector(vec[idx]);
else if (vec[idx].wid == 0)
clr_word(vec[idx].base);
} }
free(vec); free(vec);
} }
@ -294,6 +296,9 @@ int draw_vpi_rfunc_call(ivl_expr_t fnet)
/* /*
* $Log: draw_vpi.c,v $ * $Log: draw_vpi.c,v $
* Revision 1.8 2003/04/23 02:22:47 steve
* Fix word register leak.
*
* Revision 1.7 2003/04/22 04:48:30 steve * Revision 1.7 2003/04/22 04:48:30 steve
* Support event names as expressions elements. * Support event names as expressions elements.
* *

22
tgt-vvp/eval_real.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#ifdef HAVE_CVS_IDENT #ifdef HAVE_CVS_IDENT
#ident "$Id: eval_real.c,v 1.7 2003/03/28 02:33:56 steve Exp $" #ident "$Id: eval_real.c,v 1.8 2003/04/23 02:22:47 steve Exp $"
#endif #endif
/* /*
@ -37,19 +37,21 @@ static unsigned long word_alloc_mask = 0x0f;
int allocate_word() int allocate_word()
{ {
int res = 4; int res = 4;
int max = 8*sizeof(word_alloc_mask);
while ((1 << res) & word_alloc_mask) while (res < max && (1U << res) & word_alloc_mask)
res += 1; res += 1;
assert(res < 8*sizeof(word_alloc_mask)); assert(res < max);
word_alloc_mask |= 1 << res; word_alloc_mask |= 1U << res;
return res; return res;
} }
void clr_word(int res) void clr_word(int res)
{ {
assert(word_alloc_mask & (1 << res)); int max = 8*sizeof(word_alloc_mask);
word_alloc_mask &= ~ (1 << res); assert(res < max);
word_alloc_mask &= ~ (1U << res);
} }
@ -64,22 +66,18 @@ static int draw_binary_real(ivl_expr_t exp)
case '+': case '+':
fprintf(vvp_out, " %%add/wr %d, %d;\n", l, r); fprintf(vvp_out, " %%add/wr %d, %d;\n", l, r);
clr_word(r);
break; break;
case '-': case '-':
fprintf(vvp_out, " %%sub/wr %d, %d;\n", l, r); fprintf(vvp_out, " %%sub/wr %d, %d;\n", l, r);
clr_word(r);
break; break;
case '*': case '*':
fprintf(vvp_out, " %%mul/wr %d, %d;\n", l, r); fprintf(vvp_out, " %%mul/wr %d, %d;\n", l, r);
clr_word(r);
break; break;
case '/': case '/':
fprintf(vvp_out, " %%div/wr %d, %d;\n", l, r); fprintf(vvp_out, " %%div/wr %d, %d;\n", l, r);
clr_word(r);
break; break;
default: default:
@ -87,6 +85,7 @@ static int draw_binary_real(ivl_expr_t exp)
ivl_expr_opcode(exp)); ivl_expr_opcode(exp));
assert(0); assert(0);
} }
clr_word(r);
return l; return l;
} }
@ -288,6 +287,9 @@ int draw_eval_real(ivl_expr_t exp)
/* /*
* $Log: eval_real.c,v $ * $Log: eval_real.c,v $
* Revision 1.8 2003/04/23 02:22:47 steve
* Fix word register leak.
*
* Revision 1.7 2003/03/28 02:33:56 steve * Revision 1.7 2003/03/28 02:33:56 steve
* Add support for division of real operands. * Add support for division of real operands.
* *