From 9b640f3114ca12aff21b8499b73a9c50e1685a52 Mon Sep 17 00:00:00 2001 From: Larry Doolittle Date: Wed, 29 Oct 2008 08:11:01 -0700 Subject: [PATCH] Shadow reduction part 4 Continue cleaning up shadowed variables, flagged by turning on -Wshadow. No intended change in functionality. This patch set covers the tgt-vhdl directory, and was tested by Nick. --- tgt-vhdl/cast.cc | 8 ++++---- tgt-vhdl/display.cc | 6 +++--- tgt-vhdl/scope.cc | 10 +++++----- tgt-vhdl/stmt.cc | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tgt-vhdl/cast.cc b/tgt-vhdl/cast.cc index e3006e9e0..d01016c6a 100644 --- a/tgt-vhdl/cast.cc +++ b/tgt-vhdl/cast.cc @@ -198,11 +198,11 @@ vhdl_expr *vhdl_expr::resize(int newwidth) else return this; // Doesn't make sense to resize non-vector type - vhdl_fcall *resize = new vhdl_fcall("Resize", rtype); - resize->add_expr(this); - resize->add_expr(new vhdl_const_int(newwidth)); + vhdl_fcall *resizef = new vhdl_fcall("Resize", rtype); + resizef->add_expr(this); + resizef->add_expr(new vhdl_const_int(newwidth)); - return resize; + return resizef; } vhdl_expr *vhdl_const_int::to_vector(vhdl_type_name_t name, int w) diff --git a/tgt-vhdl/display.cc b/tgt-vhdl/display.cc index 05bbe944a..5073ab634 100644 --- a/tgt-vhdl/display.cc +++ b/tgt-vhdl/display.cc @@ -157,10 +157,10 @@ int draw_stask_display(vhdl_procedural *proc, stmt_container *container, // function in VHDL assert(i < count); - ivl_expr_t net = ivl_stmt_parm(stmt, i++); - assert(net); + ivl_expr_t netp = ivl_stmt_parm(stmt, i++); + assert(netp); - vhdl_expr *base = translate_expr(net); + vhdl_expr *base = translate_expr(netp); if (NULL == base) return 1; diff --git a/tgt-vhdl/scope.cc b/tgt-vhdl/scope.cc index 116382eeb..2d4272049 100644 --- a/tgt-vhdl/scope.cc +++ b/tgt-vhdl/scope.cc @@ -698,11 +698,11 @@ static int draw_constant_drivers(ivl_scope_t scope, void *_parent) for (int i = 0; i < nsigs; i++) { ivl_signal_t sig = ivl_scope_sig(scope, i); - for (unsigned i = ivl_signal_array_base(sig); - i < ivl_signal_array_count(sig); - i++) { + for (unsigned j = ivl_signal_array_base(sig); + j < ivl_signal_array_count(sig); + j++) { // Make sure the nexus code is generated - ivl_nexus_t nex = ivl_signal_nex(sig, i); + ivl_nexus_t nex = ivl_signal_nex(sig, j); seen_nexus(nex); nexus_private_t *priv = @@ -712,7 +712,7 @@ static int draw_constant_drivers(ivl_scope_t scope, void *_parent) vhdl_scope *arch_scope = ent->get_arch()->get_scope(); if (priv->const_driver) { - assert(i == 0); // TODO: Make work for more words + assert(j == 0); // TODO: Make work for more words vhdl_var_ref *ref = nexus_to_var_ref(arch_scope, nex); diff --git a/tgt-vhdl/stmt.cc b/tgt-vhdl/stmt.cc index f5644825e..0e86ebf6c 100644 --- a/tgt-vhdl/stmt.cc +++ b/tgt-vhdl/stmt.cc @@ -424,8 +424,8 @@ static int draw_wait(vhdl_procedural *_proc, stmt_container *container, ivl_event_t event = ivl_stmt_events(stmt, i); int nany = ivl_event_nany(event); - for (int i = 0; i < nany; i++) { - ivl_nexus_t nexus = ivl_event_any(event, i); + for (int j = 0; j < nany; j++) { + ivl_nexus_t nexus = ivl_event_any(event, j); vhdl_var_ref *ref = nexus_to_var_ref(proc->get_scope(), nexus); wait->add_sensitivity(ref->get_name()); @@ -441,8 +441,8 @@ static int draw_wait(vhdl_procedural *_proc, stmt_container *container, ivl_event_t event = ivl_stmt_events(stmt, i); int nany = ivl_event_nany(event); - for (int i = 0; i < nany; i++) { - ivl_nexus_t nexus = ivl_event_any(event, i); + for (int j = 0; j < nany; j++) { + ivl_nexus_t nexus = ivl_event_any(event, j); vhdl_var_ref *ref = nexus_to_var_ref(proc->get_scope(), nexus); ref->set_name(ref->get_name() + "'Event"); @@ -450,8 +450,8 @@ static int draw_wait(vhdl_procedural *_proc, stmt_container *container, } int nneg = ivl_event_nneg(event); - for (int i = 0; i < nneg; i++) { - ivl_nexus_t nexus = ivl_event_neg(event, i); + for (int j = 0; j < nneg; j++) { + ivl_nexus_t nexus = ivl_event_neg(event, j); vhdl_var_ref *ref = nexus_to_var_ref(proc->get_scope(), nexus); vhdl_fcall *detect = new vhdl_fcall("falling_edge", vhdl_type::boolean()); @@ -461,8 +461,8 @@ static int draw_wait(vhdl_procedural *_proc, stmt_container *container, } int npos = ivl_event_npos(event); - for (int i = 0; i < npos; i++) { - ivl_nexus_t nexus = ivl_event_pos(event, i); + for (int j = 0; j < npos; j++) { + ivl_nexus_t nexus = ivl_event_pos(event, j); vhdl_var_ref *ref = nexus_to_var_ref(proc->get_scope(), nexus); vhdl_fcall *detect = new vhdl_fcall("rising_edge", vhdl_type::boolean());