pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/gxemul gxemul: Update to 0.6.3 really
details: https://anonhg.NetBSD.org/pkgsrc/rev/6e89215839c1
branches: trunk
changeset: 447595:6e89215839c1
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Mon Feb 22 14:03:35 2021 +0000
description:
gxemul: Update to 0.6.3 really
diffstat:
emulators/gxemul/PLIST | 8 +-
emulators/gxemul/distinfo | 26 +-
emulators/gxemul/patches/patch-doc_networking.html | 120 -
emulators/gxemul/patches/patch-src_cpus_cpu__mips__instr__loadstore.cc | 44 -
emulators/gxemul/patches/patch-src_devices_dev_dec21143.cc | 890 ----------
emulators/gxemul/patches/patch-src_devices_dev_ether.cc | 74 -
emulators/gxemul/patches/patch-src_devices_dev_le.cc | 232 --
emulators/gxemul/patches/patch-src_devices_dev_rtl8139c.cc | 51 -
emulators/gxemul/patches/patch-src_devices_dev_sgi_mec.cc | 69 -
emulators/gxemul/patches/patch-src_devices_dev_sn.cc | 40 -
emulators/gxemul/patches/patch-src_include_net.h | 107 -
emulators/gxemul/patches/patch-src_net_Makefile.skel | 15 -
emulators/gxemul/patches/patch-src_net_net.cc | 318 ---
emulators/gxemul/patches/patch-src_net_net_ether.cc | 150 -
emulators/gxemul/patches/patch-src_net_net_ip.cc | 238 --
emulators/gxemul/patches/patch-src_net_net_tap.cc | 192 --
emulators/gxemul/patches/patch-src_old_main_emul.cc | 14 -
emulators/gxemul/patches/patch-src_old_main_emul_parse.cc | 38 -
18 files changed, 12 insertions(+), 2614 deletions(-)
diffs (truncated from 2716 to 300 lines):
diff -r e5e1aca57567 -r 6e89215839c1 emulators/gxemul/PLIST
--- a/emulators/gxemul/PLIST Mon Feb 22 10:37:30 2021 +0000
+++ b/emulators/gxemul/PLIST Mon Feb 22 14:03:35 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2019/08/23 13:13:49 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.29 2021/02/22 14:03:35 ryoon Exp $
bin/gxemul
man/man1/gxemul.1
share/doc/gxemul/20040504-ultrix45-boot1.png
@@ -112,6 +112,8 @@
share/doc/gxemul/20190612-netbsd-sgimips-2_small.png
share/doc/gxemul/20190616-netbsd-playstation2-userland-small.png
share/doc/gxemul/20190616-netbsd-playstation2-userland.png
+share/doc/gxemul/20190715-sgi-o2-linux-small.png
+share/doc/gxemul/20190715-sgi-o2-linux.png
share/doc/gxemul/Doxyfile
share/doc/gxemul/HISTORY
share/doc/gxemul/LICENSE
@@ -197,6 +199,10 @@
share/doc/gxemul/misc.html
share/doc/gxemul/model.png
share/doc/gxemul/networking.html
+share/doc/gxemul/openbsd-luna88k-20210130-small.png
+share/doc/gxemul/openbsd-luna88k-20210130.png
+share/doc/gxemul/openbsd-luna88k-20210209-small.png
+share/doc/gxemul/openbsd-luna88k-20210209.png
share/doc/gxemul/openbsd-pmax-20040710.png
share/doc/gxemul/openbsd-pmax-20040710_small.png
share/doc/gxemul/sgi-o2-real.jpg
diff -r e5e1aca57567 -r 6e89215839c1 emulators/gxemul/distinfo
--- a/emulators/gxemul/distinfo Mon Feb 22 10:37:30 2021 +0000
+++ b/emulators/gxemul/distinfo Mon Feb 22 14:03:35 2021 +0000
@@ -1,22 +1,6 @@
-$NetBSD: distinfo,v 1.62 2021/01/16 16:49:36 skrll Exp $
+$NetBSD: distinfo,v 1.63 2021/02/22 14:03:35 ryoon Exp $
-SHA1 (gxemul-0.6.2.tar.gz) = aabaeba783e70be952ab0056bf84d0f2b70c2155
-RMD160 (gxemul-0.6.2.tar.gz) = ccac73d82446f89792b1fc803bee623813f3aab2
-SHA512 (gxemul-0.6.2.tar.gz) = 4f389c509f9ecf39603ceed50e899e2bee285d3fefac9b3214076115ee71b5a7a68d1d92690b6debc8de5cf5f0303da83b3cc921a5c0b5eb4c7ad89baa730b59
-Size (gxemul-0.6.2.tar.gz) = 5897883 bytes
-SHA1 (patch-doc_networking.html) = dd7a1519a678196fd5a835317a32ba483630ece8
-SHA1 (patch-src_cpus_cpu__mips__instr__loadstore.cc) = 378c514ddf3b93279b2c479f21b77447d83d5afd
-SHA1 (patch-src_devices_dev_dec21143.cc) = 52f36741038c76a2dbafc7da6737e816aed5c9f9
-SHA1 (patch-src_devices_dev_ether.cc) = 00221e09530743e81faedcc75ee951fa853d0e2c
-SHA1 (patch-src_devices_dev_le.cc) = a728e8008a7a9f33aaf95811a33ebac2cb86e80e
-SHA1 (patch-src_devices_dev_rtl8139c.cc) = ee6dbba7c7c9c62c50493c476297ee5ac89d2b83
-SHA1 (patch-src_devices_dev_sgi_mec.cc) = 24b1259350faf60265df7958f0f680302f475e8e
-SHA1 (patch-src_devices_dev_sn.cc) = e939521be1630f51e7ddc67abe90980de38e8837
-SHA1 (patch-src_include_net.h) = 4d31fcefe384fcc9d68255825240c89b45acc92e
-SHA1 (patch-src_net_Makefile.skel) = 4738229a928b9cb5a2531dfc357297f91e9fdc09
-SHA1 (patch-src_net_net.cc) = 57397c9a8197ee25e7faa8c0733273014e3e0670
-SHA1 (patch-src_net_net_ether.cc) = ef7464dbb0812a9cb8d5be806db07cc19853fc1e
-SHA1 (patch-src_net_net_ip.cc) = f5615f3b347e9bdcd256fa4b5b1594473fd2e5e4
-SHA1 (patch-src_net_net_tap.cc) = f913b3efb51bc4a8080420988d5fc845e8a38f73
-SHA1 (patch-src_old_main_emul.cc) = 0b1106745e7c5d320e93f9f7775d8ced6109c089
-SHA1 (patch-src_old_main_emul_parse.cc) = 23048bc3a0a83fd189b3bbd4656ef0e1a2c23b99
+SHA1 (gxemul-0.6.3.tar.gz) = 433b26f34205924c4a0febd37ed9df3769da0111
+RMD160 (gxemul-0.6.3.tar.gz) = c155accc030fc63002be3a72aae1e6b33d027878
+SHA512 (gxemul-0.6.3.tar.gz) = 30bdb926ab180a44b277b734d5ff4d31b8f0a8b580c6976226f6ed1952cb50d16e18591591d6aeee243c5b3e9d27b71d24a3cba3906bcb332399f46a1ebd8ac5
+Size (gxemul-0.6.3.tar.gz) = 6024573 bytes
diff -r e5e1aca57567 -r 6e89215839c1 emulators/gxemul/patches/patch-doc_networking.html
--- a/emulators/gxemul/patches/patch-doc_networking.html Mon Feb 22 10:37:30 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-$NetBSD: patch-doc_networking.html,v 1.1 2020/10/07 00:43:05 thorpej Exp $
-
-Document tap(4)-based networking.
-
---- doc/networking.html.orig 2020-10-05 22:53:41.969487340 +0000
-+++ doc/networking.html 2020-10-05 22:54:17.309695478 +0000
-@@ -46,6 +46,7 @@ SUCH DAMAGE.
- <p><br>
- <ul>
- <li><a href="#intro">Introduction</a>
-+ <li><a href="#tap">Virtual Ethernet switch using a tap device</a>
- <li><a href="#multihost">Network across multiple hosts</a>
- <li><a href="#direct_example_1">Direct-access example 1: udp_snoop</a>
- </ul>
-@@ -60,9 +61,11 @@ SUCH DAMAGE.
- <a name="intro"></a>
- <h3>Introduction:</h3>
-
--<p>GXemul's current networking layer supports two modes:
-+<p>GXemul's current networking layer supports three modes:
-
- <p><ol>
-+ <li>A vitual Ethernet switch built on top of a <i>tap</i> device.
-+ <p>
- <li>A NAT-like layer, which allows guest OSes to access the outside
- internet world (IPv4 only, so far). When only one machine is being
- emulated, the following default values apply to the guest OS:<pre>
-@@ -78,7 +81,7 @@ SUCH DAMAGE.
- ethernet packages from/to the emulator.
- </ol>
-
--<p><i>NOTE:</i> Both these modes have problems. The NAT-like layer is very
-+<p><i>NOTE:</i> The latter two modes have problems. The NAT-like layer is very
- "hackish" and was only meant as a proof-of-concept, to see if networking
- like this would work with e.g. NetBSD as a guest OS. (If you are
- interested in the technical details, and the reasons why NAT networking is
-@@ -120,6 +123,83 @@ href="machine_decstation.html#netbsdpmax
-
-
-
-+<p><br>
-+<a name="tap"></a>
-+<h3>Virtual Ethernet switch using a <i>tap</i> device:</h3>
-+
-+<p>The simplest way to emulate a real Ethernet network is using a <i>tap</i>
-+device. In this mode, the emulator disables the simulated NAT and
-+direct-access machinery and internally treats all emulated NICs as if
-+they are on a single Ethernet switch. In this mode, packets destined for
-+the guest's specific MAC address as well as Ethernet multicast and broadcast
-+packets are send to the individual guest instances. Individual NIC
-+emulations may also apply their own multicast filtering; multcast filtering
-+is implemented for the DEC 21143 and Lance NICs.
-+
-+<p>The <i>tap</i> interface on the host can be thought of as an upstream
-+link on the virtual Ethernet switch. In addition to providing a "port"
-+for the host, the <i>tap</i> interface can be bridged to a physical Ethernet
-+port on the host, allowing the guests to access the host's connected LAN.
-+
-+<p>Networking services such as DHCP and DNS must be provided either by
-+the host or by the host's connected LAN.
-+
-+<p>Support for the <i>tap</i> device was developed on NetBSD, but should
-+also work on FreeBSD, OpenBSD, and Linux hosts.
-+
-+<p>Here is a simple example:
-+
-+<p><pre>
-+<font color="#2020cf">! Configuration file for
-+! virtual Ethernet switch networking
-+! using a tap device.</font>
-+
-+<b>net(</b>
-+ <b>tapdev(</b><font color="#ff003f">"/dev/tap0"</font><b>)</b>
-+<b>)</b>
-+<b>machine(</b>
-+ <b>name(<font color="#ff003f">"guest machine"</font>)</b>
-+
-+ <b>type(<font color="#ff003f">"dec"</font>)</b>
-+ <b>subtype(<font color="#ff003f">"5000/200"</font>)</b>
-+
-+ <font color="#2020cf">! Add a disk, etc.</font>
-+<b>)</b>
-+</pre>
-+
-+<p>Before starting the emulator, you will need to create the <i>tap</i>
-+interface on the host. Here is an example for NetBSD:
-+
-+<p><pre>
-+<b>#ifconfig tap0 create up</b>
-+</pre>
-+
-+<p>If you wish to simply network the host and the guests together, then
-+simply assign an IP address to the <i>tap</i> interface on the host:
-+
-+<p><pre>
-+<b># ifconfig tap0 10.0.0.254</b>
-+</pre>
-+
-+<p>You can now run a DHCP server on the host for the guests, or you can
-+configure the guests manually.
-+
-+<p>If instead you would like to bridge to the host's connected LAN,
-+Here is an example for NetBSD:
-+
-+<p><pre>
-+<b># ifconfig bridge0 create up</b>
-+<b># brconfig add tap0 add wm0</b>
-+</pre>
-+
-+<p>Although it <i>is</i> possible to have more than one machine per
-+configuration file, I strongly recommend against it. Please use one
-+configuration file for one emulated machine. Each configuration file
-+must have a unique <i>tap</i> instance, and machines in separate
-+configuration files must use bridged <i>tap</i> devices if they wish
-+to communicate with each other as if on the same LAN.
-+
-+
-
- <p><br>
- <a name="multihost"></a>
diff -r e5e1aca57567 -r 6e89215839c1 emulators/gxemul/patches/patch-src_cpus_cpu__mips__instr__loadstore.cc
--- a/emulators/gxemul/patches/patch-src_cpus_cpu__mips__instr__loadstore.cc Mon Feb 22 10:37:30 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-src_cpus_cpu__mips__instr__loadstore.cc,v 1.1 2021/01/16 16:49:36 skrll Exp $
-
---- src/cpus/cpu_mips_instr_loadstore.cc.orig 2021-01-16 16:33:52.314709654 +0000
-+++ src/cpus/cpu_mips_instr_loadstore.cc
-@@ -58,6 +58,30 @@ void LS_GENERIC_N(struct cpu *cpu, struc
- /* Check alignment: */
- if (addr & (LS_SIZE - 1)) {
- #if 1
-+ uint64_t vaddr_vpn2=0, vaddr_asid=0;
-+
-+ int exc_model = cpu->cd.mips.cpu_type.exc_model;
-+ struct mips_coproc *cp0 = cpu->cd.mips.coproc[0];
-+
-+ if (exc_model == EXC3K) {
-+ vaddr_asid = (cp0->reg[COP0_ENTRYHI] &
-+ R2K3K_ENTRYHI_ASID_MASK) >>
-+ R2K3K_ENTRYHI_ASID_SHIFT;
-+ vaddr_vpn2 = (addr & R2K3K_ENTRYHI_VPN_MASK) >>
-+ R2K3K_ENTRYHI_VPN_SHIFT;
-+ } else {
-+ vaddr_asid = cp0->reg[COP0_ENTRYHI] & ENTRYHI_ASID;
-+
-+ if (cpu->cd.mips.cpu_type.mmu_model == MMU10K) {
-+ vaddr_vpn2 = (addr &
-+ ENTRYHI_VPN2_MASK_R10K) >>
-+ ENTRYHI_VPN2_SHIFT;
-+ } else {
-+ vaddr_vpn2 = (addr & ENTRYHI_VPN2_MASK) >>
-+ ENTRYHI_VPN2_SHIFT;
-+ }
-+ }
-+
- /* Cause an address alignment exception: */
- mips_cpu_exception(cpu,
- #ifdef LS_LOAD
-@@ -65,7 +89,7 @@ void LS_GENERIC_N(struct cpu *cpu, struc
- #else
- EXCEPTION_ADES,
- #endif
-- 0, addr, 0, 0, 0, 0);
-+ 0, addr, 0, vaddr_vpn2, vaddr_asid, 0);
- #else
- fatal("{ mips dyntrans alignment exception, size = %i,"
- " addr = %016"PRIx64", pc = %016"PRIx64" }\n", LS_SIZE,
diff -r e5e1aca57567 -r 6e89215839c1 emulators/gxemul/patches/patch-src_devices_dev_dec21143.cc
--- a/emulators/gxemul/patches/patch-src_devices_dev_dec21143.cc Mon Feb 22 10:37:30 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,890 +0,0 @@
-$NetBSD: patch-src_devices_dev_dec21143.cc,v 1.1 2020/10/07 00:43:05 thorpej Exp $
-
-- Add support for tap(4)-based networking.
-- Process the setup packet, and implement all of the Tulip receive
- filtering modes.
-- Add ugly hack to deal with PCI vs. CPU views of main memory differences
- between systems.
-
---- src/devices/dev_dec21143.cc.orig 2020-10-05 22:54:55.903897678 +0000
-+++ src/devices/dev_dec21143.cc 2020-10-05 22:55:15.711704852 +0000
-@@ -45,8 +45,6 @@
- * o) Handle _writes_ to MII registers.
- * o) Make it work with modern Linux kernels (as a guest OS).
- * o) Endianness for descriptors? If necessary.
-- * o) Actually handle the "Setup" packet.
-- * o) MAC filtering on incoming packets.
- * o) Don't hardcode as many values.
- */
-
-@@ -76,16 +74,15 @@
- #define ROM_WIDTH 6
-
- struct dec21143_data {
-+ /* NIC common data */
-+ struct nic_data nic;
-+
- struct interrupt irq;
- int irq_was_asserted;
-
- /* PCI: */
- int pci_little_endian;
-
-- /* Ethernet address, and a network which we are connected to: */
-- uint8_t mac[6];
-- struct net *net;
--
- /* SROM emulation: */
- uint8_t srom[1 << (ROM_WIDTH + 1)];
- int srom_curbit;
-@@ -105,19 +102,66 @@ struct dec21143_data {
- uint32_t reg[N_REGS];
-
- /* Internal TX state: */
-- uint64_t cur_tx_addr;
-+ uint32_t cur_tx_addr;
- unsigned char *cur_tx_buf;
- int cur_tx_buf_len;
- int tx_idling;
- int tx_idling_threshold;
-
- /* Internal RX state: */
-- uint64_t cur_rx_addr;
-+ uint32_t cur_rx_addr;
- unsigned char *cur_rx_buf;
- int cur_rx_buf_len;
- int cur_rx_offset;
-+
-+ /*
-+ * Receive filter information. We keep our own copy of
-+ * the promiscuous flag because to implement some of the
-+ * filtering modes, we need to tell the network layer that
-+ * we want all packets.
-+ */
-+ int (*drop_packet)(struct net *, struct dec21143_data *);
Home |
Main Index |
Thread Index |
Old Index