mirror of
https://github.com/ra3xdh/qucs_s
synced 2025-03-28 21:13:26 +00:00
2009-10-11 Stefan Jahn <stefan@lkcc.org>
* dialogs/simmessage.cpp (startSimulator): Simulation of VHDL
files are now able to reference into pre-compiled modules, i.e.
libraries.
git-svn-id: https://qucs.svn.sourceforge.net/svnroot/qucs/trunk@1748 b5b04e8c-4942-46c9-ab4f-83783d557d1c
This commit is contained in:
ela
parent
3e577bda73
commit
a50b35b366
@ -3,7 +3,7 @@
|
||||
QucsDigi \- A wrapper script for digital simulations.
|
||||
.SH SYNOPSIS
|
||||
.B qucsdigi
|
||||
[\fIOPTION\fR] \fIinfile\fR \fIoutfile\fR \fItime\fR \fIdir\fR \fIbindir\fR
|
||||
[\fIOPTION\fR] \fIinfile\fR \fIoutfile\fR \fItime\fR \fIdir\fR \fIbindir\fR \fIvlibs\fR
|
||||
.SH DESCRIPTION
|
||||
|
||||
\fBQucs\fR is an integrated circuit simulator which means you are able
|
||||
@ -38,6 +38,10 @@ the name of the directory where the simulation is going to be performed
|
||||
.TP
|
||||
\fR BINDIR
|
||||
the location where the \fIqucsconv\fR program is installed
|
||||
.TP
|
||||
\fR VLIBS
|
||||
a -Wl linker option passing extraneous libraries against which
|
||||
resulting simulation binary is linked
|
||||
.SH AVAILABILITY
|
||||
The latest version of Qucs can always be obtained from
|
||||
\fBwww.sourceforge.net\fR or \fBwww.freshmeat.net\fR
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
2009-10-11 Stefan Jahn <stefan@lkcc.org>
|
||||
|
||||
* dialogs/simmessage.cpp (startSimulator): Simulation of VHDL
|
||||
files are now able to reference into pre-compiled modules, i.e.
|
||||
libraries.
|
||||
|
||||
2009-10-09 Stefan Jahn <stefan@lkcc.org>
|
||||
|
||||
* qucsdigilib: Putting all modules into a library when creating a
|
||||
|
||||
@ -134,7 +134,7 @@ void DigiSettingsDialog::slotOk()
|
||||
Doc->SimOpenDpl = Doc->simulation ? true : false;
|
||||
changed = true;
|
||||
}
|
||||
if(Doc->Libraries != NameEdit->text()) {
|
||||
if(Doc->Library != NameEdit->text()) {
|
||||
QString lib = NameEdit->text().stripWhiteSpace();
|
||||
Doc->Library = lib;
|
||||
changed = true;
|
||||
|
||||
@ -269,13 +269,17 @@ void SimMessage::slotFinishSpiceNetlist()
|
||||
// ------------------------------------------------------------------------
|
||||
#ifdef __MINGW32__
|
||||
#include <windows.h>
|
||||
static QString getShortPathName(QString longpath) {
|
||||
static QString pathName(QString longpath) {
|
||||
const char * lpath = QDir::convertSeparators(longpath).ascii();
|
||||
char spath[2048];
|
||||
int len = GetShortPathNameA(lpath,spath,sizeof(spath)-1);
|
||||
spath[len] = '\0';
|
||||
return QString(spath);
|
||||
}
|
||||
#else
|
||||
static QString pathName(QString longpath) {
|
||||
return longpath;
|
||||
}
|
||||
#endif
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
@ -313,15 +317,16 @@ void SimMessage::startSimulator()
|
||||
// Simulation.
|
||||
if (Doc->simulation) {
|
||||
SimTime = Doc->SimTime;
|
||||
#ifdef __MINGW32__
|
||||
CommandLine << getShortPathName(QucsSettings.BinDir + QucsDigi)
|
||||
<< "netlist.txt" << DataSet
|
||||
<< SimTime << getShortPathName(SimPath)
|
||||
<< getShortPathName(QucsSettings.BinDir);
|
||||
#else
|
||||
CommandLine << QucsSettings.BinDir + QucsDigi << "netlist.txt" << DataSet
|
||||
<< SimTime << SimPath << QucsSettings.BinDir;
|
||||
#endif
|
||||
QString libs = Doc->Libraries.lower();
|
||||
if(libs.isEmpty()) {
|
||||
libs = "-Wl";
|
||||
} else {
|
||||
libs.replace(" ",",-l");
|
||||
libs = "-Wl,-l" + libs;
|
||||
}
|
||||
CommandLine << pathName(QucsSettings.BinDir + QucsDigi)
|
||||
<< "netlist.txt" << DataSet << SimTime << pathName(SimPath)
|
||||
<< pathName(QucsSettings.BinDir) << libs;
|
||||
}
|
||||
// Module.
|
||||
else {
|
||||
@ -355,14 +360,8 @@ void SimMessage::startSimulator()
|
||||
}
|
||||
destFile.writeBlock(text.ascii(), text.length());
|
||||
destFile.close();
|
||||
#ifdef __MINGW32__
|
||||
CommandLine << getShortPathName(QucsSettings.BinDir + QucsDigiLib)
|
||||
<< "netlist.txt" << getShortPathName(SimPath)
|
||||
<< entity << lib;
|
||||
#else
|
||||
CommandLine << QucsSettings.BinDir + QucsDigiLib << "netlist.txt"
|
||||
<< SimPath << entity << lib;
|
||||
#endif
|
||||
CommandLine << pathName(QucsSettings.BinDir + QucsDigiLib)
|
||||
<< "netlist.txt" << pathName(SimPath) << entity << lib;
|
||||
}
|
||||
}
|
||||
// Simulate schematic window.
|
||||
@ -409,25 +408,13 @@ void SimMessage::startSimulator()
|
||||
}
|
||||
} else {
|
||||
if (isVerilog) {
|
||||
#ifdef __MINGW32__
|
||||
CommandLine << getShortPathName(QucsSettings.BinDir + QucsVeri)
|
||||
<< "netlist.txt" << DataSet
|
||||
<< SimTime << getShortPathName(SimPath)
|
||||
<< getShortPathName(QucsSettings.BinDir) << "-c";
|
||||
#else
|
||||
CommandLine << QucsSettings.BinDir + QucsVeri << "netlist.txt"
|
||||
<< DataSet << SimTime << SimPath << QucsSettings.BinDir << "-c";
|
||||
#endif
|
||||
CommandLine << pathName(QucsSettings.BinDir + QucsVeri)
|
||||
<< "netlist.txt" << DataSet << SimTime << pathName(SimPath)
|
||||
<< pathName(QucsSettings.BinDir) << "-c";
|
||||
} else {
|
||||
#ifdef __MINGW32__
|
||||
CommandLine << getShortPathName(QucsSettings.BinDir + QucsDigi)
|
||||
<< "netlist.txt" << DataSet
|
||||
<< SimTime << getShortPathName(SimPath)
|
||||
<< getShortPathName(QucsSettings.BinDir) << "-c";
|
||||
#else
|
||||
CommandLine << QucsSettings.BinDir + QucsDigi << "netlist.txt"
|
||||
<< DataSet << SimTime << SimPath << QucsSettings.BinDir << "-c";
|
||||
#endif
|
||||
CommandLine << pathName(QucsSettings.BinDir + QucsDigi)
|
||||
<< "netlist.txt" << DataSet << SimTime << pathName(SimPath)
|
||||
<< pathName(QucsSettings.BinDir) << "-Wl" << "-c";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# qucsdigi - wrapper script for digital simulation
|
||||
#
|
||||
# Copyright (C) 2005 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
|
||||
# Copyright (C) 2005, 2006, 2008 Stefan Jahn <stefan@lkcc.org>
|
||||
# Copyright (C) 2005, 2006, 2008, 2009 Stefan Jahn <stefan@lkcc.org>
|
||||
# Copyright (C) 2005 Raimund Jacob <raimi@lkcc.org>
|
||||
#
|
||||
# This is free software; you can redistribute it and/or modify
|
||||
@ -28,13 +28,13 @@ set -e
|
||||
# catch termination signal and kill all child processes
|
||||
#trap 'kill 0; exit 0' SIGTERM
|
||||
|
||||
if [ "$#" != 5 ]; then
|
||||
if [ "$#" != 6 ]; then
|
||||
echo "Usage: $0 <netlist.txt> <output.dat> <time> <directory> <bindirectory> [<convoption>]"
|
||||
if [ "$#" != 6 ]; then
|
||||
if [ "$#" != 7 ]; then
|
||||
echo "Usage: $0 <netlist.txt> <output.dat> <time> <directory> <bindirectory> <vlibs> [<convoption>]"
|
||||
echo "Directory has to contain the file 'netlist.txt'."
|
||||
exit 1
|
||||
fi
|
||||
OPTION=$6
|
||||
OPTION=$7
|
||||
fi
|
||||
|
||||
NAME=$1
|
||||
@ -42,6 +42,7 @@ NAMEOUT=$2
|
||||
TIME=$3
|
||||
DIR=$4
|
||||
BINDIR=$5
|
||||
VLIBS=$6
|
||||
|
||||
if [ ! -d "$DIR" ]; then
|
||||
echo "$DIR: Not a directory"
|
||||
@ -66,9 +67,7 @@ cp $NAME digi.vhdl
|
||||
NAME="digi"
|
||||
|
||||
echo -n "running C++ conversion..."
|
||||
# FIXME: Isn't this diverting important output in the error case ?
|
||||
# freehdl-v2cc -m $NAME._main_.cc -o $NAME.cc $NAME.vhdl 2>/dev/null
|
||||
freehdl-v2cc -m $NAME._main_.cc -o $NAME.cc $NAME.vhdl
|
||||
freehdl-v2cc -m $NAME._main_.cc -Lvhdl -o $NAME.cc $NAME.vhdl
|
||||
echo " done."
|
||||
|
||||
echo -n "compiling functions..."
|
||||
@ -80,7 +79,7 @@ $CXX $CXXFLAGS -c $NAME._main_.cc
|
||||
echo " done."
|
||||
|
||||
echo -n "linking..."
|
||||
$LIBTOOL --quiet --mode=link $CXX $NAME._main_.o $NAME.o $LIBS $IEEELIBS -o $NAME
|
||||
$LIBTOOL --quiet --mode=link $CXX $NAME._main_.o $NAME.o -Lvhdl $VLIBS $LIBS $IEEELIBS -o $NAME
|
||||
echo " done."
|
||||
|
||||
echo "simulating..."
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
REM
|
||||
REM qucsdigi.bat - wrapper script for digital simulation
|
||||
REM
|
||||
REM Copyright (C) 2005, 2006 Stefan Jahn <stefan@lkcc.org>
|
||||
REM Copyright (C) 2005, 2006, 2009 Stefan Jahn <stefan@lkcc.org>
|
||||
REM
|
||||
REM This is free software; you can redistribute it and/or modify
|
||||
REM it under the terms of the GNU General Public License as published by
|
||||
@ -21,14 +21,15 @@ REM the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
||||
REM Boston, MA 02110-1301, USA.
|
||||
REM
|
||||
|
||||
if not exist "%5" goto usage
|
||||
if not exist "%6" goto usage
|
||||
|
||||
set NAME=%1
|
||||
set NAMEOUT=%2
|
||||
set TIME=%~3
|
||||
set DIR=%4
|
||||
set BINDIR=%5
|
||||
set OPTION=%6
|
||||
set VLIBS=%6
|
||||
set OPTION=%7
|
||||
|
||||
if not exist "%DIR%" goto nodir
|
||||
|
||||
@ -39,20 +40,15 @@ if not exist %NAME% goto nofile
|
||||
copy %NAME% digi.vhdl > NUL
|
||||
set NAME=digi
|
||||
|
||||
REM set MINGWDIR=H:/Daten/Misc/mingw
|
||||
REM set FREEHDL=H:/Daten/Misc/freehdl
|
||||
REM set QUCSDIR=H:/Daten/Misc/Qucs
|
||||
|
||||
set CXX=g++
|
||||
set CXXFLAGS=-O2 -I"%FREEHDL%/include"
|
||||
REM set NAMEOUT=digi.dat
|
||||
set LDFLAGS=-L"%FREEHDL%/lib" -L"%FREEHDL%/lib/freehdl" -Wl,--enable-auto-import -s
|
||||
set LIBS=-lfreehdl-kernel -lfreehdl-std -lieee -lregex
|
||||
|
||||
set PATH=%PATH%;%FREEHDL%/bin;%MINGWDIR%/bin;%QUCSDIR%/bin
|
||||
|
||||
echo running C++ conversion...
|
||||
freehdl-v2cc -m %NAME%._main_.cc -L"%FREEHDL%/share/freehdl/lib" -o %NAME%.cc %NAME%.vhdl
|
||||
freehdl-v2cc -m %NAME%._main_.cc -L"%FREEHDL%/share/freehdl/lib" -Lvhdl -o %NAME%.cc %NAME%.vhdl
|
||||
|
||||
echo compiling functions...
|
||||
%CXX% %CXXFLAGS% -c %NAME%.cc
|
||||
@ -61,7 +57,7 @@ echo compiling main...
|
||||
%CXX% %CXXFLAGS% -c %NAME%._main_.cc
|
||||
|
||||
echo linking...
|
||||
%CXX% %NAME%._main_.o %NAME%.o %LDFLAGS% %LIBS% -o %NAME%.exe
|
||||
%CXX% %NAME%._main_.o %NAME%.o %LDFLAGS% -Lvhdl %VLIBS% %LIBS% -o %NAME%.exe
|
||||
|
||||
echo simulating...
|
||||
%NAME%.exe -q -cmd "dc -f %NAME%.vcd -t 1 ps -q;d;run %TIME%;q;" < NUL
|
||||
@ -72,7 +68,7 @@ qucsconv %OPTION% -if vcd -of qucsdata -i %NAME%.vcd -o %NAMEOUT%
|
||||
goto end
|
||||
|
||||
:usage
|
||||
echo Usage: %0 "<netlist.txt> <output.dat> <time> <directory> <bindirectory> <convoption>"
|
||||
echo Usage: %0 "<netlist.txt> <output.dat> <time> <directory> <bindirectory> <vlibs> [<convoption>]"
|
||||
echo Directory has to contain the file 'netlist.txt'.
|
||||
exit /b 1
|
||||
goto end
|
||||
|
||||
@ -58,7 +58,7 @@ cp $NAME $ENTITY.vhdl
|
||||
NAME=$ENTITY
|
||||
|
||||
echo -n "running C++ conversion..."
|
||||
freehdl-v2cc -o $NAME.cc $NAME.vhdl
|
||||
freehdl-v2cc -l$LIBRARY -Lvhdl -o $NAME.cc $NAME.vhdl
|
||||
echo " done."
|
||||
|
||||
echo -n "compiling functions..."
|
||||
|
||||
@ -45,7 +45,7 @@ set RANLIB=ranlib
|
||||
set PATH=%PATH%;%FREEHDL%/bin;%MINGWDIR%/bin;%QUCSDIR%/bin
|
||||
|
||||
echo running C++ conversion...
|
||||
freehdl-v2cc -L"%FREEHDL%/share/freehdl/lib" -o %NAME%.cc %NAME%.vhdl
|
||||
freehdl-v2cc -l%LIBRARY% -Lvhdl -L"%FREEHDL%/share/freehdl/lib" -o %NAME%.cc %NAME%.vhdl
|
||||
|
||||
echo compiling functions...
|
||||
%CXX% %CXXFLAGS% -c %NAME%.cc
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user