head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.152 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.150 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.148 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.146 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.144 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.142 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.140 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.138 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.136 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.134 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.132 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.130 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.128 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.126 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.124 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.122 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.120 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.118 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.116 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.114 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.112 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.110 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.108 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.104 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.84 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.106 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.102 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.100 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.98 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.96 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.94 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.92 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.90 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.88 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.86 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.82 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.80 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.78 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.76 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.74 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.72 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.70 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.68 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.66 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.64 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.62 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.60 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.58 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.56 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.54 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.52 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.50 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.48 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.46 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.44 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.42 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.40 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.38 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.36 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.32 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.30 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.28 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.26 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.24 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.22 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.20 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.18 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.16 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.6 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.2.0.4 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.2 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2007.12.05.16.31.01; author christos; state Exp; branches; next 1.2; 1.2 date 2007.04.27.19.45.02; author christos; state Exp; branches; next 1.1; 1.1 date 2006.03.05.08.17.49; author christos; state Exp; branches; next ; desc @@ 1.3 log @Use newer strace 4.5.15; various improvements in syscall parsing and split functions into more files. @ text @$NetBSD$ --- resource.c.orig 2006-10-15 21:17:52.000000000 -0400 +++ resource.c 2007-12-05 11:04:00.000000000 -0500 @@@@ -37,7 +37,7 @@@@ #include #include #endif /* LINUX */ -#if defined(SVR4) || defined(FREEBSD) +#if defined(SVR4) || defined(ALLBSD) #include #include #endif @@@@ -454,9 +454,11 @@@@ tprintf("{...}"); else { tprintf("{tms_utime=%lu, tms_stime=%lu, ", - tbuf.tms_utime, tbuf.tms_stime); + (unsigned long)tbuf.tms_utime, + (unsigned long)tbuf.tms_stime); tprintf("tms_cutime=%lu, tms_cstime=%lu}", - tbuf.tms_cutime, tbuf.tms_cstime); + (unsigned long)tbuf.tms_cutime, + (unsigned long)tbuf.tms_cstime); } } return 0; @ 1.2 log @- make this work again on NetBSD/i386 - make this compile on NetBSD/x86_64 [does not work yet] - completely automate the NetBSD header generation. This should make porting to other platforms easier. @ text @d3 6 a8 6 --- resource.c.orig 2005-12-01 23:08:27.000000000 -0500 +++ resource.c 2007-04-27 14:59:25.000000000 -0400 @@@@ -41,7 +41,7 @@@@ #ifdef SUNOS4 #include #endif /* SUNOS4 */ d14 1 a14 1 @@@@ -458,9 +458,11 @@@@ a27 27 @@@@ -567,9 +569,9 @@@@ #endif /* Linux */ -#if defined(SUNOS4) || defined(FREEBSD) +#if defined(SUNOS4) || defined(ALLBSD) -#ifdef FREEBSD +#ifdef ALLBSD #include #endif @@@@ -599,7 +601,7 @@@@ tprintf(", "); printstr(tcp, tcp->u_arg[1], -1); #endif -#ifdef FREEBSD +#ifdef ALLBSD printpath(tcp, tcp->u_arg[0]); tprintf(", "); printxval(quotacmds, tcp->u_arg[1], "Q_???"); @@@@ -609,4 +611,4 @@@@ return 0; } -#endif /* SUNOS4 || FREEBSD */ +#endif /* SUNOS4 || ALLBSD */ @ 1.1 log @add strace. This only works for NetBSD/i386 thus far. @ text @d3 10 a12 15 --- util.c 2005-10-21 18:06:46.000000000 -0400 +++ util.c 2006-03-04 22:32:21.000000000 -0500 @@@@ -36,9 +36,9 @@@@ #include "defs.h" #include +#include #include #include -#include #include #if HAVE_SYS_UIO_H #include @@@@ -58,6 +58,9 @@@@ # include d14 15 d30 1 a30 9 +#ifdef NETBSD +#include +#endif #ifdef HAVE_SYS_REG_H #include # define PTRACE_PEEKUSR PTRACE_PEEKUSER @@@@ -96,6 +99,7 @@@@ # define PTRACE_SETREGS PTRACE_SETREGS64 #endif /* SPARC64 */ d32 2 a33 2 + #if !defined(__GLIBC__) d35 4 a38 4 #include @@@@ -759,6 +763,20 @@@@ return -1; #endif /* USE_PROCFS */ d40 10 a49 14 +#ifdef NETBSD + struct ptrace_io_desc piod; + + piod.piod_op = PIOD_READ_D; + piod.piod_offs = (void *)addr; + piod.piod_addr = laddr; + piod.piod_len = len; + + if (ptrace(PT_IO, tcp->pid, (char *)&piod, sizeof(piod)) < 0) { + perror("PT_IO"); + return -1; + } +#endif + d53 2 a54 15 @@@@ -1079,6 +1097,14 @@@@ pread(tcp->pfd_reg, ®s, sizeof(regs), 0); return regs.r_eip; #endif /* FREEBSD */ +#ifdef NETBSD + struct reg regs; + if (ptrace(PTRACE_GETREGS, tcp->pid, (char *) ®s, 0) < 0) { + perror("getpc: ptrace(PTRACE_GETREGS, ...)"); + return -1; + } + return regs.r_eip; +#endif /* NETBSD */ } #endif @