head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.4 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.2 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.1.1.1.0.114 pkgsrc-2025Q3-base:1.1.1.1 pkgsrc-2025Q2:1.1.1.1.0.112 pkgsrc-2025Q2-base:1.1.1.1 pkgsrc-2025Q1:1.1.1.1.0.110 pkgsrc-2025Q1-base:1.1.1.1 pkgsrc-2024Q4:1.1.1.1.0.108 pkgsrc-2024Q4-base:1.1.1.1 pkgsrc-2024Q3:1.1.1.1.0.106 pkgsrc-2024Q3-base:1.1.1.1 pkgsrc-2024Q2:1.1.1.1.0.104 pkgsrc-2024Q2-base:1.1.1.1 pkgsrc-2024Q1:1.1.1.1.0.102 pkgsrc-2024Q1-base:1.1.1.1 pkgsrc-2023Q4:1.1.1.1.0.100 pkgsrc-2023Q4-base:1.1.1.1 pkgsrc-2023Q3:1.1.1.1.0.98 pkgsrc-2023Q3-base:1.1.1.1 pkgsrc-2023Q2:1.1.1.1.0.96 pkgsrc-2023Q2-base:1.1.1.1 pkgsrc-2023Q1:1.1.1.1.0.94 pkgsrc-2023Q1-base:1.1.1.1 pkgsrc-2022Q4:1.1.1.1.0.92 pkgsrc-2022Q4-base:1.1.1.1 pkgsrc-2022Q3:1.1.1.1.0.90 pkgsrc-2022Q3-base:1.1.1.1 pkgsrc-2022Q2:1.1.1.1.0.88 pkgsrc-2022Q2-base:1.1.1.1 pkgsrc-2022Q1:1.1.1.1.0.86 pkgsrc-2022Q1-base:1.1.1.1 pkgsrc-2021Q4:1.1.1.1.0.84 pkgsrc-2021Q4-base:1.1.1.1 pkgsrc-2021Q3:1.1.1.1.0.82 pkgsrc-2021Q3-base:1.1.1.1 pkgsrc-2021Q2:1.1.1.1.0.80 pkgsrc-2021Q2-base:1.1.1.1 pkgsrc-2021Q1:1.1.1.1.0.78 pkgsrc-2021Q1-base:1.1.1.1 pkgsrc-2020Q4:1.1.1.1.0.76 pkgsrc-2020Q4-base:1.1.1.1 pkgsrc-2020Q3:1.1.1.1.0.74 pkgsrc-2020Q3-base:1.1.1.1 pkgsrc-2020Q2:1.1.1.1.0.70 pkgsrc-2020Q2-base:1.1.1.1 pkgsrc-2020Q1:1.1.1.1.0.50 pkgsrc-2020Q1-base:1.1.1.1 pkgsrc-2019Q4:1.1.1.1.0.72 pkgsrc-2019Q4-base:1.1.1.1 pkgsrc-2019Q3:1.1.1.1.0.68 pkgsrc-2019Q3-base:1.1.1.1 pkgsrc-2019Q2:1.1.1.1.0.66 pkgsrc-2019Q2-base:1.1.1.1 pkgsrc-2019Q1:1.1.1.1.0.64 pkgsrc-2019Q1-base:1.1.1.1 pkgsrc-2018Q4:1.1.1.1.0.62 pkgsrc-2018Q4-base:1.1.1.1 pkgsrc-2018Q3:1.1.1.1.0.60 pkgsrc-2018Q3-base:1.1.1.1 pkgsrc-2018Q2:1.1.1.1.0.58 pkgsrc-2018Q2-base:1.1.1.1 pkgsrc-2018Q1:1.1.1.1.0.56 pkgsrc-2018Q1-base:1.1.1.1 pkgsrc-2017Q4:1.1.1.1.0.54 pkgsrc-2017Q4-base:1.1.1.1 pkgsrc-2017Q3:1.1.1.1.0.52 pkgsrc-2017Q3-base:1.1.1.1 pkgsrc-2017Q2:1.1.1.1.0.48 pkgsrc-2017Q2-base:1.1.1.1 pkgsrc-2017Q1:1.1.1.1.0.46 pkgsrc-2017Q1-base:1.1.1.1 pkgsrc-2016Q4:1.1.1.1.0.44 pkgsrc-2016Q4-base:1.1.1.1 pkgsrc-2016Q3:1.1.1.1.0.42 pkgsrc-2016Q3-base:1.1.1.1 pkgsrc-2016Q2:1.1.1.1.0.40 pkgsrc-2016Q2-base:1.1.1.1 pkgsrc-2016Q1:1.1.1.1.0.38 pkgsrc-2016Q1-base:1.1.1.1 pkgsrc-2015Q4:1.1.1.1.0.36 pkgsrc-2015Q4-base:1.1.1.1 pkgsrc-2015Q3:1.1.1.1.0.34 pkgsrc-2015Q3-base:1.1.1.1 pkgsrc-2015Q2:1.1.1.1.0.32 pkgsrc-2015Q2-base:1.1.1.1 pkgsrc-2015Q1:1.1.1.1.0.30 pkgsrc-2015Q1-base:1.1.1.1 pkgsrc-2014Q4:1.1.1.1.0.28 pkgsrc-2014Q4-base:1.1.1.1 pkgsrc-2014Q3:1.1.1.1.0.26 pkgsrc-2014Q3-base:1.1.1.1 pkgsrc-2014Q2:1.1.1.1.0.24 pkgsrc-2014Q2-base:1.1.1.1 pkgsrc-2014Q1:1.1.1.1.0.22 pkgsrc-2014Q1-base:1.1.1.1 pkgsrc-2013Q4:1.1.1.1.0.20 pkgsrc-2013Q4-base:1.1.1.1 pkgsrc-2013Q3:1.1.1.1.0.18 pkgsrc-2013Q3-base:1.1.1.1 pkgsrc-2013Q2:1.1.1.1.0.16 pkgsrc-2013Q2-base:1.1.1.1 pkgsrc-2013Q1:1.1.1.1.0.14 pkgsrc-2013Q1-base:1.1.1.1 pkgsrc-2012Q4:1.1.1.1.0.12 pkgsrc-2012Q4-base:1.1.1.1 pkgsrc-2012Q3:1.1.1.1.0.10 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.8 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.6 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-2011Q4:1.1.1.1.0.4 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.2 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2025.10.12.02.03.10; author mrg; state Exp; branches; next 1.1; commitid 884PI1dWVGfKOdeG; 1.1 date 2011.07.27.10.23.49; author cherry; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2011.07.27.10.23.49; author cherry; state Exp; branches; next ; desc @@ 1.2 log @minor updates needed for GCC 14. @ text @$NetBSD: patch-al,v 1.1.1.1 2011/07/27 10:23:49 cherry Exp $ --- src/netbsd/signal-netbsd.c.orig 2025-10-11 18:33:53.088993767 -0700 +++ src/netbsd/signal-netbsd.c 2025-10-11 18:42:36.295252290 -0700 @@@@ -0,0 +1,171 @@@@ +/* + * Copyright (C) 1995-2007, Hewlett-Packard Development Company, L.P. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include +#include +#include + +#include "std.h" +#include "types.h" +#include "exportui.h" +#include "coreui.h" +#include "sim.h" +#include "libsrs.h" +#include "libcore.h" +#include "state.h" + +#include "netbsd/signal-netbsd.h" + +static struct { + int valid; + int flags; + ADDR handler; + sigset_t mask; + struct siginfo64 info; +} siginfo[SIGRTMAX]; + +static sigset_t sigpend, sigmask; + +void signal_return(void) +{ + assert(0); +} + +void signal_invoke_handler(int in_syscall) +{ + int i, sig; + uint32_t sigword; + + for (i = 0, sig = 0; i < _SIG_WORDS; i++, sig += 32) { + sigword = sigpend.__bits[i] & ~sigmask.__bits[i]; + if (sigword) + break; + } + assert(sigword); + sig += ffs(sigword); + assert(sig > 0 && sig <= SIGRTMAX); + + /* XXX need to actually deliver the signal. Ignore for now. */ + sigdelset(&sigpend, sig); +} + +int signal_pending(void) +{ + int i; + + for (i = 0; i < _SIG_WORDS; i++) { + if (sigpend.__bits[i] && + sigpend.__bits[i] & ~sigmask.__bits[i]) + return (1); + } + return (0); +} + +void signal_queue_info(int sig, ADDR ifa) +{ + struct siginfo64 *si64; + + /* Sanity checks. */ + if (sig <= 0 || sig > SIGRTMAX) + return; + + /* XXX We need to deliver the trap. For now, halt the program. */ + progStop("Got trap %d (IFA=0x%016llx, IP=0x%016llx)\n", sig, ifa, ip); + + sigaddset(&sigpend, sig); + si64 = &siginfo[sig - 1].info; + memset(si64, 0, sizeof(*si64)); + si64->si_addr = (void *)ifa; /* XXX: normalise pointers to ptr64_t */ +} + +static void signal_handler(int sig, siginfo_t *si, void *uc) +{ + struct siginfo64 *si64; + + /* Sanity checks. */ + if (sig <= 0 || sig > SIGRTMAX) { + return; + } + +#if 0 + printf("Got signal %d\n", sig); +#endif + + sigaddset(&sigpend, sig); + si64 = &siginfo[sig - 1].info; + si64->si_signo = sig; + si64->si_errno = si->si_errno; + si64->si_code = si->si_code; + si64->si_pid = si->si_pid; + si64->si_uid = si->si_uid; + si64->si_status = si->si_status; + si64->si_addr = (void *)(uintptr_t)si->si_addr; + si64->si_value.sival_ptr = si->si_value.sival_ptr; + si64->si_band = si->si_band; +} + +int signal_get_handler(int sig, struct sigaction64 *sa64) +{ + struct sigaction sa; + + if (sig <= 0 || sig > SIGRTMAX) + return (EINVAL); + + if (!siginfo[sig - 1].valid) { + if (sigaction(sig, NULL, &sa) == -1) + return (errno); + siginfo[sig - 1].valid = 1; + siginfo[sig - 1].handler = 0; + siginfo[sig - 1].flags = sa.sa_flags; + siginfo[sig - 1].mask = sa.sa_mask; + } + sa64->sa_handler = siginfo[sig - 1].handler; + sa64->sa_flags = siginfo[sig - 1].flags; + sa64->sa_mask = siginfo[sig - 1].mask; + return (0); +} + +int signal_set_handler(int sig, struct sigaction64 *sa64) +{ + struct sigaction sa; + + if (sig <= 0 || sig > SIGRTMAX) + return (EINVAL); + + sa.sa_flags = sa64->sa_flags; + sa.sa_mask = sa64->sa_mask; + if (sa64->sa_handler == 0) + sa.sa_handler = SIG_DFL; + else if (sa64->sa_handler == 1) + sa.sa_handler = SIG_IGN; + else { + sa.sa_sigaction = signal_handler; + sa.sa_flags |= SA_SIGINFO; + } + if (sigaction(sig, &sa, NULL) == -1) + return (errno); + + siginfo[sig - 1].handler = sa64->sa_handler; + siginfo[sig - 1].flags = sa64->sa_flags; + siginfo[sig - 1].mask = sa64->sa_mask; + siginfo[sig - 1].valid = 1; + return (0); +} @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- src/netbsd/signal-netbsd.c.orig 2009-12-16 12:47:32.000000000 +0000 +++ src/netbsd/signal-netbsd.c d101 1 a101 1 + si64->si_addr = ifa; /* XXX: normalise pointers to ptr64_t */ d125 1 a125 1 + si64->si_addr = (long)si->si_addr; @ 1.1.1.1 log @import wip/ski @ text @@