| Message ID | 20220109161923.85683-7-imp@bsdimp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bsd-user: upstream our signal implementation | expand |
On Sun, 9 Jan 2022 at 16:26, Warner Losh <imp@bsdimp.com> wrote: > > The code has moved in FreeBSD since the emulator was started, update the > comment to reflect that change. Remove now-redundant comment saying the > same thing (but incorrectly). > > Signed-off-by: Warner Losh <imp@bsdimp.com> > --- > bsd-user/arm/target_arch_cpu.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/bsd-user/arm/target_arch_cpu.h b/bsd-user/arm/target_arch_cpu.h > index 05b19ce6119..905f13aa1b9 100644 > --- a/bsd-user/arm/target_arch_cpu.h > +++ b/bsd-user/arm/target_arch_cpu.h > @@ -73,7 +73,7 @@ static inline void target_cpu_loop(CPUARMState *env) > int32_t syscall_nr = n; > int32_t arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8; > > - /* See arm/arm/trap.c cpu_fetch_syscall_args() */ > + /* See arm/arm/syscall.c cpu_fetch_syscall_args() */ > if (syscall_nr == TARGET_FREEBSD_NR_syscall) { > syscall_nr = env->regs[0]; > arg1 = env->regs[1]; Commit message says we're updating one comment and deleting a second one; code only does an update, no delete ? -- PMM
On Thu, Jan 13, 2022 at 10:15 AM Peter Maydell <peter.maydell@linaro.org> wrote: > On Sun, 9 Jan 2022 at 16:26, Warner Losh <imp@bsdimp.com> wrote: > > > > The code has moved in FreeBSD since the emulator was started, update the > > comment to reflect that change. Remove now-redundant comment saying the > > same thing (but incorrectly). > > > > Signed-off-by: Warner Losh <imp@bsdimp.com> > > --- > > bsd-user/arm/target_arch_cpu.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/bsd-user/arm/target_arch_cpu.h > b/bsd-user/arm/target_arch_cpu.h > > index 05b19ce6119..905f13aa1b9 100644 > > --- a/bsd-user/arm/target_arch_cpu.h > > +++ b/bsd-user/arm/target_arch_cpu.h > > @@ -73,7 +73,7 @@ static inline void target_cpu_loop(CPUARMState *env) > > int32_t syscall_nr = n; > > int32_t arg1, arg2, arg3, arg4, arg5, arg6, arg7, > arg8; > > > > - /* See arm/arm/trap.c cpu_fetch_syscall_args() */ > > + /* See arm/arm/syscall.c cpu_fetch_syscall_args() */ > > if (syscall_nr == TARGET_FREEBSD_NR_syscall) { > > syscall_nr = env->regs[0]; > > arg1 = env->regs[1]; > > Commit message says we're updating one comment and deleting a > second one; code only does an update, no delete ? > Commit is right, commit message is wrong. I'll fix the commit message. I got this confused with part 8 where I kinda sorta did something similar (but not that similar). Warner
On Fri, 14 Jan 2022 at 06:38, Warner Losh <imp@bsdimp.com> wrote: > > > > On Thu, Jan 13, 2022 at 10:15 AM Peter Maydell <peter.maydell@linaro.org> wrote: >> >> On Sun, 9 Jan 2022 at 16:26, Warner Losh <imp@bsdimp.com> wrote: >> > >> > The code has moved in FreeBSD since the emulator was started, update the >> > comment to reflect that change. Remove now-redundant comment saying the >> > same thing (but incorrectly). >> > >> > Signed-off-by: Warner Losh <imp@bsdimp.com> >> > --- >> > bsd-user/arm/target_arch_cpu.h | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/bsd-user/arm/target_arch_cpu.h b/bsd-user/arm/target_arch_cpu.h >> > index 05b19ce6119..905f13aa1b9 100644 >> > --- a/bsd-user/arm/target_arch_cpu.h >> > +++ b/bsd-user/arm/target_arch_cpu.h >> > @@ -73,7 +73,7 @@ static inline void target_cpu_loop(CPUARMState *env) >> > int32_t syscall_nr = n; >> > int32_t arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8; >> > >> > - /* See arm/arm/trap.c cpu_fetch_syscall_args() */ >> > + /* See arm/arm/syscall.c cpu_fetch_syscall_args() */ >> > if (syscall_nr == TARGET_FREEBSD_NR_syscall) { >> > syscall_nr = env->regs[0]; >> > arg1 = env->regs[1]; >> >> Commit message says we're updating one comment and deleting a >> second one; code only does an update, no delete ? > > > Commit is right, commit message is wrong. I'll fix the commit message. I got > this confused with part 8 where I kinda sorta did something similar (but not > that similar). (Maybe you had in mind the similar comment that used to be a few lines above this one and which you removed in patch 5?) With a fixed commit message: Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On Fri, Jan 14, 2022 at 3:22 AM Peter Maydell <peter.maydell@linaro.org> wrote: > On Fri, 14 Jan 2022 at 06:38, Warner Losh <imp@bsdimp.com> wrote: > > > > > > > > On Thu, Jan 13, 2022 at 10:15 AM Peter Maydell <peter.maydell@linaro.org> > wrote: > >> > >> On Sun, 9 Jan 2022 at 16:26, Warner Losh <imp@bsdimp.com> wrote: > >> > > >> > The code has moved in FreeBSD since the emulator was started, update > the > >> > comment to reflect that change. Remove now-redundant comment saying > the > >> > same thing (but incorrectly). > >> > > >> > Signed-off-by: Warner Losh <imp@bsdimp.com> > >> > --- > >> > bsd-user/arm/target_arch_cpu.h | 2 +- > >> > 1 file changed, 1 insertion(+), 1 deletion(-) > >> > > >> > diff --git a/bsd-user/arm/target_arch_cpu.h > b/bsd-user/arm/target_arch_cpu.h > >> > index 05b19ce6119..905f13aa1b9 100644 > >> > --- a/bsd-user/arm/target_arch_cpu.h > >> > +++ b/bsd-user/arm/target_arch_cpu.h > >> > @@ -73,7 +73,7 @@ static inline void target_cpu_loop(CPUARMState *env) > >> > int32_t syscall_nr = n; > >> > int32_t arg1, arg2, arg3, arg4, arg5, arg6, > arg7, arg8; > >> > > >> > - /* See arm/arm/trap.c cpu_fetch_syscall_args() */ > >> > + /* See arm/arm/syscall.c > cpu_fetch_syscall_args() */ > >> > if (syscall_nr == TARGET_FREEBSD_NR_syscall) { > >> > syscall_nr = env->regs[0]; > >> > arg1 = env->regs[1]; > >> > >> Commit message says we're updating one comment and deleting a > >> second one; code only does an update, no delete ? > > > > > > Commit is right, commit message is wrong. I'll fix the commit message. I > got > > this confused with part 8 where I kinda sorta did something similar (but > not > > that similar). > > (Maybe you had in mind the similar comment that used to be a few lines > above this one and which you removed in patch 5?) > I think that's where I got confused. Warner > With a fixed commit message: > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > > thanks > -- PMM >
On 1/10/22 3:18 AM, Warner Losh wrote: > The code has moved in FreeBSD since the emulator was started, update the > comment to reflect that change. Remove now-redundant comment saying the > same thing (but incorrectly). > > Signed-off-by: Warner Losh<imp@bsdimp.com> > --- > bsd-user/arm/target_arch_cpu.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) With commit message updated, as discussed upthread, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/bsd-user/arm/target_arch_cpu.h b/bsd-user/arm/target_arch_cpu.h index 05b19ce6119..905f13aa1b9 100644 --- a/bsd-user/arm/target_arch_cpu.h +++ b/bsd-user/arm/target_arch_cpu.h @@ -73,7 +73,7 @@ static inline void target_cpu_loop(CPUARMState *env) int32_t syscall_nr = n; int32_t arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8; - /* See arm/arm/trap.c cpu_fetch_syscall_args() */ + /* See arm/arm/syscall.c cpu_fetch_syscall_args() */ if (syscall_nr == TARGET_FREEBSD_NR_syscall) { syscall_nr = env->regs[0]; arg1 = env->regs[1];
The code has moved in FreeBSD since the emulator was started, update the comment to reflect that change. Remove now-redundant comment saying the same thing (but incorrectly). Signed-off-by: Warner Losh <imp@bsdimp.com> --- bsd-user/arm/target_arch_cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)