head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.38 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.36 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.34 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.32 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.30 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.28 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.26 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.24 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.22 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.20 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.18 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.16 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.14 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.12 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.10 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.8 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.6 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.4 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.2 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.2.0.126 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.124 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.122 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.120 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.116 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.96 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.118 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.114 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.112 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.110 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.108 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.106 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.104 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.102 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.100 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.98 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.94 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.92 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.90 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.88 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.86 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.84 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.82 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.80 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.78 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.76 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.74 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.72 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.70 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.68 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.66 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.64 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.62 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.60 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.58 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.56 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.54 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.52 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.48 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.46 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.44 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.42 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.40 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.38 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.36 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.34 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.32 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.30 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.28 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.26 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.24 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.22 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.20 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.18 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.1.1.0.28 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.26 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.24 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.22 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.20 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 netbsd-1-4-RELEASE:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2021.08.27.03.41.41; author ryoon; state Exp; branches; next 1.2; commitid wIjhdTQDrTwXNy6D; 1.2 date 2006.06.30.22.14.49; author tron; state Exp; branches; next 1.1; 1.1 date 99.02.05.07.38.15; author nathanw; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.02.05.07.38.15; author nathanw; state Exp; branches; next ; desc @@ 1.3 log @xcopilot: Workaround for NetBSD/amd64. Bump PKGREVISION * Add workaround for NetBSD/amd64. Not tested under other LP64PLATFORMS and OSes. * Include some header files to resolve implicit uses. * Fix some warinigs. @ text @$NetBSD: patch-ac,v 1.2 2006/06/30 22:14:49 tron Exp $ --- mc68k/memory.c.orig 1998-08-25 04:52:56.000000000 +0000 +++ mc68k/memory.c @@@@ -346,9 +346,11 @@@@ verify_entrypoint(const void *rom) 0xff, 0xff, 0x00 }; const unsigned char *bootsign = _bootsign, *bootmask = _bootmask; - + char *p; + + p = (char *)rom; while ((*bootsign & *bootmask) == *bootsign) - if ((*((char *)rom)++ & *bootmask++) != *bootsign++) + if ((*p++ & *bootmask++) != *bootsign++) return 0; return 1; @@@@ -377,6 +379,7 @@@@ static int load_rom(const char *dir, con int i; char *rombuf; char *resetv; + void *tmpmemory; int f; struct stat st; @@@@ -405,12 +408,24 @@@@ static int load_rom(const char *dir, con rom_size = pow_of_2; } - rommemory = (UWORD*)mmap(0, rom_size, PROT_READ|PROT_WRITE, - MAP_FILE|MAP_PRIVATE, f, 0); - if (rommemory == (UWORD *)-1) { + /* mmap'ing a larger region than the underlying object does not work. + * Instead, mmap the actual object and copy into a power-of-two sized + * buffer. + */ + tmpmemory = mmap(0, st.st_size, PROT_READ|PROT_WRITE, + MAP_FILE|MAP_PRIVATE, f, 0); + if (tmpmemory == (void *)-1) { return PILOTCPU_ERROR_LOADING_ROM; } - + + /* We want the end of the buffer to be zero-filled */ + rommemory = (UWORD *) calloc(1, rom_size); + if (rommemory == 0) { + return PILOTCPU_ERROR_LOADING_ROM; + } + memcpy(rommemory, tmpmemory, st.st_size); + munmap(tmpmemory, st.st_size); + if (!nocheck) { /* Check if the reset vector looks plausible */ resetv = (char *)rommemory + @@@@ -430,23 +445,15 @@@@ static int load_rom(const char *dir, con offset = resetv - find_entrypoint((char *)rommemory); } - /* Did we find it? If not, lets go with the original. */ - if ((char *)offset != resetv) { - /* It may not always be page aligned... */ - pageoffset = ((offset-1) & ~(getpagesize() - 1)) + getpagesize(); - - if ((st.st_size + offset) > rom_size) - rom_size <<= 1; - - rommemory = (UWORD *)mmap((void*)(rommemory + pageoffset), - rom_size - pageoffset, - PROT_READ | PROT_WRITE, - MAP_FILE | MAP_PRIVATE | MAP_FIXED, f, 0); - if (rommemory == (UWORD *)-1) - return PILOTCPU_ERROR_LOADING_ROM; - - memcpy(((char *)rommemory) - offset, rommemory, 256); - ((char *)rommemory) -= offset; + if (offset != 0) { + if ((st.st_size + offset) > rom_size) { + rom_size <<= 1; + rommemory = realloc(rommemory, rom_size); + if (rommemory == 0) + return PILOTCPU_ERROR_LOADING_ROM; + } + + memmove((char *)rommemory + offset, rommemory, st.st_size); } } } @ 1.2 log @Fix build with GCC 4.x: - Use "stdlib.h" to get prototype for alloca() under NetBSD. - Remove bogus "extern" declaration for a variable which is declared "static" later. - Fix bad lvalue constructs. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- mc68k/memory.c.orig 1998-08-25 05:52:56.000000000 +0100 +++ mc68k/memory.c 2006-06-30 23:09:38.000000000 +0100 @@@@ -346,9 +346,11 @@@@ d12 1 a12 1 + p = (const char *)rom; d19 1 a19 1 @@@@ -377,6 +379,7 @@@@ d27 1 a27 1 @@@@ -405,12 +408,24 @@@@ d56 1 a56 1 @@@@ -430,23 +445,15 @@@@ @ 1.1 log @Initial revision @ text @d3 17 a19 3 --- mc68k/memory.c.orig Wed Feb 3 14:11:09 1999 +++ mc68k/memory.c Fri Feb 5 01:28:39 1999 @@@@ -377,6 +377,7 @@@@ d27 1 a27 1 @@@@ -405,12 +406,24 @@@@ d56 1 a56 1 @@@@ -430,23 +443,15 @@@@ @ 1.1.1.1 log @Initial import of XCopilot package, a PalmPilot (tm) emulator. @ text @@