From 6b29ad007852d225cc34f3709d41003b56f1897a Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 11 Jun 2018 16:49:40 +0200 Subject: [PATCH] In AllianceFramework, no longer try to load ".vhdl" files in ".vst". * Change: In CRL::ParserMap, no longer recognize the file extensions ".vhdl" and ".vhd" which are true VHDL and cannot be parsed by the "vst" (Alliance structural subset VHDL) parser. This should solve annoying problems for the Makefiles when there is both the full VHDL file ".vhdl" and the synthesized one ".vst" (note that this problem do not arise when using Yosys/Blif). --- crlcore/src/ccore/ParsersDrivers.cpp | 4 +- crlcore/src/ccore/crlcore/ParsersDrivers.h | 43 ++++++---------------- 2 files changed, 14 insertions(+), 33 deletions(-) diff --git a/crlcore/src/ccore/ParsersDrivers.cpp b/crlcore/src/ccore/ParsersDrivers.cpp index c9dfb147..334851df 100644 --- a/crlcore/src/ccore/ParsersDrivers.cpp +++ b/crlcore/src/ccore/ParsersDrivers.cpp @@ -169,8 +169,8 @@ namespace CRL { registerSlot ( "ap" , (CellParser_t*)apParser , "ap" ); registerSlot ( "vst" , (CellParser_t*)vstParser , "vst" ); registerSlot ( "vst" , (CellParser_t*)vstParser , "vbe" ); - registerSlot ( "vst" , (CellParser_t*)vstParser , "vhd" ); - registerSlot ( "vst" , (CellParser_t*)vstParser , "vhdl" ); + //registerSlot ( "vst" , (CellParser_t*)vstParser , "vhd" ); + //registerSlot ( "vst" , (CellParser_t*)vstParser , "vhdl" ); registerSlot ( "spi" , (CellParser_t*)spiceParser , "spi" ); registerSlot ( "oa" , (CellParser_t*)OpenAccess::oaCellParser , "oa" ); //registerSlot ( "oa" , (LibraryParser_t*)OpenAccess::oaLibParser, "oa" ); diff --git a/crlcore/src/ccore/crlcore/ParsersDrivers.h b/crlcore/src/ccore/crlcore/ParsersDrivers.h index b316e474..bf904cbe 100644 --- a/crlcore/src/ccore/crlcore/ParsersDrivers.h +++ b/crlcore/src/ccore/crlcore/ParsersDrivers.h @@ -2,38 +2,25 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2009, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2018, All Rights Reserved // -// =================================================================== -// -// $Id$ -// -// x-----------------------------------------------------------------x -// | | +// +-----------------------------------------------------------------+ // | C O R I O L I S | // | Alliance / Hurricane Interface | // | | // | Author : Jean-Paul CHAPUT | -// | E-mail : Jean-Paul.Chaput@asim.lip6.fr | +// | E-mail : Jean-Paul.Chaput@lip6.fr | // | =============================================================== | -// | C++ Header : "./ParsersDrivers.h" | -// | *************************************************************** | -// | U p d a t e s | -// | | -// x-----------------------------------------------------------------x +// | C++ Header : "./crlcore/ParsersDrivers.h" | +// +-----------------------------------------------------------------+ +#ifndef CRL_PARSERS_DRIVERS_H_ +#define CRL_PARSERS_DRIVERS_H - -# ifndef __CRL_PARSERS_DRIVERS_H__ -# define __CRL_PARSERS_DRIVERS_H__ - - -# include -# include - -# include "hurricane/Name.h" - +#include +#include +#include "hurricane/Name.h" namespace Hurricane { class Library; class Cell; @@ -42,12 +29,10 @@ namespace Hurricane { namespace CRL { - using Hurricane::Name; using Hurricane::Cell; using Hurricane::Library; - class Environment; class Catalog; class ParsersMap; @@ -217,10 +202,6 @@ namespace CRL { extern const char* BadInputMode; extern const char* BadOutputMode; +} // CRL namespace. - - -} - - -# endif +#endif // CRL_PARSERS_DRIVERS_H