Import of gpsim-devel, a package for the developement (CVS) version of gpsim:

PIC simulator that supports X, stimulii, and modules

Stuck at date 20040826, I couldn't get newer version to work with gtk1,
and we don't have a gtk+extra for gtk2 (the next release of gpsim shouldn't
depend on gtk+ any more). The patches in there have been integraded in
the gpsim's CVS. Some new features (especially in processors supported) and
lots of bug fixes since 0.21.2.

9 files changed, 233 insertions, 0 deletions

diff --git a/emulators/gpsim-devel/DESCR b/emulators/gpsim-devel/DESCR
new file mode 100644
index 00000000000..133d585a41b
--- /dev/null
+++ b/emulators/gpsim-devel/DESCR
@@ -0,0 +1 @@
+PIC simulator that supports X, stimulii, and modules
diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile
new file mode 100644
index 00000000000..2500183d063
--- /dev/null
+++ b/emulators/gpsim-devel/Makefile
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/11/29 20:51:50 bouyer Exp $
+#
+
+DISTNAME=	gpsim-20040826
+CATEGORIES=	emulators
+MASTER_SITES=	http://www-asim.lip6.fr/~bouyer/pic/
+
+MAINTAINER=	bouyer@NetBSD.org
+HOMEPAGE=	http://www.dattalo.com/gnupic/gpsim.html
+COMMENT=	PIC emulator with X interface
+
+GNU_CONFIGURE=	YES
+USE_BUILDLINK3=	YES
+USE_LANGUAGES=	c c++
+
+USE_GNU_TOOLS+=	make lex yacc
+USE_LIBTOOL=	YES
+
+USE_GNU_READLINE=	# rl_callback_read_char, rl_copy_text,
+# rl_callback_handler_remove, rl_forced_update_display,
+# rl_callback_handler_install
+
+CONFLICTS=	eXdbm-[0-9]* gpsim-[0-9]*
+
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk+extra/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gpsim-devel/PLIST b/emulators/gpsim-devel/PLIST
new file mode 100644
index 00000000000..910a8fdccae
--- /dev/null
+++ b/emulators/gpsim-devel/PLIST
@@ -0,0 +1,68 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/29 20:51:51 bouyer Exp $
+bin/gpsim
+include/eXdbm/eXdbm.h
+include/eXdbm/eXdbmErrors.h
+include/eXdbm/eXdbmTypes.h
+include/gpsim/12bit-instructions.h
+include/gpsim/12bit-processors.h
+include/gpsim/14bit-instructions.h
+include/gpsim/14bit-processors.h
+include/gpsim/14bit-registers.h
+include/gpsim/14bit-tmrs.h
+include/gpsim/16bit-instructions.h
+include/gpsim/16bit-processors.h
+include/gpsim/16bit-registers.h
+include/gpsim/16bit-tmrs.h
+include/gpsim/attribute.h
+include/gpsim/breakpoints.h
+include/gpsim/cod.h
+include/gpsim/eeprom.h
+include/gpsim/registers.h
+include/gpsim/gpsim_classes.h
+include/gpsim/gpsim_def.h
+include/gpsim/gpsim_interface.h
+include/gpsim/gpsim_time.h
+include/gpsim/fopen-path.h
+include/gpsim/i2c-ee.h
+include/gpsim/icd.h
+include/gpsim/intcon.h
+include/gpsim/interface.h
+include/gpsim/ioports.h
+include/gpsim/lxt_write.h
+include/gpsim/modules.h
+include/gpsim/p12x.h
+include/gpsim/p16x5x.h
+include/gpsim/p16f62x.h
+include/gpsim/p16x6x.h
+include/gpsim/p16x7x.h
+include/gpsim/p16x8x.h
+include/gpsim/p16f87x.h
+include/gpsim/p17c75x.h
+include/gpsim/p18x.h
+include/gpsim/packages.h
+include/gpsim/pic-instructions.h
+include/gpsim/pic-packages.h
+include/gpsim/pic-processor.h
+include/gpsim/pic-registers.h
+include/gpsim/picdis.h
+include/gpsim/pie.h
+include/gpsim/pir.h
+include/gpsim/processor.h
+include/gpsim/ssp.h
+include/gpsim/stimuli.h
+include/gpsim/stimulus_orb.h
+include/gpsim/symbol.h
+include/gpsim/symbol_orb.h
+include/gpsim/tmr0.h
+include/gpsim/trace.h
+include/gpsim/trace_orb.h
+include/gpsim/uart.h
+include/gpsim/value.h
+include/gpsim/xref.h
+lib/libgpsim_eXdbm.la
+lib/libgpsim.la
+lib/libgpsimcli.la
+lib/libgpsim_modules.la
+lib/libgpsimgui.la
+@dirrm include/eXdbm
+@dirrm include/gpsim
diff --git a/emulators/gpsim-devel/buildlink3.mk b/emulators/gpsim-devel/buildlink3.mk
new file mode 100644
index 00000000000..0f2f7f2d8a8
--- /dev/null
+++ b/emulators/gpsim-devel/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/11/29 20:51:50 bouyer Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GPSIM_BUILDLINK3_MK:=	${GPSIM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gpsim
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpsim}
+BUILDLINK_PACKAGES+=	gpsim
+
+.if !empty(GPSIM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gpsim+=	gpsim>=20040826
+BUILDLINK_RECOMMENDED.gpsim+=	gpsim>=20040826
+BUILDLINK_PKGSRCDIR.gpsim?=	../../emulators/gpsim-devel
+.endif	# GPSIM_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+
+.include "../../x11/gtk/buildlink3.mk"
diff --git a/emulators/gpsim-devel/distinfo b/emulators/gpsim-devel/distinfo
new file mode 100644
index 00000000000..d30cebda0f2
--- /dev/null
+++ b/emulators/gpsim-devel/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/11/29 20:51:51 bouyer Exp $
+
+SHA1 (gpsim-20040826.tar.gz) = 799632050e48ae341070061aff42efeb079d50aa
+Size (gpsim-20040826.tar.gz) = 1114098 bytes
+SHA1 (patch-aa) = 0f5bae7ef32e80070d0f033015dc3cdd0e36ea6c
+SHA1 (patch-ab) = 5def3db082263602c21620a817b0eb80dfe32d5a
+SHA1 (patch-ac) = d80b4ca01748d2e6f469d51d5b1cf88728e7e499
+SHA1 (patch-ad) = 0f14301df5752f831768f38c908da1a76614b6b8
+SHA1 (patch-wdt) = b1f3112651d01c57eda64c73efc44f098a8639e8
diff --git a/emulators/gpsim-devel/patches/patch-aa b/emulators/gpsim-devel/patches/patch-aa
new file mode 100644
index 00000000000..7e9cf761c6e
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/11/29 20:51:51 bouyer Exp $
+
+--- gui/Makefile.in.orig	2004-06-04 19:40:29.000000000 +0200
++++ gui/Makefile.in	2004-06-04 19:46:48.000000000 +0200
+@@ -117,13 +117,13 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@ -D DATADIR=\"~/.gpsim/\"
++CFLAGS = @CFLAGS@ -DDATADIR=\"~/.gpsim/\"
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@ -D DATADIR=\"~/.gpsim/\"
++CPPFLAGS = @CPPFLAGS@ -DDATADIR=\"~/.gpsim/\"
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@ -D DATADIR=\"~/.gpsim/\"
++CXXFLAGS = @CXXFLAGS@ -DDATADIR=\"~/.gpsim/\"
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
diff --git a/emulators/gpsim-devel/patches/patch-ab b/emulators/gpsim-devel/patches/patch-ab
new file mode 100644
index 00000000000..28064130c99
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/11/29 20:51:51 bouyer Exp $
+
+Index: src/stimuli.cc
+===================================================================
+RCS file: /cvsroot/gpsim/src/stimuli.cc,v
+retrieving revision 1.59
+diff -u -r1.59 stimuli.cc
+--- src/stimuli.cc	26 Aug 2004 14:37:03 -0000	1.59
++++ src/stimuli.cc	4 Nov 2004 22:06:02 -0000
+@@ -1325,6 +1325,8 @@
+ 
+ double IO_open_collector::get_Zth()
+ {
++  if(iop)
++    digital_state = (iop->value.get() & (1<<iobit)) ? true : false;
+   return (driving && !digital_state) ? Zth : ZthIn;
+ 
+ }
diff --git a/emulators/gpsim-devel/patches/patch-ac b/emulators/gpsim-devel/patches/patch-ac
new file mode 100644
index 00000000000..989b7e4653a
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/11/29 20:51:51 bouyer Exp $
+
+Index: cli/parse.yy
+===================================================================
+RCS file: /cvsroot/gpsim/cli/parse.yy,v
+retrieving revision 1.38
+diff -u -r1.38 parse.yy
+--- cli/parse.yy	24 Aug 2004 22:27:26 -0000	1.38
++++ cli/parse.yy	4 Nov 2004 18:21:06 -0000
+@@ -584,13 +584,21 @@
+ 	}
+         ;
+ 
+-string_option: STRING_OPTION STRING
++string_option
++	: STRING_OPTION STRING
+         { 
+ 	  $$ = new cmd_options_str($2);
+ 	  $$->co  = $1;
+           if(verbose&2)
+ 	    cout << " name " << $$->co->name << " value " << $$->str << " got a string option \n"; 
+ 	}
++	| STRING_OPTION SYMBOL_T
++        { 
++	  $$ = new cmd_options_str($2->name().c_str());
++	  $$->co  = $1;
++          if(verbose&2)
++	    cout << " name " << $$->co->name << " value " << $$->str << " got a string option \n"; 
++	}
+         ;
+ 
+ string_list
diff --git a/emulators/gpsim-devel/patches/patch-ad b/emulators/gpsim-devel/patches/patch-ad
new file mode 100644
index 00000000000..9f77bab0943
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-ad
@@ -0,0 +1,34 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/11/29 20:51:51 bouyer Exp $
+
+Index: cli/command.cc
+===================================================================
+RCS file: /cvsroot/gpsim/cli/command.cc,v
+retrieving revision 1.12
+diff -u -r1.12 command.cc
+--- cli/command.cc	27 Jun 2004 14:28:35 -0000	1.12
++++ cli/command.cc	4 Nov 2004 18:27:54 -0000
+@@ -224,7 +224,7 @@
+ //========================================================================
+ // Command options
+ 
+-cmd_options_str::cmd_options_str(char *new_val)
++cmd_options_str::cmd_options_str(const char *new_val)
+ {
+   if(new_val)
+     str = strdup(new_val);
+Index: cli/misc.h
+===================================================================
+RCS file: /cvsroot/gpsim/cli/misc.h,v
+retrieving revision 1.4
+diff -u -r1.4 misc.h
+--- cli/misc.h	29 Jun 2004 16:00:02 -0000	1.4
++++ cli/misc.h	4 Nov 2004 18:27:54 -0000
+@@ -45,7 +45,7 @@
+  public:
+   cmd_options *co;
+   char *str;
+-  cmd_options_str(char *);
++  cmd_options_str(const char *);
+   ~cmd_options_str();
+ };
+