Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

{amd64,i386}/db_machdep.c: Don't bury a function call in an if condition 

db_frame_info has many arguments and requires contorted line wrapping
that obscures the condition.  The same object code is generated
(modulo a local variable moved closer to its only use site).
This commit is contained in:
uwe 2022-12-24 14:47:47 +00:00
parent c9e5544a42
commit 3932dd1490
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/amd64/amd64/db_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_machdep.c,v 1.14 2022/12/24 14:32:42 uwe Exp $ */ /* $NetBSD: db_machdep.c,v 1.15 2022/12/24 14:47:47 uwe Exp $ */
/* /*
* Mach Operating System * Mach Operating System
@ -26,7 +26,7 @@
* rights to redistribute these changes. * rights to redistribute these changes.
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.14 2022/12/24 14:32:42 uwe Exp $"); __KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.15 2022/12/24 14:47:47 uwe Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -111,7 +111,7 @@ db_nextframe(long **nextframe, long **retaddr, long **arg0, db_addr_t *ip,
struct trapframe *tf; struct trapframe *tf;
struct x86_64_frame *fp; struct x86_64_frame *fp;
struct intrframe *ifp; struct intrframe *ifp;
int traptype, trapno, err, i; int trapno, err, i;
db_expr_t syscallno; db_expr_t syscallno;
switch (is_trap) { switch (is_trap) {
@ -175,9 +175,10 @@ db_nextframe(long **nextframe, long **retaddr, long **arg0, db_addr_t *ip,
* a frame can be recognized by always having * a frame can be recognized by always having
* err 0 or IREENT_MAGIC and trapno T_ASTFLT. * err 0 or IREENT_MAGIC and trapno T_ASTFLT.
*/ */
if (db_frame_info(*nextframe, (db_addr_t)*ip, NULL, NULL, &traptype, int traptype = NONE;
NULL) != DB_SYM_NULL db_sym_t sym = db_frame_info(*nextframe, (db_addr_t)*ip,
&& traptype == INTERRUPT) { NULL, NULL, &traptype, NULL);
if (sym != DB_SYM_NULL && traptype == INTERRUPT) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
ifp = (struct intrframe *)(argp + i); ifp = (struct intrframe *)(argp + i);
err = db_get_value((long)&ifp->if_tf.tf_err, err = db_get_value((long)&ifp->if_tf.tf_err,

12
sys/arch/i386/i386/db_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_machdep.c,v 1.9 2022/12/24 14:32:42 uwe Exp $ */ /* $NetBSD: db_machdep.c,v 1.10 2022/12/24 14:47:47 uwe Exp $ */
/* /*
* Mach Operating System * Mach Operating System
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.9 2022/12/24 14:32:42 uwe Exp $"); __KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.10 2022/12/24 14:47:47 uwe Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -128,7 +128,6 @@ db_nextframe(long **nextframe, long **retaddr, long **arg0, db_addr_t *ip,
static struct trapframe tf; static struct trapframe tf;
static struct i386tss tss; static struct i386tss tss;
struct i386_frame *fp; struct i386_frame *fp;
int traptype;
uintptr_t ptr; uintptr_t ptr;
switch (is_trap) { switch (is_trap) {
@ -207,9 +206,10 @@ db_nextframe(long **nextframe, long **retaddr, long **arg0, db_addr_t *ip,
* a frame can be recognized by always having * a frame can be recognized by always having
* err 0 or IREENT_MAGIC and trapno T_ASTFLT. * err 0 or IREENT_MAGIC and trapno T_ASTFLT.
*/ */
if (db_frame_info(*nextframe, (db_addr_t)*ip, NULL, NULL, &traptype, int traptype = NONE;
NULL) != DB_SYM_NULL db_sym_t sym = db_frame_info(*nextframe, (db_addr_t)*ip,
&& traptype == INTERRUPT) { NULL, NULL, &traptype, NULL);
if (sym != DB_SYM_NULL && traptype == INTERRUPT) {
struct intrframe *ifp; struct intrframe *ifp;
int trapno; int trapno;
int err; int err;