diff --git a/tgt-fpga/xilinx.c b/tgt-fpga/xilinx.c index 2409dbbc9..eb5390e63 100644 --- a/tgt-fpga/xilinx.c +++ b/tgt-fpga/xilinx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2010 Stephen Williams (steve at icarus.com) + * Copyright (c) 2003-2012 Stephen Williams (steve at icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -877,7 +877,7 @@ void xilinx_shiftl(ivl_lpm_t net) inputs. The slice on the low end shifts in a 0 for a select input. */ for (qdx = 0 ; qdx < width ; qdx += 1) { - ivl_nexus_t nex0, nex1; + ivl_nexus_t nex0; edif_joint_t jnt0; edif_joint_t jnt1; @@ -885,6 +885,7 @@ void xilinx_shiftl(ivl_lpm_t net) jnt0 = edif_joint_of_nexus(edf, nex0); if (qdx > 0) { + ivl_nexus_t nex1; nex1 = ivl_lpm_data(net,qdx-1); jnt1 = edif_joint_of_nexus(edf, nex1); } else { diff --git a/tgt-stub/expression.c b/tgt-stub/expression.c index fd22bca86..ecf2a61b1 100644 --- a/tgt-stub/expression.c +++ b/tgt-stub/expression.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Stephen Williams (steve@icarus.com) + * Copyright (c) 2007-2012 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -410,7 +410,7 @@ void show_expression(ivl_expr_t net, unsigned ind) break; default: - fprintf(out, "%*s\n", ind, "", code); + fprintf(out, "%*s\n", ind, "", code); break; } } diff --git a/tgt-stub/statement.c b/tgt-stub/statement.c index 1ff9e3eeb..83be3a195 100644 --- a/tgt-stub/statement.c +++ b/tgt-stub/statement.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2007,2012 Stephen Williams (steve@icarus.com) + * Copyright (c) 2004-2012 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -420,6 +420,6 @@ void show_statement(ivl_statement_t net, unsigned ind) break; default: - fprintf(out, "%*sunknown statement type (%u)\n", ind, "", code); + fprintf(out, "%*sunknown statement type (%d)\n", ind, "", code); } } diff --git a/tgt-stub/stub.c b/tgt-stub/stub.c index 5b8b00bee..f8a1630ff 100644 --- a/tgt-stub/stub.c +++ b/tgt-stub/stub.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2011 Stephen Williams (steve@icarus.com) + * Copyright (c) 2000-2012 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -567,7 +567,7 @@ static void show_lpm_mux(ivl_lpm_t net) ivl_lpm_basename(net), width, size); nex = ivl_lpm_q(net); - fprintf(out, " Q: %p \n", nex, drive0, drive1); + fprintf(out, " Q: %p \n", nex, drive0, drive1); if (width != width_of_nexus(nex)) { fprintf(out, " Q: ERROR: Nexus width is %u\n", width_of_nexus(nex)); @@ -1511,9 +1511,9 @@ static void show_logic(ivl_net_logic_t net) for (idx = 0 ; idx < npins ; idx += 1) { ivl_nexus_t nex = ivl_logic_pin(net, idx); - fprintf(out, " %d: %p", idx, nex); + fprintf(out, " %u: %p", idx, nex); if (idx == 0) - fprintf(out, " ", drive0, drive1); + fprintf(out, " ", drive0, drive1); fprintf(out, "\n"); if (nex == 0) { @@ -1526,7 +1526,7 @@ static void show_logic(ivl_net_logic_t net) } if (ivl_logic_width(net) != width_of_nexus(nex)) { - fprintf(out, " %d: ERROR: Nexus width is %u\n", + fprintf(out, " %u: ERROR: Nexus width is %u\n", idx, width_of_nexus(nex)); stub_errors += 1; } diff --git a/tgt-verilog/verilog.c b/tgt-verilog/verilog.c index 4136950cb..d9c6af93f 100644 --- a/tgt-verilog/verilog.c +++ b/tgt-verilog/verilog.c @@ -377,7 +377,7 @@ static void show_statement(ivl_statement_t net, unsigned ind) break; default: - fprintf(out, "%*sunknown statement type (%u)\n", ind, "", code); + fprintf(out, "%*sunknown statement type (%d)\n", ind, "", code); } }