summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/gpsim/Makefile21
-rw-r--r--emulators/gpsim/PLIST40
-rw-r--r--emulators/gpsim/distinfo15
-rw-r--r--emulators/gpsim/patches/patch-aa26
-rw-r--r--emulators/gpsim/patches/patch-ab27
-rw-r--r--emulators/gpsim/patches/patch-ac34
-rw-r--r--emulators/gpsim/patches/patch-ad39
-rw-r--r--emulators/gpsim/patches/patch-ae187
-rw-r--r--emulators/gpsim/patches/patch-af21
9 files changed, 59 insertions, 351 deletions
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index ae26bdacdcd..899347eaf99 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:09:01 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/06/04 06:14:11 dogcow Exp $
#
-DISTNAME= gpsim-0.21.2
-PKGREVISION= 3
+DISTNAME= gpsim-0.21.11
CATEGORIES= emulators
-MASTER_SITES= http://www.dattalo.com/gnupic/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpsim/}
MAINTAINER= snoonan@tbearsiberians.com
HOMEPAGE= http://www.dattalo.com/gnupic/gpsim.html
@@ -15,15 +14,15 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake
USE_LIBTOOL= YES
+USE_GNU_READLINE= 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]*
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gpsim
+ ${INSTALL_DATA} ${WRKSRC}/doc/gpsim.pdf ${PREFIX}/share/doc/gpsim
+ ${INSTALL_DATA} ${WRKSRC}/doc/gpsim.ps ${PREFIX}/share/doc/gpsim
.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/PLIST b/emulators/gpsim/PLIST
index cacf7a0fffb..98b47aee136 100644
--- a/emulators/gpsim/PLIST
+++ b/emulators/gpsim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/06/04 06:14:11 dogcow Exp $
bin/gpsim
include/eXdbm/eXdbm.h
include/eXdbm/eXdbmErrors.h
@@ -13,29 +13,39 @@ 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/fopen-path.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
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/operator.h
include/gpsim/p12x.h
-include/gpsim/p16x5x.h
include/gpsim/p16f62x.h
+include/gpsim/p16f87x.h
+include/gpsim/p16x5x.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
@@ -47,6 +57,12 @@ 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
include/gpsim/symbol.h
@@ -54,12 +70,18 @@ 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
-lib/libgpsim_eXdbm.la
lib/libgpsim.la
-lib/libgpsimcli.la
+lib/libgpsim_eXdbm.la
lib/libgpsim_modules.la
+lib/libgpsimcli.la
lib/libgpsimgui.la
-@dirrm include/eXdbm
+share/doc/gpsim/gpsim.pdf
+share/doc/gpsim/gpsim.ps
+@dirrm share/doc/gpsim
@dirrm include/gpsim
+@dirrm include/eXdbm
diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo
index 74d79490b36..ecd4e8ffa46 100644
--- a/emulators/gpsim/distinfo
+++ b/emulators/gpsim/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/06/04 06:14:11 dogcow Exp $
-SHA1 (gpsim-0.21.2.tar.gz) = 9c16a1288f0c83923395d01e9749d56a087707f9
-RMD160 (gpsim-0.21.2.tar.gz) = 8dea42dbc76bd4e2f137da8217453f8517b3444a
-Size (gpsim-0.21.2.tar.gz) = 721817 bytes
-SHA1 (patch-aa) = 3d548f5ed918f35384b3e813453d63b8adfceebc
-SHA1 (patch-ab) = 10c7ac1ced267081ec25180a53b6881c4dc4326e
-SHA1 (patch-ac) = 51b3a74c28157d97b43a7b101bd103a98ae46c2e
-SHA1 (patch-ad) = dcd0f4570e593a9523fd30025221fa49a92164bc
-SHA1 (patch-ae) = ba466ee447913ea80893470c6f769ca0c96b2ff9
-SHA1 (patch-af) = fd29b01c78458891928880af6f8cbf6df784d92c
+SHA1 (gpsim-0.21.11.tar.gz) = 05337560a6b48a9afb7a3f4be1ba606709f6b30a
+RMD160 (gpsim-0.21.11.tar.gz) = 36001180948fc2394043d8283dc1dd028ee4f922
+Size (gpsim-0.21.11.tar.gz) = 1218332 bytes
+SHA1 (patch-aa) = 0d102952cb8dbe7faaf50416a2d9bec24683c300
diff --git a/emulators/gpsim/patches/patch-aa b/emulators/gpsim/patches/patch-aa
index 1978d4470f6..85e259246da 100644
--- a/emulators/gpsim/patches/patch-aa
+++ b/emulators/gpsim/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2004/04/26 22:34:17 snj Exp $
+$NetBSD: patch-aa,v 1.4 2006/06/04 06:14:11 dogcow Exp $
---- gui/Makefile.in.orig 2004-04-26 15:24:07.000000000 -0700
-+++ gui/Makefile.in 2004-04-26 15:24:23.000000000 -0700
-@@ -116,9 +116,9 @@ libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_
+--- gui/Makefile.in.orig 2006-06-03 22:01:39.000000000 -0700
++++ gui/Makefile.in 2006-06-03 21:55:02.000000000 -0700
+@@ -226,9 +226,9 @@ libgpsimgui_la_SOURCES = gui_break.cc gu
+ 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
--CFLAGS = @CFLAGS@ -D DATADIR=\"~/.gpsim/\"
--CXXFLAGS = @CXXFLAGS@ -D DATADIR=\"~/.gpsim/\"
--CPPFLAGS = @CPPFLAGS@ -D DATADIR=\"~/.gpsim/\"
-+CFLAGS = @CFLAGS@ -DDATADIR=\"~/.gpsim/\"
-+CXXFLAGS = @CXXFLAGS@ -DDATADIR=\"~/.gpsim/\"
-+CPPFLAGS = @CPPFLAGS@ -DDATADIR=\"~/.gpsim/\"
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
+ .SUFFIXES:
diff --git a/emulators/gpsim/patches/patch-ab b/emulators/gpsim/patches/patch-ab
deleted file mode 100644
index 0c3c2be25e3..00000000000
--- a/emulators/gpsim/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/05/02 20:08:14 bouyer Exp $
-
---- src/16bit-registers.cc.orig 2004-04-29 23:30:57.000000000 +0200
-+++ src/16bit-registers.cc 2004-04-29 23:33:09.000000000 +0200
-@@ -1181,7 +1181,6 @@
-
- bool TXREG_16::is_empty(void)
- {
-- cout << "Txreg_16::empty\n";
- if(pir_set)
- return(pir_set->get_txif());
- return 0;
-@@ -1192,14 +1191,12 @@
- {
- if(pir_set)
- pir_set->set_txif();
-- cout << "Txreg_16::empty\n";
- }
-
- void TXREG_16::full(void)
- {
- if(pir_set)
- pir_set->clear_txif();
-- cout << "Txreg_16::full\n";
- }
-
- void TXREG_16::assign_pir_set(PIR_SET *new_pir_set)
diff --git a/emulators/gpsim/patches/patch-ac b/emulators/gpsim/patches/patch-ac
deleted file mode 100644
index 1ede5fb30e0..00000000000
--- a/emulators/gpsim/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/05/02 20:08:14 bouyer Exp $
-
---- src/pir.cc.orig 2004-01-31 03:58:03.000000000 +0100
-+++ src/pir.cc 2004-04-29 23:32:37.000000000 +0200
-@@ -40,6 +40,14 @@
- }
-
-
-+void PIR1v1::set_txif(void)
-+{
-+ trace.register_write(address,value);
-+ value |= TXIF;
-+ if( value & pie->value )
-+ intcon->peripheral_interrupt();
-+}
-+
- void PIR1v1::clear_txif(void)
- {
- value &= ~TXIF;
-@@ -56,6 +64,14 @@
-
-
-
-+void PIR1v2::set_txif(void)
-+{
-+ trace.register_write(address,value);
-+ value |= TXIF;
-+ if( value & pie->value )
-+ intcon->peripheral_interrupt();
-+}
-+
- void PIR1v2::clear_txif(void)
- {
- value &= ~TXIF;
diff --git a/emulators/gpsim/patches/patch-ad b/emulators/gpsim/patches/patch-ad
deleted file mode 100644
index b94a48ee1e8..00000000000
--- a/emulators/gpsim/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/05/02 20:08:14 bouyer Exp $
-
---- src/pir.h.orig 2004-02-07 03:50:52.000000000 +0100
-+++ src/pir.h 2004-04-29 23:32:37.000000000 +0200
-@@ -93,11 +93,7 @@
- put(get() | SSPIF);
- }
-
-- inline void set_txif(void)
-- {
-- put(get() | TXIF);
-- }
--
-+ void set_txif(void);
- inline void set_rcif(void)
- {
- put(get() | RCIF);
-@@ -178,11 +174,7 @@
- put(get() | SSPIF);
- }
-
-- inline void set_txif(void)
-- {
-- put(get() | TXIF);
-- }
--
-+ void set_txif(void);
- inline void set_rcif(void)
- {
- put(get() | RCIF);
-@@ -205,7 +197,7 @@
- void clear_txif(void);
- unsigned int get_rcif(void)
- {
-- return value & TXIF;
-+ return value & RCIF;
- }
- void clear_rcif(void);
-
diff --git a/emulators/gpsim/patches/patch-ae b/emulators/gpsim/patches/patch-ae
deleted file mode 100644
index 1148c1fae02..00000000000
--- a/emulators/gpsim/patches/patch-ae
+++ /dev/null
@@ -1,187 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/05/02 20:08:14 bouyer Exp $
-
---- src/uart.cc.orig 2004-01-31 03:58:04.000000000 +0100
-+++ src/uart.cc 2004-04-30 18:56:31.000000000 +0200
-@@ -139,11 +139,16 @@
- cout << "TXSTA - enabling transmitter\n";
- if(txreg) {
- cout << " TXSTA - does have a txreg\n";
-- if(txreg->is_empty())
- txreg->empty();
-- else
-+#if 0
-+ if(txreg->is_empty()) {
-+ txreg->empty();
-+ } else {
-+ cout << "start_transmitting1" << endl;
- start_transmitting();
- }
-+#endif
-+ }
- } else
- stop_transmitting();
- }
-@@ -431,47 +436,53 @@
- void _RCSTA::receive_a_bit(unsigned int bit)
- {
-
-- if(bit_count)
-- {
-+ // If we're waiting for the start bit and this isn't it then
-+ // we don't need to look any further
-+ // cout << "receive_a_bit state " << state << "bit " << bit << endl;
-+ if( state == RCSTA_MAYBE_START) {
-+ if (bit)
-+ state = RCSTA_WAITING_FOR_START;
-+ else
-+ state = RCSTA_RECEIVING;
-+ return;
-+ }
-+ if (bit_count == 0) {
-+ // we should now have the stop bit
-+ if (bit) {
-+ // got the stop bit
-+ // If the rxreg has data from a previous reception then
-+ // we have a receiver overrun error.
-+ // cout << "rcsta.rsr is full\n";
-+
-+ if((value & RX9) == 0)
-+ rsr >>= 1;
-+
-+ // copy the rsr to the fifo
-+ if(rcreg)
-+ rcreg->push( rsr & 0xff);
-+ //cout << "_RCSTA::receive_a_bit received 0x" << (rsr & 0xff) << endl;
-+
-+ } else {
-+ //not stop bit; discard the data and go back receiving
-+ }
-+ // If we're continuously receiving, then set up for the next byte.
-+ // FIXME -- may want to set a half bit delay before re-starting...
-+ if(value & CREN)
-+ start_receiving();
-+ else
-+ state = RCSTA_DISABLED;
-+ return;
-+ }
-
-- // If we're waiting for the start bit and this isn't it then
-- // we don't need to look any further
-- if( (state == RCSTA_WAITING_FOR_START) && bit)
-- return;
--
-- // Copy the bit into the Receive Shift Register
-- if(bit)
-- rsr |= 1<<9;
--
-- //cout << "Receive bit #" << bit_count << ": " << (rsr&(1<<9)) << '\n';
--
-- rsr >>= 1;
--
-- if(--bit_count == 0)
-- {
-- // rsr is full.
--
-- // If the rxreg has data from a previous reception then
-- // we have a receiver overrun error.
-- //cout << "rcsta.rsr is full\n";
--
-- if((value & RX9) == 0)
-- rsr >>= 1;
--
-- // copy the rsr to the fifo
-- if(rcreg)
-- rcreg->push( rsr & 0xff);
--
-- // If we're continuously receiving, then set up for the next byte.
-- // FIXME -- may want to set a half bit delay before re-starting...
-- if(value & CREN)
-- start_receiving();
-- else
-- state = RCSTA_DISABLED;
-
-- }
-+ // Copy the bit into the Receive Shift Register
-+ if(bit)
-+ rsr |= 1<<9;
-
-- }
-+ //cout << "Receive bit #" << bit_count << ": " << (rsr&(1<<9)) << '\n';
-+
-+ rsr >>= 1;
-+ bit_count--;
-
- }
-
-@@ -494,11 +505,11 @@
- // Is this a 9-bit data reception?
- if(value & RX9)
- {
-- bit_count = 10;
-+ bit_count = 9;
- }
- else
- {
-- bit_count = 9;
-+ bit_count = 8;
- }
-
- state = RCSTA_WAITING_FOR_START;
-@@ -526,11 +537,11 @@
- if(txsta && (txsta->value & _TXSTA::BRGH))
- set_callback_break(BRGH_FIRST_MID_SAMPLE);
- else
-- set_callback_break(BRGH_FIRST_MID_SAMPLE);
-+ set_callback_break(BRGL_FIRST_MID_SAMPLE);
-
- sample = 0;
-- state = RCSTA_WAITING_MID1;
--
-+ sample_state = RCSTA_WAITING_MID1;
-+ state = RCSTA_MAYBE_START;
- }
-
- void _RCSTA::callback(void)
-@@ -538,7 +549,7 @@
-
- //cout << "RCSTA callback " << (cycles.value) << '\n';
-
-- switch(state) {
-+ switch(sample_state) {
- case RCSTA_WAITING_MID1:
- if(uart_port->get_bit(rx_bit))
- sample++;
-@@ -548,7 +559,7 @@
- else
- set_callback_break(BRGL_SECOND_MID_SAMPLE - BRGL_FIRST_MID_SAMPLE);
-
-- state = RCSTA_WAITING_MID2;
-+ sample_state = RCSTA_WAITING_MID2;
-
- break;
-
-@@ -561,7 +572,7 @@
- else
- set_callback_break(BRGL_THIRD_MID_SAMPLE - BRGL_SECOND_MID_SAMPLE);
-
-- state = RCSTA_WAITING_MID3;
-+ sample_state = RCSTA_WAITING_MID3;
-
- break;
-
-@@ -573,13 +584,13 @@
- sample = 0;
-
- // If this wasn't the last bit then go ahead and set a break for the next bit.
-- if(state==RCSTA_WAITING_MID3) {
-+ if(state==RCSTA_RECEIVING) {
- if(txsta && (txsta->value & _TXSTA::BRGH))
- set_callback_break(TOTAL_BRGH_STATES -(BRGH_THIRD_MID_SAMPLE - BRGH_FIRST_MID_SAMPLE));
- else
- set_callback_break(TOTAL_BRGL_STATES -(BRGL_THIRD_MID_SAMPLE - BRGL_FIRST_MID_SAMPLE));
-
-- state = RCSTA_WAITING_MID1;
-+ sample_state = RCSTA_WAITING_MID1;
- }
-
- break;
diff --git a/emulators/gpsim/patches/patch-af b/emulators/gpsim/patches/patch-af
deleted file mode 100644
index cedbb30e9e5..00000000000
--- a/emulators/gpsim/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/05/02 20:08:14 bouyer Exp $
-
---- src/uart.h.orig 2003-12-31 19:04:42.000000000 +0100
-+++ src/uart.h 2004-05-02 20:32:52.000000000 +0200
-@@ -135,6 +135,7 @@
- enum {
- RCSTA_DISABLED,
- RCSTA_WAITING_FOR_START,
-+ RCSTA_MAYBE_START,
- RCSTA_WAITING_MID1,
- RCSTA_WAITING_MID2,
- RCSTA_WAITING_MID3,
-@@ -162,7 +163,7 @@
- unsigned int rsr;
- unsigned int bit_count;
- unsigned int rx_bit;
-- unsigned int sample,state;
-+ unsigned int sample,state, sample_state;
- guint64 future_cycle, last_cycle;
-
- _RCSTA(void);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 07:41:17 +0000