From 534a656be8012b79f40f8f8cbe16a914a0e21e38 Mon Sep 17 00:00:00 2001 From: steve Date: Wed, 12 Nov 2003 03:20:14 +0000 Subject: [PATCH] devices need show_cmp_gt --- tgt-fpga/d-generic-edif.c | 12 ++++++++---- tgt-fpga/d-generic.c | 6 +++++- tgt-fpga/d-lpm.c | 6 +++++- tgt-fpga/d-virtex.c | 6 +++++- tgt-fpga/d-virtex2.c | 6 +++++- tgt-fpga/device.h | 6 +++++- tgt-fpga/gates.c | 14 +++++++++++++- 7 files changed, 46 insertions(+), 10 deletions(-) diff --git a/tgt-fpga/d-generic-edif.c b/tgt-fpga/d-generic-edif.c index 05caa5366..28e5ab324 100644 --- a/tgt-fpga/d-generic-edif.c +++ b/tgt-fpga/d-generic-edif.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: d-generic-edif.c,v 1.16 2003/07/02 00:48:03 steve Exp $" +#ident "$Id: d-generic-edif.c,v 1.17 2003/11/12 03:20:14 steve Exp $" #endif # include "device.h" @@ -463,9 +463,10 @@ const struct device_s d_generic_edif = { 0, /* draw_pad not implemented */ edif_show_logic, edif_show_generic_dff, - 0, - 0, - 0, + 0, /* show_cmp_eq */ + 0, /* show_cmp_ne */ + 0, /* show_cmp_ge */ + 0, /* show_cmp_gt */ 0, 0, /* show_add */ 0, /* show_sub */ @@ -476,6 +477,9 @@ const struct device_s d_generic_edif = { /* * $Log: d-generic-edif.c,v $ + * Revision 1.17 2003/11/12 03:20:14 steve + * devices need show_cmp_gt + * * Revision 1.16 2003/07/02 00:48:03 steve * No longer export generic-edif functions. * diff --git a/tgt-fpga/d-generic.c b/tgt-fpga/d-generic.c index 738fe3641..8cb266113 100644 --- a/tgt-fpga/d-generic.c +++ b/tgt-fpga/d-generic.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: d-generic.c,v 1.13 2003/06/24 03:55:00 steve Exp $" +#ident "$Id: d-generic.c,v 1.14 2003/11/12 03:20:14 steve Exp $" #endif # include "device.h" @@ -505,6 +505,7 @@ const struct device_s d_generic = { generic_show_cmp_eq, generic_show_cmp_eq, 0, /* ge not implemented */ + 0, /* gt not implemented */ generic_show_mux, generic_show_add, 0, /* subtract not implemented */ @@ -515,6 +516,9 @@ const struct device_s d_generic = { /* * $Log: d-generic.c,v $ + * Revision 1.14 2003/11/12 03:20:14 steve + * devices need show_cmp_gt + * * Revision 1.13 2003/06/24 03:55:00 steve * Add ivl_synthesis_cell support for virtex2. * diff --git a/tgt-fpga/d-lpm.c b/tgt-fpga/d-lpm.c index e5d38797d..0a35dcc0e 100644 --- a/tgt-fpga/d-lpm.c +++ b/tgt-fpga/d-lpm.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: d-lpm.c,v 1.10 2003/10/31 03:45:50 steve Exp $" +#ident "$Id: d-lpm.c,v 1.11 2003/11/12 03:20:14 steve Exp $" #endif /* @@ -864,6 +864,7 @@ const struct device_s d_lpm_edif = { 0, 0, 0, + 0, /* show_cmp_gt */ lpm_show_mux, /* show_mux */ lpm_show_add, /* show_add */ lpm_show_add, /* show_sub */ @@ -875,6 +876,9 @@ const struct device_s d_lpm_edif = { /* * $Log: d-lpm.c,v $ + * Revision 1.11 2003/11/12 03:20:14 steve + * devices need show_cmp_gt + * * Revision 1.10 2003/10/31 03:45:50 steve * Handle adders that use Cout for the top bit. * diff --git a/tgt-fpga/d-virtex.c b/tgt-fpga/d-virtex.c index 8a94310d3..304b0f59c 100644 --- a/tgt-fpga/d-virtex.c +++ b/tgt-fpga/d-virtex.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: d-virtex.c,v 1.32 2003/08/15 02:23:53 steve Exp $" +#ident "$Id: d-virtex.c,v 1.33 2003/11/12 03:20:14 steve Exp $" #endif # include "device.h" @@ -835,6 +835,7 @@ const struct device_s d_virtex_edif = { virtex_eq, virtex_eq, virtex_ge, + 0, /* show_cmp_gt */ virtex_mux, virtex_add, virtex_add, @@ -845,6 +846,9 @@ const struct device_s d_virtex_edif = { /* * $Log: d-virtex.c,v $ + * Revision 1.33 2003/11/12 03:20:14 steve + * devices need show_cmp_gt + * * Revision 1.32 2003/08/15 02:23:53 steve * Add synthesis support for synchronous reset. * diff --git a/tgt-fpga/d-virtex2.c b/tgt-fpga/d-virtex2.c index 6d36310c5..cd4df782b 100644 --- a/tgt-fpga/d-virtex2.c +++ b/tgt-fpga/d-virtex2.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: d-virtex2.c,v 1.18 2003/07/04 00:10:09 steve Exp $" +#ident "$Id: d-virtex2.c,v 1.19 2003/11/12 03:20:14 steve Exp $" #endif # include "device.h" @@ -84,6 +84,7 @@ const struct device_s d_virtex2_edif = { virtex_eq, virtex_eq, virtex_ge, + 0, /* show_cmp_gt */ virtex_mux, virtex_add, virtex_add, @@ -94,6 +95,9 @@ const struct device_s d_virtex2_edif = { /* * $Log: d-virtex2.c,v $ + * Revision 1.19 2003/11/12 03:20:14 steve + * devices need show_cmp_gt + * * Revision 1.18 2003/07/04 00:10:09 steve * Generate MUXF5 based 4-input N-wide muxes. * diff --git a/tgt-fpga/device.h b/tgt-fpga/device.h index 6ae6fca50..64645b3e4 100644 --- a/tgt-fpga/device.h +++ b/tgt-fpga/device.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: device.h,v 1.13 2003/10/27 02:18:27 steve Exp $" +#ident "$Id: device.h,v 1.14 2003/11/12 03:20:14 steve Exp $" #endif # include @@ -53,6 +53,7 @@ struct device_s { void (*show_cmp_eq)(ivl_lpm_t net); void (*show_cmp_ne)(ivl_lpm_t net); void (*show_cmp_ge)(ivl_lpm_t net); + void (*show_cmp_gt)(ivl_lpm_t net); /* This method draws MUX devices */ void (*show_mux)(ivl_lpm_t net); /* This method draws ADD devices */ @@ -79,6 +80,9 @@ extern device_t device_from_arch(const char*arch); /* * $Log: device.h,v $ + * Revision 1.14 2003/11/12 03:20:14 steve + * devices need show_cmp_gt + * * Revision 1.13 2003/10/27 02:18:27 steve * Emit constants for LPM device. * diff --git a/tgt-fpga/gates.c b/tgt-fpga/gates.c index fca23a8b5..b6f6857b1 100644 --- a/tgt-fpga/gates.c +++ b/tgt-fpga/gates.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: gates.c,v 1.13 2003/08/09 03:23:03 steve Exp $" +#ident "$Id: gates.c,v 1.14 2003/11/12 03:20:14 steve Exp $" #endif # include @@ -96,6 +96,15 @@ static void show_gate_lpm(ivl_lpm_t net) device->show_cmp_ge(net); break; + case IVL_LPM_CMP_GT: + if (device->show_cmp_gt == 0) { + fprintf(stderr, "fpga.tgt: IVL_LPM_CMP_GT not supported" + " by this target.\n"); + return; + } + device->show_cmp_gt(net); + break; + case IVL_LPM_FF: if (device->show_dff == 0) { fprintf(stderr, "fpga.tgt: IVL_LPM_FF not supported" @@ -168,6 +177,9 @@ int show_scope_gates(ivl_scope_t net, void*x) /* * $Log: gates.c,v $ + * Revision 1.14 2003/11/12 03:20:14 steve + * devices need show_cmp_gt + * * Revision 1.13 2003/08/09 03:23:03 steve * Add support for IVL_LPM_MULT device. *