Module Name: src
Committed By: uwe
Date: Sat Dec 24 02:31:43 UTC 2022
Modified Files:
src/sys/arch/x86/x86: db_trace.c
Log Message:
db_trace.c: Make parens balanced across #ifdef
Same object code is generated on both i386 and amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/x86/db_trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/db_trace.c
diff -u src/sys/arch/x86/x86/db_trace.c:1.4 src/sys/arch/x86/x86/db_trace.c:1.5
--- src/sys/arch/x86/x86/db_trace.c:1.4 Sun Feb 11 08:27:18 2018
+++ src/sys/arch/x86/x86/db_trace.c Sat Dec 24 02:31:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.4 2018/02/11 08:27:18 maxv Exp $ */
+/* $NetBSD: db_trace.c,v 1.5 2022/12/24 02:31:43 uwe Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.4 2018/02/11 08:27:18 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.5 2022/12/24 02:31:43 uwe Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,16 +212,17 @@ db_stack_trace_print(db_expr_t addr, boo
offset = 1;
if (
#ifdef __x86_64__
- instr == 0xe5894855 ||
+ (instr == 0xe5894855 ||
/* enter: pushq %rbp, movq %rsp, %rbp */
(instr & 0x00ffffff) == 0x0048e589
/* enter+1: movq %rsp, %rbp */)
#else
- (instr & 0x00ffffff) == 0x00e58955 ||
+ ((instr & 0x00ffffff) == 0x00e58955 ||
/* enter: pushl %ebp, movl %esp, %ebp */
(instr & 0x0000ffff) == 0x0000e589
/* enter+1: movl %esp, %ebp */)
#endif
+ )
{
offset = 0;
}
