diff options
author | tsutsui <tsutsui@pkgsrc.org> | 2010-06-07 13:34:00 +0000 |
---|---|---|
committer | tsutsui <tsutsui@pkgsrc.org> | 2010-06-07 13:34:00 +0000 |
commit | 6e3a63e2965e601197d4f766c7c2589085553f0b (patch) | |
tree | 7ba11ea6ba1c5d54b5d2790d04bf99adbba85c0a /emulators/tme | |
parent | 4bd7465d8e13243e77f45abcf4a7e2771489c7b5 (diff) | |
download | pkgsrc-6e3a63e2965e601197d4f766c7c2589085553f0b.tar.gz |
Update tme to 0.8.
The new version of tme, 0.8, can also emulate an Ultra 1, and
on x86 hosts with a supported host OS, the SPARCstation 2 and Ultra 1
emulations will now do dynamic binary translation. NetBSD 5.x seems
to run pretty well on the different emulations.
Diffstat (limited to 'emulators/tme')
-rw-r--r-- | emulators/tme/Makefile | 7 | ||||
-rw-r--r-- | emulators/tme/PLIST | 153 | ||||
-rw-r--r-- | emulators/tme/distinfo | 10 | ||||
-rw-r--r-- | emulators/tme/patches/patch-aa | 18 | ||||
-rw-r--r-- | emulators/tme/patches/patch-ab | 13 |
5 files changed, 188 insertions, 13 deletions
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index af6e5269747..a081e03ac9f 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2009/12/15 21:41:56 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2010/06/07 13:34:00 tsutsui Exp $ # -DISTNAME= tme-0.6 -PKGREVISION= 1 +DISTNAME= tme-0.8 CATEGORIES= emulators MASTER_SITES= http://csail.mit.edu/~fredette/tme/ @@ -27,7 +26,7 @@ CONFIGURE_ARGS+= --disable-debug BUILDLINK_DEPMETHOD.libXt?= build .include "../../devel/libltdl/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/emulators/tme/PLIST b/emulators/tme/PLIST index 0ddff294789..f9bfa2896c0 100644 --- a/emulators/tme/PLIST +++ b/emulators/tme/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:51:08 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2010/06/07 13:34:00 tsutsui Exp $ bin/tme-sun-eeprom bin/tme-sun-idprom bin/tmesh +include/tme/bus/upa.h include/tme/common.h +include/tme/completion.h include/tme/connection.h include/tme/element.h include/tme/generic/bus-device.h @@ -18,6 +20,8 @@ include/tme/generic/scsi.h include/tme/generic/serial.h include/tme/generic/tape.h include/tme/hash.h +include/tme/host/recode-mmap.h +include/tme/host/recode-x86.h include/tme/ic/am9513.h include/tme/ic/bt458.h include/tme/ic/i825x6.h @@ -33,10 +37,12 @@ include/tme/ic/sparc.h include/tme/ic/z8530.h include/tme/log.h include/tme/machine/sun.h -include/tme/misc.h -include/tme/module.h include/tme/memory-auto.h include/tme/memory.h +include/tme/misc.h +include/tme/module.h +include/tme/recode.h +include/tme/runlength.h include/tme/scsi/scsi-cdb.h include/tme/scsi/scsi-cdrom.h include/tme/scsi/scsi-device.h @@ -46,38 +52,175 @@ include/tme/scsi/scsi-tape.h include/tme/threads.h include/tme/tme.h include/tme/tmesh.h +include/tme/token.h +lib/libtme-generic.a lib/libtme-generic.la +lib/libtme-generic.so +lib/libtme-generic.so.0 +lib/libtme-generic.so.0.0.0 +lib/libtme-ieee754.a lib/libtme-ieee754.la +lib/libtme-ieee754.so +lib/libtme-ieee754.so.0 +lib/libtme-ieee754.so.0.0.0 +lib/libtme.a lib/libtme.la +lib/libtme.so +lib/libtme.so.0 +lib/libtme.so.0.0.0 +lib/libtmesh.a lib/libtmesh.la +lib/libtmesh.so +lib/libtmesh.so.0 +lib/libtmesh.so.0.0.0 +lib/tme/libtme-machine-sun.a lib/tme/libtme-machine-sun.la +lib/tme/libtme-machine-sun.so +lib/tme/libtme-machine-sun.so.0 +lib/tme/libtme-machine-sun.so.0.0.0 lib/tme/tme-plugins.txt +lib/tme/tme_bus_multibus.a lib/tme/tme_bus_multibus.la +lib/tme/tme_bus_multibus.so +lib/tme/tme_bus_multibus.so.0 +lib/tme/tme_bus_multibus.so.0.0.0 +lib/tme/tme_bus_sbus.a +lib/tme/tme_bus_sbus.la +lib/tme/tme_bus_sbus.so +lib/tme/tme_bus_sbus.so.0 +lib/tme/tme_bus_sbus.so.0.0.0 +lib/tme/tme_generic.a lib/tme/tme_generic.la +lib/tme/tme_generic.so +lib/tme/tme_generic.so.0 +lib/tme/tme_generic.so.0.0.0 +lib/tme/tme_host_bsd.a lib/tme/tme_host_bsd.la -lib/tme/tme_host_gtk.la +lib/tme/tme_host_bsd.so +lib/tme/tme_host_bsd.so.0 +lib/tme/tme_host_bsd.so.0.0.0 +lib/tme/tme_host_posix.a lib/tme/tme_host_posix.la -lib/tme/tme_bus_sbus.la +lib/tme/tme_host_posix.so +lib/tme/tme_host_posix.so.0 +lib/tme/tme_host_posix.so.0.0.0 +lib/tme/tme_ic_ad184x.a +lib/tme/tme_ic_ad184x.la +lib/tme/tme_ic_ad184x.so +lib/tme/tme_ic_ad184x.so.0 +lib/tme/tme_ic_ad184x.so.0.0.0 +lib/tme/tme_ic_am7930.a lib/tme/tme_ic_am7930.la +lib/tme/tme_ic_am7930.so +lib/tme/tme_ic_am7930.so.0 +lib/tme/tme_ic_am7930.so.0.0.0 +lib/tme/tme_ic_am7990.a lib/tme/tme_ic_am7990.la +lib/tme/tme_ic_am7990.so +lib/tme/tme_ic_am7990.so.0 +lib/tme/tme_ic_am7990.so.0.0.0 +lib/tme/tme_ic_am9513.a lib/tme/tme_ic_am9513.la +lib/tme/tme_ic_am9513.so +lib/tme/tme_ic_am9513.so.0 +lib/tme/tme_ic_am9513.so.0.0.0 +lib/tme/tme_ic_i825x6.a lib/tme/tme_ic_i825x6.la +lib/tme/tme_ic_i825x6.so +lib/tme/tme_ic_i825x6.so.0 +lib/tme/tme_ic_i825x6.so.0.0.0 +lib/tme/tme_ic_isil7170.a lib/tme/tme_ic_isil7170.la +lib/tme/tme_ic_isil7170.so +lib/tme/tme_ic_isil7170.so.0 +lib/tme/tme_ic_isil7170.so.0.0.0 +lib/tme/tme_ic_lsi64854.a lib/tme/tme_ic_lsi64854.la +lib/tme/tme_ic_lsi64854.so +lib/tme/tme_ic_lsi64854.so.0 +lib/tme/tme_ic_lsi64854.so.0.0.0 +lib/tme/tme_ic_m68k.a lib/tme/tme_ic_m68k.la +lib/tme/tme_ic_m68k.so +lib/tme/tme_ic_m68k.so.0 +lib/tme/tme_ic_m68k.so.0.0.0 +lib/tme/tme_ic_mk48txx.a lib/tme/tme_ic_mk48txx.la +lib/tme/tme_ic_mk48txx.so +lib/tme/tme_ic_mk48txx.so.0 +lib/tme/tme_ic_mk48txx.so.0.0.0 +lib/tme/tme_ic_mm58167.a lib/tme/tme_ic_mm58167.la +lib/tme/tme_ic_mm58167.so +lib/tme/tme_ic_mm58167.so.0 +lib/tme/tme_ic_mm58167.so.0.0.0 +lib/tme/tme_ic_ncr5380.a lib/tme/tme_ic_ncr5380.la +lib/tme/tme_ic_ncr5380.so +lib/tme/tme_ic_ncr5380.so.0 +lib/tme/tme_ic_ncr5380.so.0.0.0 +lib/tme/tme_ic_ncr53c9x.a lib/tme/tme_ic_ncr53c9x.la +lib/tme/tme_ic_ncr53c9x.so +lib/tme/tme_ic_ncr53c9x.so.0 +lib/tme/tme_ic_ncr53c9x.so.0.0.0 +lib/tme/tme_ic_ncr89c105.a +lib/tme/tme_ic_ncr89c105.la +lib/tme/tme_ic_ncr89c105.so +lib/tme/tme_ic_ncr89c105.so.0 +lib/tme/tme_ic_ncr89c105.so.0.0.0 +lib/tme/tme_ic_nec765.a lib/tme/tme_ic_nec765.la +lib/tme/tme_ic_nec765.so +lib/tme/tme_ic_nec765.so.0 +lib/tme/tme_ic_nec765.so.0.0.0 +lib/tme/tme_ic_sparc.a lib/tme/tme_ic_sparc.la +lib/tme/tme_ic_sparc.so +lib/tme/tme_ic_sparc.so.0 +lib/tme/tme_ic_sparc.so.0.0.0 +lib/tme/tme_ic_stp2024.a +lib/tme/tme_ic_stp2024.la +lib/tme/tme_ic_stp2024.so +lib/tme/tme_ic_stp2024.so.0 +lib/tme/tme_ic_stp2024.so.0.0.0 +lib/tme/tme_ic_stp22xx.a +lib/tme/tme_ic_stp22xx.la +lib/tme/tme_ic_stp22xx.so +lib/tme/tme_ic_stp22xx.so.0 +lib/tme/tme_ic_stp22xx.so.0.0.0 +lib/tme/tme_ic_z8530.a lib/tme/tme_ic_z8530.la +lib/tme/tme_ic_z8530.so +lib/tme/tme_ic_z8530.so.0 +lib/tme/tme_ic_z8530.so.0.0.0 +lib/tme/tme_machine_sun2.a lib/tme/tme_machine_sun2.la +lib/tme/tme_machine_sun2.so +lib/tme/tme_machine_sun2.so.0 +lib/tme/tme_machine_sun2.so.0.0.0 +lib/tme/tme_machine_sun3.a lib/tme/tme_machine_sun3.la +lib/tme/tme_machine_sun3.so +lib/tme/tme_machine_sun3.so.0 +lib/tme/tme_machine_sun3.so.0.0.0 +lib/tme/tme_machine_sun4.a lib/tme/tme_machine_sun4.la +lib/tme/tme_machine_sun4.so +lib/tme/tme_machine_sun4.so.0 +lib/tme/tme_machine_sun4.so.0.0.0 +lib/tme/tme_scsi.a lib/tme/tme_scsi.la +lib/tme/tme_scsi.so +lib/tme/tme_scsi.so.0 +lib/tme/tme_scsi.so.0.0.0 +lib/tme/tme_serial_kb.a lib/tme/tme_serial_kb.la +lib/tme/tme_serial_kb.so +lib/tme/tme_serial_kb.so.0 +lib/tme/tme_serial_kb.so.0.0.0 lib/tme/tmeconfig.h +share/examples/tme/SUN-ULTRA-1 share/examples/tme/SUN2-MULTIBUS share/examples/tme/SUN3-CARRERA share/examples/tme/SUN4-75 diff --git a/emulators/tme/distinfo b/emulators/tme/distinfo index 839d50b42f7..6ca0cc3eafb 100644 --- a/emulators/tme/distinfo +++ b/emulators/tme/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.9 2007/09/07 14:11:51 tsutsui Exp $ +$NetBSD: distinfo,v 1.10 2010/06/07 13:34:01 tsutsui Exp $ -SHA1 (tme-0.6.tar.gz) = bd5556eb2ae4a6999f46099166370491ee633a8b -RMD160 (tme-0.6.tar.gz) = b730faac06280c55c9355e375caf4f4b26365f50 -Size (tme-0.6.tar.gz) = 1700273 bytes +SHA1 (tme-0.8.tar.gz) = dd4f3421c20ceed548c5328a21dbb26e80f46b9c +RMD160 (tme-0.8.tar.gz) = 6bd505c5fa7810d37f436883383c4ba655df2ded +Size (tme-0.8.tar.gz) = 2100123 bytes +SHA1 (patch-aa) = e6095f8783c540fa2ae7f5c73b1d30f8f6cd79bc +SHA1 (patch-ab) = 3825986759da24c628b870a1493e4d37ec37358f diff --git a/emulators/tme/patches/patch-aa b/emulators/tme/patches/patch-aa new file mode 100644 index 00000000000..1f61b346d51 --- /dev/null +++ b/emulators/tme/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.5 2010/06/07 13:34:00 tsutsui Exp $ + +--- libtme/module.c.orig 2010-05-09 14:41:18.000000000 +0900 ++++ libtme/module.c 2010-05-09 15:03:22.000000000 +0900 +@@ -62,11 +62,13 @@ + #endif /* !lt_ptr_t */ + #endif /* !lt_ptr */ + ++#if 0 /* XXX: we always use pkgsrc/devel/libltdl */ + /* similarly, the installed libltdl may be so recent that its ltdl.h + renames lt_preloaded_symbols with a macro, to a name different from + what our libtool script makes. it's possible that the renaming + macro is meant to be undefined to handle this problem: */ + #undef lt_preloaded_symbols ++#endif + + /* types: */ + struct tme_module { diff --git a/emulators/tme/patches/patch-ab b/emulators/tme/patches/patch-ab new file mode 100644 index 00000000000..020adccf947 --- /dev/null +++ b/emulators/tme/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.5 2010/06/07 13:34:00 tsutsui Exp $ + +--- ic/sparc/sparc-execute.c 2010-02-21 06:58:15.000000000 +0900 ++++ ic/sparc/sparc-execute.c 2010-04-14 22:55:50.000000000 +0900 +@@ -612,7 +612,7 @@ + != pc_previous)) { + if (__tme_predict_true(((tme_sparc_ireg_t) (pc + sizeof(tme_uint32_t))) + == ic->tme_sparc_ireg(TME_SPARC_IREG_PC_NEXT))) { +- tme_recode_thunk_off_t insns_thunk; ++ tme_recode_thunk_off_t insns_thunk = 0; /* XXX gcc -Wuninitialized */ + + /* if the current instruction TLB entry is not the invalid TLB + entry, and there is an instructions thunk for this PC: */ |