head 1.10; access; symbols pkgsrc-2018Q4:1.9.0.72 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.70 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.68 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.66 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.64 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.62 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.58 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.56 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.54 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.52 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.50 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.48 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.46 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.44 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.42 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.40 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.38 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.36 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.34 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.32 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.30 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.28 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.26 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.24 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.22 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.20 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.18 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.16 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.14 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.12 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.10 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.8 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.6 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.4 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.2 pkgsrc-2010Q1:1.7.0.6 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.4 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.2 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.6.0.6 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.4 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.2 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.5.0.2 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.4.0.16 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.14 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.12 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.10 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.8 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.6 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.4 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.2 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.2 pkgsrc-2005Q4-base:1.1; locks; strict; comment @# @; 1.10 date 2019.01.04.13.35.16; author ryoon; state dead; branches; next 1.9; commitid 9UGgsXAcvjGK8t6B; 1.9 date 2010.07.02.14.41.50; author joerg; state Exp; branches 1.9.2.1; next 1.8; 1.8 date 2010.05.13.14.48.54; author tsutsui; state dead; branches; next 1.7; 1.7 date 2009.07.18.18.43.56; author tsutsui; state Exp; branches; next 1.6; 1.6 date 2008.10.24.19.31.01; author minskim; state Exp; branches; next 1.5; 1.5 date 2008.09.14.06.15.35; author tsutsui; state Exp; branches; next 1.4; 1.4 date 2006.11.09.20.01.55; author xtraeme; state dead; branches; next 1.3; 1.3 date 2006.09.17.16.38.12; author he; state Exp; branches; next 1.2; 1.2 date 2006.02.19.19.31.41; author xtraeme; state dead; branches; next 1.1; 1.1 date 2005.11.30.19.11.01; author rillig; state Exp; branches; next ; 1.9.2.1 date 2010.07.02.14.41.50; author agc; state dead; branches; next 1.9.2.2; 1.9.2.2 date 2010.07.04.07.14.40; author agc; state Exp; branches; next ; desc @@ 1.10 log @Update to 0.6.1 * Update MASTER_SITES and HOMEPAGE Changelog: * Support OpenBSD/sgi 6.4 * Add luna-88k and luna-88k2 emulations * Add i960 emulation stub @ text @$NetBSD: patch-aa,v 1.9 2010/07/02 14:41:50 joerg Exp $ --- src/main/fileloaders/FileLoader_aout.cc.orig 2010-07-02 14:06:41.000000000 +0000 +++ src/main/fileloaders/FileLoader_aout.cc @@@@ -265,7 +265,7 @@@@ bool FileLoader_aout::LoadIntoComponent( off_t oldpos = file.tellg(); file.seekg(0, std::ios_base::end); - int strings_len = file.tellg() - oldpos; + int strings_len = (off_t)file.tellg() - oldpos; file.seekg(oldpos, std::ios_base::beg); messages.flags(std::ios::dec); @ 1.9 log @Fix compilation. Fix PLIST. Bump revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.9.2.1 log @file patch-aa was added on branch pkgsrc-2010Q2 on 2010-07-04 07:14:40 +0000 @ text @d1 13 @ 1.9.2.2 log @Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching error, and to sync with reality. @ text @a0 13 $NetBSD: patch-aa,v 1.9 2010/07/02 14:41:50 joerg Exp $ --- src/main/fileloaders/FileLoader_aout.cc.orig 2010-07-02 14:06:41.000000000 +0000 +++ src/main/fileloaders/FileLoader_aout.cc @@@@ -265,7 +265,7 @@@@ bool FileLoader_aout::LoadIntoComponent( off_t oldpos = file.tellg(); file.seekg(0, std::ios_base::end); - int strings_len = file.tellg() - oldpos; + int strings_len = (off_t)file.tellg() - oldpos; file.seekg(oldpos, std::ios_base::beg); messages.flags(std::ios::dec); @ 1.8 log @Update gxemul to 0.6.0. Okay'ed by wiz@@, in PR pkg/43296 by me. --- The main change between release 0.4.7.2 and 0.6.0 is: * Since late 2007, a complete rewrite of the emulator's base framework has been going on. GXemul 0.6.0 is a very early release of the new framework. So far, only the testm88k machine mode has been rewritten to use the new framework, all other machine modes run in legacy mode using the old framework (which is still included). In other words: For most emulation modes, 0.6.0 will be exactly like 0.4.7.2. In addition to the new framework, a couple of other changes are worth mentioning: * Many unused, rarely used, and bogus emulation modes and features were removed, to reduce the maintenance burden. * Some operating systems listed on the guest OS page have had new releases; the documentation has been updated to reflect this. * New source code (but not the legacy part) is documented using Doxygen comments, and there is a unit testing framework in place. * There is now finally an install Makefile target, and the -j make option can be used to parallelize builds. Please read the HISTORY file for more details. --- Also update pkgsrc files: * update COMMENT and DESCR per the latest release note * remove MAKE_JOBS_SAFE=no as mentioned in the above changes list. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2009/07/18 18:43:56 tsutsui Exp $ d3 3 a5 21 A patch pulled from upstream trunk for NetBSD/arc: http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5473 --- src/promemul/arcbios.c 2009/07/04 19:41:47 +++ src/promemul/arcbios.c 2009/07/11 10:04:28 @@@@ -2363,20 +2363,19 @@@@ add_environment_string(cpu, "kernname=unix", &addr); } else { char *tmp; - size_t mlen = strlen(machine->bootarg) + - strlen("OSLOADOPTIONS=") + 2; + size_t mlen = ARC_BOOTSTR_BUFLEN; CHECK_ALLOCATION(tmp = malloc(mlen)); snprintf(tmp, mlen, "OSLOADOPTIONS=%s", machine->bootarg); - store_pointer_and_advance(cpu, &addr2, addr, is64bit); - add_environment_string(cpu, tmp, &addr); store_pointer_and_advance(cpu, &addr2, addr, is64bit); - add_environment_string(cpu, "OSLOADPARTITION=scsi(0)cdrom(6)" - "fdisk(0);scsi(0)disk(0)rdisk(0)partition(1)", &addr); + add_environment_string(cpu, tmp, &addr); d7 5 a11 9 store_pointer_and_advance(cpu, &addr2, addr, is64bit); - add_environment_string(cpu, "SYSTEMPARTITION=scsi(0)cdrom(6)" - "fdisk(0);scsi(0)disk(0)rdisk(0)partition(1)", &addr); + snprintf(tmp, mlen, + "OSLOADPARTITION=scsi(0)disk(%d)rdisk(0)partition(1)", + machine->bootdev_id); + add_environment_string(cpu, tmp, &addr); + free(tmp); } d13 1 a13 1 /* End the environment strings with an empty zero-terminated @ 1.7 log @Update gxemul to 0.4.7.2, and also pull some fixes from upstream trunk for running several NetBSD ports properly on the emulator. PR pkg/41742 Discussed with and okay'ed by wiz@@. Upstream changes: The changes between release 0.4.6.6 and 0.4.7 are: * Motorola 88K emulation is now complete enough to run a guest operating system: OpenBSD/mvme88k 4.4. A big thank you goes to Miod Vallat, who sent me physical 88100 documentation, via snail mail. This has been invaluable when implementing the 88K emulation mode. The changes between release 0.4.7 and 0.4.7.1 are: * Applying a man page hypenation patch from Jonathan Wiltshire. * Minor documentation errors fixed. * Some more missing M88K instructions added. * NetBSD/hpcmips can now be installed and run using serial console (i.e. without -X), in addition to using the framebuffer. The changes between release 0.4.7.1 and 0.4.7.2 are: * NetBSD 5.0, OpenBSD 4.5, and HelenOS 0.4.0 have been released, and the guest OS page has been updated to reflect this. (Not all versions and architectures work; the versions listed on the guest OS page are the latest ones that have been tested.) * A bug has been fixed which prevented configuration files from being used. Patches pulled from upstream trunk: patch-aa: Applying a patch for setting the ARCBIOS OSLOADPARTITION environment variable in a more correct way. http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5473 This makes NetBSD/arc work on PICA emulation with VGA console. (more proper fix than the previous patch-aa) patch-ab: Better fix for the Cobalt board ID number. http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5485 (fixes in the previous patch-ab has been integrated in the latest release) patch-ac: Applying a patch which makes NetBSD/hpcmips work well with the clock again. http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5472 pkgsrc changes: - update MASTER_SITES and HOMEPAGE (now they are in sourceforge) - update PLIST (add share/doc/gxemul/unsupported.html) @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Regen patch-aa with pkgdiff so that it conatins the NetBSD tag. @ text @d3 6 a8 15 --- src/promemul/arcbios.c.orig 2008-01-18 11:12:33.000000000 -0800 +++ src/promemul/arcbios.c @@@@ -2211,7 +2211,10 @@@@ static void arc_environment_setup(struct } if (machine->machine_type == MACHINE_ARC) - strlcat(init_bootpath, "\\", bootpath_len); + snprintf(init_bootpath + strlen(init_bootpath), + bootpath_len - strlen(init_bootpath), + "scsi(0)disk(%i)rdisk(0)partition(1)", + machine->bootdev_id); CHECK_ALLOCATION(machine->bootstr = malloc(ARC_BOOTSTR_BUFLEN)); @@@@ -2362,20 +2365,17 @@@@ static void arc_environment_setup(struct d17 3 a20 3 add_environment_string(cpu, tmp, &addr); - - store_pointer_and_advance(cpu, &addr2, addr, is64bit); d23 2 a24 1 - @ 1.5 log @Add a workaround to make NetBSD/arc work with vga/pckbd console. (set proper ARC environments to avoid cngetc() on boot device detection) Bump PKGREVISION. @ text @d1 5 a5 3 --- src/promemul/arcbios.c.orig 2007-08-30 05:36:35.000000000 +0900 +++ src/promemul/arcbios.c 2008-02-02 12:13:18.000000000 +0900 @@@@ -2211,7 +2211,10 @@@@ d17 1 a17 1 @@@@ -2362,20 +2365,17 @@@@ a43 1 @ 1.4 log @Update to 0.4.3. Changes between release 0.4.2 and 0.4.3 include, among other things: o) SuperH (SH4) emulation is now stable enough to let a NetBSD/dreamcast GENERIC_MD (ramdisk) kernel reach userland. o) There is now a simple framework for letting emulated clocks, as seen by guest operating systems, run at the same speed as the host clock. So far, the DECstation, MobilePro (hpcmips), NetWinder, CATS, Malta (evbmips), Cobalt, Algor, Dreamcast, and testmips machine modes use the new clock/timer framework. o) Some changes to the way expressions are evaluated in the built-in debugger, and some changes in command behaviour: x) Expressions (including assignments) can now be arbitrarily complex, using parentheses, and the following operators: + - * / % (modulo) ^ (xor) & (and) | (or) x) Some internal emulator variables can now be read/written using normal expressions. Examples of commands that did not work earlier, but should work now: print verbose r5 = sp - arch_pagesize * 4 machine[0].statistics_enabled = 1 x) To force a name to be interpreted as a setting/register name, a hash sign (#) is now used instead of the percentage sign (%). (In the new expression evaluator, % means arithmetic modulo.) x) The 'focus' command now also selects a cpu, in addition to selecting machine and emul. x) The 'reg' command only prints registers for one cpu now, not all cpus in the currently focused machine. o) The wdc (standard IDE controller) had a bug which prevented disk images larger than 2 GB to work correctly. This has been fixed. o) For MIPS emulation, some combinations of emulated processor + guest operating system should now work better when idling (i.e. the host should not run at 100% CPU): x) For MIPS32/MIPS64 and RM5200, the 'wait' instruction should now work more or less as expected. x) For VR41xx (e.g. MobilePro) emulation, the standby instruction should work like the 'wait' instruction. x) For R3000 emulation, where there is no hardware wait instruction, I've implemented "instruction combination" hacks for both NetBSD/pmax and Debian/pmax, so that their cpu idle loops are detected and treated almost as a wait instruction. o) MIPS 64-bit address translation (X=1) was not fully working before; TLB exception handling for xkseg and larger-than-2GB-userland should now actually work. (Thanks to Juli Mallett and Carl van Schaik for noticing these problems.) o) The mouse cursor update routines in DECstation (LK201) emulation previously used the fact that guest OSes set the _hardware_ cursor position. In order to support X Windows when emulating modern versions of NetBSD/pmax, which don't set the hardware position anymore, a workaround has been implemented which only sends relative coordinates to the guest OS. This has two drawbacks: 1. Ultrix emulation with dual- and tripple-head emulation will most likely feel very strange. It will still work, though. 2. Cursor movement feels "accelerated", because the emulator sends unaccelerated movements to the guest OS, which then accelerates them. This can however be compensated to some degree by running 'xset m 1 0' in the guest OS. Having weird accelerated mouse movement is better than having no mouse support at all, so this change was necessary. @ text @d1 13 a13 5 $NetBSD: patch-aa,v 1.3 2006/09/17 16:38:12 he Exp $ --- src/devices/dev_footbridge.c.orig 2006-02-09 21:07:12.000000000 +0100 +++ src/devices/dev_footbridge.c @@@@ -85,10 +85,18 @@@@ void dev_footbridge_tick(struct cpu *cpu d15 25 a39 13 if (d->timer_value[i] > amount) d->timer_value[i] -= amount; - else - d->timer_value[i] = 0; + else { + if (d->timer_control[i] & TIMER_MODE_PERIODIC) + d->timer_value[i] = 0; + else { + /* free-running timer */ + d->timer_value[i] -= amount; + d->timer_value[i] &= TIMER_MAX_VAL; + } + } d41 2 a42 6 - if (d->timer_value[i] == 0) { + if ((d->timer_control[i] & TIMER_MODE_PERIODIC) && + (d->timer_value[i] == 0)) { d->timer_tick_countdown[i] --; if (d->timer_tick_countdown[i] > 0) continue; @ 1.3 log @Add a patch which implements free-running timers on footbridge, as found on cats and netwinder. This gets a NetBSD/cats -current install kernel booting again after the move to timecounters. Before this change, the emulated kernel would loop during the tlp0 attachment, inside delay(). Note, I'm guessing that a free-running timer should not generate an interrupt on wrap (I don't have the hardware documentation). Patch sent upstream. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to 0.3.8: The user-visible changes between release 0.3.7 and 0.3.8 include: o) The IQ80321 (Xscale) machine mode is now working well enough to run NetBSD/evbarm 2.1. o) Faster framebuffer output in some situations. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/11/30 19:11:01 rillig Exp $ d3 3 a5 5 ISO C90 does not allow code intermixed with declarations. --- src/cpus/memory_ppc.c.orig Tue Nov 22 22:56:18 2005 +++ src/cpus/memory_ppc.c Wed Nov 30 20:08:16 2005 @@@@ -57,11 +57,13 @@@@ int ppc_bat(struct cpu *cpu, uint64_t va d7 13 a19 13 /* 4 instruction BATs, 4 data BATs... */ for (i=0; i<8; i++) { + uint32_t upper, lower, phys, ebs, mask; + regnr = SPR_IBAT0U + i * 2; - uint32_t upper = cpu->cd.ppc.spr[regnr]; - uint32_t lower = cpu->cd.ppc.spr[regnr + 1]; - uint32_t phys = lower & BAT_RPN, ebs = upper & BAT_EPI; - uint32_t mask = ((upper & BAT_BL) << 15) | 0x1ffff; + upper = cpu->cd.ppc.spr[regnr]; + lower = cpu->cd.ppc.spr[regnr + 1]; + phys = lower & BAT_RPN, ebs = upper & BAT_EPI; + mask = ((upper & BAT_BL) << 15) | 0x1ffff; d21 6 a26 2 /* Instruction BAT, but not instruction lookup? Then skip. */ if (i < 4 && !(flags & FLAG_INSTR)) @ 1.1 log @Added a patch for ISO C90 compatibility. @ text @d1 1 a1 1 $NetBSD$ @