Update to gpsim-20050905. Changes are mainly bugfixes and a few more

supported devices. There is also work in progress on an interface though
a socket, allowing an external program to send commands to gpsim.

11 files changed, 49 insertions, 164 deletions

diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile
index 908a4caf582..69b90e0a9b5 100644
--- a/emulators/gpsim-devel/Makefile
+++ b/emulators/gpsim-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/09/07 20:17:46 bouyer Exp $
 #
 
-DISTNAME=	gpsim-20040826
+DISTNAME=	gpsim-20050905
 CATEGORIES=	emulators
 MASTER_SITES=	http://www-asim.lip6.fr/~bouyer/pic/
 
@@ -12,7 +12,7 @@ COMMENT=	PIC emulator with X interface
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
-USE_TOOLS+=	bison gmake lex
+USE_TOOLS+=	bison gmake lex pkg-config
 USE_LIBTOOL=	YES
 
 USE_GNU_READLINE=	# rl_callback_read_char, rl_copy_text,
@@ -23,6 +23,6 @@ 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 "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk2+extra/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gpsim-devel/PLIST b/emulators/gpsim-devel/PLIST
index 910a8fdccae..3d51af13bea 100644
--- a/emulators/gpsim-devel/PLIST
+++ b/emulators/gpsim-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/29 20:51:51 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/09/07 20:17:46 bouyer Exp $
 bin/gpsim
 include/eXdbm/eXdbm.h
 include/eXdbm/eXdbmErrors.h
@@ -13,14 +13,22 @@ 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/attributes.h
+include/gpsim/bit.h
+include/gpsim/bitlog.h
 include/gpsim/breakpoints.h
+include/gpsim/bytelog.h
+include/gpsim/cmd_gpsim.h
+include/gpsim/cmd_manager.h
 include/gpsim/cod.h
 include/gpsim/eeprom.h
-include/gpsim/registers.h
+include/gpsim/errors.h
+include/gpsim/exports.h
+include/gpsim/expr.h
 include/gpsim/gpsim_classes.h
 include/gpsim/gpsim_def.h
 include/gpsim/gpsim_interface.h
+include/gpsim/gpsim_object.h
 include/gpsim/gpsim_time.h
 include/gpsim/fopen-path.h
 include/gpsim/i2c-ee.h
@@ -30,6 +38,7 @@ include/gpsim/interface.h
 include/gpsim/ioports.h
 include/gpsim/lxt_write.h
 include/gpsim/modules.h
+include/gpsim/operator.h
 include/gpsim/p12x.h
 include/gpsim/p16x5x.h
 include/gpsim/p16f62x.h
@@ -48,6 +57,11 @@ include/gpsim/picdis.h
 include/gpsim/pie.h
 include/gpsim/pir.h
 include/gpsim/processor.h
+include/gpsim/program_files.h
+include/gpsim/protocol.h
+include/gpsim/pthread-wrap.h
+include/gpsim/registers.h
+include/gpsim/sim_context.h
 include/gpsim/ssp.h
 include/gpsim/stimuli.h
 include/gpsim/stimulus_orb.h
@@ -56,6 +70,8 @@ include/gpsim/symbol_orb.h
 include/gpsim/tmr0.h
 include/gpsim/trace.h
 include/gpsim/trace_orb.h
+include/gpsim/trigger.h
+include/gpsim/ttoken.h
 include/gpsim/uart.h
 include/gpsim/value.h
 include/gpsim/xref.h
diff --git a/emulators/gpsim-devel/buildlink3.mk b/emulators/gpsim-devel/buildlink3.mk
index 0f2f7f2d8a8..5e2a961c37e 100644
--- a/emulators/gpsim-devel/buildlink3.mk
+++ b/emulators/gpsim-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/11/29 20:51:50 bouyer Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/09/07 20:17:46 bouyer Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GPSIM_BUILDLINK3_MK:=	${GPSIM_BUILDLINK3_MK}+
@@ -11,11 +11,11 @@ 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_DEPENDS.gpsim+=	gpsim>=20050905
+BUILDLINK_RECOMMENDED.gpsim+=	gpsim>=20050905
 BUILDLINK_PKGSRCDIR.gpsim?=	../../emulators/gpsim-devel
 .endif	# GPSIM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
 
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
diff --git a/emulators/gpsim-devel/distinfo b/emulators/gpsim-devel/distinfo
index 2e8ab1d2413..84fd8d3840e 100644
--- a/emulators/gpsim-devel/distinfo
+++ b/emulators/gpsim-devel/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/09/07 20:17:46 bouyer Exp $
 
-SHA1 (gpsim-20040826.tar.gz) = 799632050e48ae341070061aff42efeb079d50aa
-RMD160 (gpsim-20040826.tar.gz) = 173ef94f31814f3a7a2c478962eee39549a843f1
-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-ae) = 0301b3fe241ab74419baccf81fe70c5cfb496c85
-SHA1 (patch-af) = 7a151b2eb71ab781db1ea6da77f91b19d885cfc6
-SHA1 (patch-ag) = 2021add5097cf9cc449c6209ba0e97eb75a392f4
+SHA1 (gpsim-20050905.tar.gz) = 46e7d0d69695961aca4324d8d3267181bd641081
+RMD160 (gpsim-20050905.tar.gz) = 1b717f0e51440c4e2db72a4bdfb90d2e8d5e4a3d
+Size (gpsim-20050905.tar.gz) = 2027957 bytes
+SHA1 (patch-aa) = f7d1c04b216ecabaf3071f92c97c7436a54f1e87
diff --git a/emulators/gpsim-devel/patches/patch-aa b/emulators/gpsim-devel/patches/patch-aa
index 7e9cf761c6e..1786f99bc2a 100644
--- a/emulators/gpsim-devel/patches/patch-aa
+++ b/emulators/gpsim-devel/patches/patch-aa
@@ -1,21 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/29 20:51:51 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2005/09/07 20:17:46 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@
+--- gui/Makefile.in.orig	2005-08-31 17:03:41.000000000 +0200
++++ gui/Makefile.in	2005-09-02 12:59:20.000000000 +0200
+@@ -235,9 +235,9 @@
+ 
+ libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
+ pixmapdir = $(datadir)/gpsim
+-AM_CFLAGS = -D DATADIR=\"~/.gpsim/\"
+-AM_CXXFLAGS = -D DATADIR=\"~/.gpsim/\"
+-AM_CPPFLAGS = -D DATADIR=\"~/.gpsim/\"
++AM_CFLAGS = -DDATADIR=\"~/.gpsim/\"
++AM_CXXFLAGS = -DDATADIR=\"~/.gpsim/\"
++AM_CPPFLAGS = -DDATADIR=\"~/.gpsim/\"
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/emulators/gpsim-devel/patches/patch-ab b/emulators/gpsim-devel/patches/patch-ab
deleted file mode 100644
index 28064130c99..00000000000
--- a/emulators/gpsim-devel/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 989b7e4653a..00000000000
--- a/emulators/gpsim-devel/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$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
deleted file mode 100644
index 9f77bab0943..00000000000
--- a/emulators/gpsim-devel/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$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();
- };
- 
diff --git a/emulators/gpsim-devel/patches/patch-ae b/emulators/gpsim-devel/patches/patch-ae
deleted file mode 100644
index 91b012f5d0e..00000000000
--- a/emulators/gpsim-devel/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/01/17 19:00:33 kristerw Exp $
-
---- cli/expr.cc.orig	Mon Jan 17 19:39:52 2005
-+++ cli/expr.cc	Mon Jan 17 19:41:03 2005
-@@ -2,6 +2,8 @@
- #include <list>
- #include <vector>
- #include <iostream>
-+#include <typeinfo>
-+#include <cstdio>
- 
- #include "expr.h"
- #include "errors.h"
diff --git a/emulators/gpsim-devel/patches/patch-af b/emulators/gpsim-devel/patches/patch-af
deleted file mode 100644
index 360cb3b7701..00000000000
--- a/emulators/gpsim-devel/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/01/17 19:00:33 kristerw Exp $
-
---- cli/scan.cc.orig	Mon Jan 17 19:39:09 2005
-+++ cli/scan.cc	Mon Jan 17 19:39:26 2005
-@@ -9,6 +9,7 @@
- #define YY_FLEX_MINOR_VERSION 5
- 
- #include <stdio.h>
-+#include <errno.h>
- 
- 
- /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
diff --git a/emulators/gpsim-devel/patches/patch-ag b/emulators/gpsim-devel/patches/patch-ag
deleted file mode 100644
index c263f76d4ac..00000000000
--- a/emulators/gpsim-devel/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/01/17 19:00:33 kristerw Exp $
-
---- gui/settings_exdbm.cc.orig	Mon Jan 17 19:45:00 2005
-+++ gui/settings_exdbm.cc	Mon Jan 17 19:45:17 2005
-@@ -19,6 +19,7 @@
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.  */
- 
-+#include <cstdio>
- #include "settings_exdbm.h"
- 
-