Re: Fix comments longer than 80 column
Sorry, I sent the email to the wrong address. 2023年11月22日(水) 10:44 ASOU Masato : > > ok? > -- > ASOU Masato > > Index: sys/kern/kern_physio.c > === > RCS file: /cvs/src/sys/kern/kern_physio.c,v > diff -u -p -r1.47 kern_physio.c > --- sys/kern/kern_physio.c 20 Feb 2020 16:26:01 - 1.47 > +++ sys/kern/kern_physio.c 22 Nov 2023 00:47:34 - > @@ -113,8 +113,8 @@ physio(void (*strategy)(struct buf *), d > /* > * Because iov_len is size_t (unsigned) but b_bcount > is > * long (signed), an overflow is possible. Therefore > -* limit b_bcount to LONG_MAX before calling > the provided > -* minphys. > +* limit b_bcount to LONG_MAX before calling the > +* provided minphys. > */ > if (iovp->iov_len > LONG_MAX) > bp->b_bcount = LONG_MAX;
Fix comments longer than 80 column
ok? -- ASOU Masato Index: sys/kern/kern_physio.c === RCS file: /cvs/src/sys/kern/kern_physio.c,v diff -u -p -r1.47 kern_physio.c --- sys/kern/kern_physio.c 20 Feb 2020 16:26:01 - 1.47 +++ sys/kern/kern_physio.c 22 Nov 2023 00:47:34 - @@ -113,8 +113,8 @@ physio(void (*strategy)(struct buf *), d /* * Because iov_len is size_t (unsigned) but b_bcount is * long (signed), an overflow is possible. Therefore -* limit b_bcount to LONG_MAX before calling the provided -* minphys. +* limit b_bcount to LONG_MAX before calling the +* provided minphys. */ if (iovp->iov_len > LONG_MAX) bp->b_bcount = LONG_MAX;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2023/11/19 17:09:36 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_m_syswrap_syswrap_main_c patch-include_vki_vki_scnums_openbsd_h Log message: removal syscall(2) ok kn
Fwd: devel/valgrind: removal syscall(2)
ping
I confermed the operation using snapshot created onfNovember 16th.
--
ASOU Masato
-- Forwarded message -
From: 朝生正人
Date: 2023年11月2日(木) 10:45
Subject: devel/valgrind: removal syscall(2)
To:
I have moved my email address from a...@soum.co.jp to
takeasou.mas...@gmail.com.
This is a diff to remove syscall(2) in Valgrind.
ok?
--
ASOU Masato
Index: Makefile
===
RCS file: /cvs/ports/devel/valgrind/Makefile,v
diff -u -p -r1.33 Makefile
--- Makefile18 Oct 2023 03:27:55 - 1.33
+++ Makefile2 Nov 2023 01:16:02 -
@@ -5,7 +5,7 @@ CATEGORIES =devel
V =3.21.0
DISTNAME = valgrind-${V}
-REVISION = 1
+REVISION = 2
EXTRACT_SUFX = .tar.bz2
SITES =https://sourceware.org/pub/valgrind/
Index: patches/patch-coregrind_m_syswrap_syswrap_main_c
===
RCS file:
/cvs/ports/devel/valgrind/patches/patch-coregrind_m_syswrap_syswrap_main_c,v
diff -u -p -r1.1 patch-coregrind_m_syswrap_syswrap_main_c
--- patches/patch-coregrind_m_syswrap_syswrap_main_c18 Jul 2023
06:17:15 - 1.1
+++ patches/patch-coregrind_m_syswrap_syswrap_main_c2 Nov 2023 01:16:03
-
@@ -18,17 +18,12 @@
Int real_syscallno;
# endif
# if defined(VGO_linux)
-@@ -369,6 +369,17 @@
+@@ -369,6 +369,12 @@
real_syscallno, >arch.vex,
syscall_mask, , sizeof(vki_sigset_t)
);
+# elif defined(VGO_openbsd)
-+ if (tst->arch.vex.guest_SC_CLASS == VG_OPENBSD_SYSCALL0)
-+ real_syscallno = __NR_syscall;
-+ else if (tst->arch.vex.guest_SC_CLASS == VG_OPENBSD_SYSCALL198)
-+ real_syscallno = __NR___syscall;
-+ else
-+ real_syscallno = syscallno;
++ real_syscallno = syscallno;
+ err = ML_(do_syscall_for_client_WRK)(
+real_syscallno, >arch.vex,
+syscall_mask, , sizeof(vki_sigset_t)
@@ -36,7 +31,7 @@
# elif defined(VGO_darwin)
switch (VG_DARWIN_SYSNO_CLASS(syscallno)) {
case VG_DARWIN_SYSCALL_CLASS_UNIX:
-@@ -623,6 +634,153 @@
+@@ -623,6 +629,112 @@
canonical->arg8 = stack[2];
}
@@ -117,23 +112,8 @@
+ VexGuestX86State* gst = (VexGuestX86State*)gst_vanilla;
+ UWord *stack = (UWord *)gst->guest_ESP;
+
-+ // OpenBSD supports different calling conventions
-+ switch (gst->guest_EAX) {
-+ case __NR_syscall:
-+ canonical->class = VG_OPENBSD_SYSCALL0;
-+ canonical->sysno = stack[1];
-+ stack += 1;
-+ break;
-+ case __NR___syscall:
-+ canonical->class = VG_OPENBSD_SYSCALL198;
-+ canonical->sysno = stack[1];
-+ stack += 2;
-+ break;
-+ default:
-+ canonical->class = 0;
-+ canonical->sysno = gst->guest_EAX;
-+ break;
-+ }
++ canonical->class = 0;
++ canonical->sysno = gst->guest_EAX;
+ // stack[0] is a (fake) return address
+ canonical->arg1 = stack[1];
+ canonical->arg2 = stack[2];
@@ -148,49 +128,23 @@
+ VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla;
+ UWord *stack = (UWord *)gst->guest_RSP;
+
-+ // OpenBSD supports different calling conventions
-+ switch (gst->guest_RAX) {
-+ case __NR_syscall:
-+ canonical->klass = VG_OPENBSD_SYSCALL0;
-+ canonical->sysno = gst->guest_RDI;
-+ break;
-+ case __NR___syscall:
-+ canonical->klass = VG_OPENBSD_SYSCALL198;
-+ canonical->sysno = gst->guest_RDI;
-+ break;
-+ default:
-+ canonical->klass = 0;
-+ canonical->sysno = gst->guest_RAX;
-+ break;
-+ }
-+ // stack[0] is a (fake) return address
-+ if (canonical->klass != VG_OPENBSD_SYSCALL0 && canonical->klass !=
VG_OPENBSD_SYSCALL198) {
-+ // stack[0] is return address
-+ canonical->arg1 = gst->guest_RDI;
-+ canonical->arg2 = gst->guest_RSI;
-+ canonical->arg3 = gst->guest_RDX;
-+ canonical->arg4 = gst->guest_R10;
-+ canonical->arg5 = gst->guest_R8;
-+ canonical->arg6 = gst->guest_R9;
-+ canonical->arg7 = stack[1];
-+ canonical->arg8 = stack[2];
-+ } else {
-+ // stack[0] is return address
-+ canonical->arg1 = gst->guest_RSI;
-+ canonical->arg2 = gst->guest_RDX;
-+ canonical->arg3 = gst->guest_R10;
-+ canonical->arg4 = gst->guest_R8;
-+ canonical->arg5 = gst->guest_R9;
-+ canonical->arg6 = stack[1];
-+ canonical->arg7 = stack[2];
-+ canonical->arg8 = stack[3];
-+ }
++ canonical->klass = 0;
++ canonical->sysno = gst->guest_RAX;
++ // stack[0] is return address
++ canonical->arg1 = gst->guest_RDI;
++ canonical->arg2 = gst->guest_RSI;
++ canonical->arg3 = gst->guest_RDX;
++ cano
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2023/10/17 21:27:55 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_m_aspacemgr_aspacemgr_linux_c patch-coregrind_m_ume_elf_c Added files: devel/valgrind/patches: patch-coregrind_m_replacemalloc_vg_replace_malloc_c Log message: Fix a bug where symbols of some ELF files (lower 12 bits of Offset are 0 and File Size is 0 of program header) were not printed. ok otto
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2023/08/04 21:32:22 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_m_debuginfo_debuginfo_c patch-coregrind_m_debuginfo_readelf_c patch-include_vki_vki_openbsd_h Added files: devel/valgrind/patches: patch-coregrind_m_options_c Log message: Display function and file names on the stack trace when a problem is detectd. ok op@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2023/07/18 00:17:15 Modified files: devel/valgrind : Makefile distinfo devel/valgrind/patches: patch-Makefile_tool_am patch-VEX_priv_guest_amd64_helpers_c patch-VEX_priv_guest_amd64_toIR_c patch-VEX_priv_host_amd64_defs_c patch-VEX_priv_host_amd64_defs_h patch-VEX_priv_host_amd64_isel_c patch-VEX_priv_ir_defs_c patch-VEX_pub_libvex_ir_h patch-configure_ac patch-coregrind_link_tool_exe_openbsd_in patch-coregrind_m_debuginfo_readelf_c patch-coregrind_m_debuglog_c patch-coregrind_m_libcproc_c patch-coregrind_m_libcsignal_c patch-coregrind_m_main_c patch-coregrind_m_mallocfree_c patch-coregrind_m_syswrap_priv_syswrap_openbsd_h patch-coregrind_m_syswrap_syswrap_amd64_openbsd_c patch-coregrind_m_syswrap_syswrap_generic_c patch-coregrind_m_syswrap_syswrap_openbsd_c patch-coregrind_m_syswrap_syswrap_x86_openbsd_c patch-coregrind_m_transtab_c patch-coregrind_m_ume_elf_c patch-coregrind_pub_core_aspacemgr_h patch-include_vki_vki_scnums_openbsd_h patch-memcheck_mc_translate_c devel/valgrind/pkg: DESCR PLIST Added files: devel/valgrind/patches: patch-Makefile_all_am patch-callgrind_main_c patch-coregrind_Makefile_am patch-coregrind_launcher_openbsd_c patch-coregrind_m_aspacemgr_aspacemgr_common_c patch-coregrind_m_aspacemgr_aspacemgr_linux_c patch-coregrind_m_coredump_coredump_elf_c patch-coregrind_m_debuginfo_d3basics_c patch-coregrind_m_debuginfo_debuginfo_c patch-coregrind_m_debuginfo_priv_readpdb_h patch-coregrind_m_debuginfo_readdwarf3_c patch-coregrind_m_debuginfo_readdwarf_c patch-coregrind_m_debuginfo_readpdb_c patch-coregrind_m_debuginfo_storage_c patch-coregrind_m_dispatch_dispatch_amd64_openbsd_S patch-coregrind_m_dispatch_dispatch_x86_openbsd_S patch-coregrind_m_initimg_initimg_openbsd_c patch-coregrind_m_libcassert_c patch-coregrind_m_libcfile_c patch-coregrind_m_libcprint_c patch-coregrind_m_libcsetjmp_c patch-coregrind_m_machine_c patch-coregrind_m_redir_c patch-coregrind_m_scheduler_scheduler_c patch-coregrind_m_sigframe_sigframe_amd64_openbsd_c patch-coregrind_m_sigframe_sigframe_common_c patch-coregrind_m_sigframe_sigframe_x86_openbsd_c patch-coregrind_m_signals_c patch-coregrind_m_stacktrace_c patch-coregrind_m_syscall_c patch-coregrind_m_syswrap_priv_types_n_macros_h patch-coregrind_m_syswrap_syscall_amd64_openbsd_S patch-coregrind_m_syswrap_syscall_x86_openbsd_S patch-coregrind_m_syswrap_syswrap_main_c patch-coregrind_m_trampoline_S patch-coregrind_m_translate_c patch-coregrind_m_ume_main_c patch-coregrind_m_ume_priv_ume_h patch-coregrind_m_vki_c patch-coregrind_m_vkiscnums_c patch-coregrind_pub_core_debuginfo_h patch-coregrind_pub_core_initimg_h patch-coregrind_pub_core_libcfile_h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2021/03/24 23:04:36 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_link_tool_exe_openbsd_in Log message: Fix abort valgrind caused by the update Perl from 5.30.3 to 5.32.1. ok afresh1@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2020/10/04 19:45:58 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_link_tool_exe_openbsd_in Log message: Fix valgrind abort. ok tobhe@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2020/05/22 02:51:24 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_m_syswrap_syswrap_openbsd_c Log message: Fix Valgrind reports invalid write. ok jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2019/12/23 16:26:32 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_m_syswrap_priv_syswrap_openbsd_h patch-coregrind_m_syswrap_syswrap_openbsd_c patch-include_vki_vki-openbsd_h patch-include_vki_vki_scnums_openbsd_h Added files: devel/valgrind/patches: patch-coregrind_m_libcsignal_c patch-coregrind_m_syswrap_syswrap_amd64_openbsd_c patch-coregrind_m_syswrap_syswrap_generic_c patch-coregrind_m_syswrap_syswrap_x86_openbsd_c Log message: Support target program usgin Pthread. ok mpi@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2019/11/05 22:25:13 Modified files: devel/valgrind : Makefile devel/valgrind/patches: patch-coregrind_link_tool_exe_openbsd_in patch-coregrind_m_aspacemgr_aspacemgr-linux_c patch-coregrind_m_initimg_initimg-openbsd_c patch-coregrind_m_transtab_c Added files: devel/valgrind/patches: patch-coregrind_m_mallocfree_c Removed files: devel/valgrind/patches: patch-coregrind_m_scheduler_scheduler_c patch-coregrind_pub_core_transtab_h Log message: Delete mmap(PROT_WRITE) from the memory area of the execution code of the target program.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2019/10/22 20:35:05 Modified files: devel/valgrind : Makefile Added files: devel/valgrind/patches: patch-coregrind_m_syswrap_priv_syswrap_openbsd_h patch-coregrind_m_syswrap_syswrap_openbsd_c patch-include_vki_vki_scnums_openbsd_h Log message: Add sys_unveil()
