Author: kib
Date: Wed Aug 5 07:21:44 2015
New Revision: 286305
URL: https://svnweb.freebsd.org/changeset/base/286305
Log:
MFC r285041:
Use single instance of the identical INKERNEL() and PMC_IN_KERNEL()
macros on amd64 and i386. On i386, correct the lowest kernel address.
Modified:
stable/10/gnu/usr.bin/gdb/kgdb/trgt.c
stable/10/sys/amd64/include/param.h
stable/10/sys/amd64/include/pmc_mdep.h
stable/10/sys/amd64/include/stack.h
stable/10/sys/cddl/dev/dtrace/i386/dtrace_isa.c
stable/10/sys/i386/include/param.h
stable/10/sys/i386/include/pmc_mdep.h
stable/10/sys/i386/include/stack.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/gnu/usr.bin/gdb/kgdb/trgt.c
==============================================================================
--- stable/10/gnu/usr.bin/gdb/kgdb/trgt.c Wed Aug 5 03:17:06 2015
(r286304)
+++ stable/10/gnu/usr.bin/gdb/kgdb/trgt.c Wed Aug 5 07:21:44 2015
(r286305)
@@ -64,7 +64,7 @@ kvm_t *kvm;
static char kvm_err[_POSIX2_LINE_MAX];
#define KERNOFF (kgdb_kernbase ())
-#define INKERNEL(x) ((x) >= KERNOFF)
+#define PINKERNEL(x) ((x) >= KERNOFF)
static CORE_ADDR
kgdb_kernbase (void)
@@ -284,7 +284,7 @@ kgdb_set_proc_cmd (char *arg, int from_t
addr = (CORE_ADDR) parse_and_eval_address (arg);
- if (!INKERNEL (addr)) {
+ if (!PINKERNEL (addr)) {
thr = kgdb_thr_lookup_pid((int)addr);
if (thr == NULL)
error ("invalid pid");
@@ -307,7 +307,7 @@ kgdb_set_tid_cmd (char *arg, int from_tt
addr = (CORE_ADDR) parse_and_eval_address (arg);
- if (kvm != NULL && INKERNEL (addr)) {
+ if (kvm != NULL && PINKERNEL (addr)) {
thr = kgdb_thr_lookup_taddr(addr);
if (thr == NULL)
error("invalid thread address");
Modified: stable/10/sys/amd64/include/param.h
==============================================================================
--- stable/10/sys/amd64/include/param.h Wed Aug 5 03:17:06 2015
(r286304)
+++ stable/10/sys/amd64/include/param.h Wed Aug 5 07:21:44 2015
(r286305)
@@ -143,4 +143,7 @@
#define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024))
+#define INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) <
DMAP_MAX_ADDRESS) \
+ || ((va) >= VM_MIN_KERNEL_ADDRESS && (va) < VM_MAX_KERNEL_ADDRESS))
+
#endif /* !_AMD64_INCLUDE_PARAM_H_ */
Modified: stable/10/sys/amd64/include/pmc_mdep.h
==============================================================================
--- stable/10/sys/amd64/include/pmc_mdep.h Wed Aug 5 03:17:06 2015
(r286304)
+++ stable/10/sys/amd64/include/pmc_mdep.h Wed Aug 5 07:21:44 2015
(r286305)
@@ -113,9 +113,7 @@ union pmc_md_pmc {
#define PMC_IN_KERNEL_STACK(S,START,END) \
((S) >= (START) && (S) < (END))
-#define PMC_IN_KERNEL(va) (((va) >= DMAP_MIN_ADDRESS &&
\
- (va) < DMAP_MAX_ADDRESS) || ((va) >= VM_MIN_KERNEL_ADDRESS && \
- (va) < VM_MAX_KERNEL_ADDRESS))
+#define PMC_IN_KERNEL(va) INKERNEL(va)
#define PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS)
Modified: stable/10/sys/amd64/include/stack.h
==============================================================================
--- stable/10/sys/amd64/include/stack.h Wed Aug 5 03:17:06 2015
(r286304)
+++ stable/10/sys/amd64/include/stack.h Wed Aug 5 07:21:44 2015
(r286305)
@@ -32,8 +32,6 @@
/*
* Stack trace.
*/
-#define INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) <
DMAP_MAX_ADDRESS) \
- || ((va) >= VM_MIN_KERNEL_ADDRESS && (va) < VM_MAX_KERNEL_ADDRESS))
struct amd64_frame {
struct amd64_frame *f_frame;
Modified: stable/10/sys/cddl/dev/dtrace/i386/dtrace_isa.c
==============================================================================
--- stable/10/sys/cddl/dev/dtrace/i386/dtrace_isa.c Wed Aug 5 03:17:06
2015 (r286304)
+++ stable/10/sys/cddl/dev/dtrace/i386/dtrace_isa.c Wed Aug 5 07:21:44
2015 (r286305)
@@ -47,9 +47,6 @@
extern uintptr_t kernbase;
uintptr_t kernelbase = (uintptr_t) &kernbase;
-#define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK && \
- ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
-
uint8_t dtrace_fuword8_nocheck(void *);
uint16_t dtrace_fuword16_nocheck(void *);
uint32_t dtrace_fuword32_nocheck(void *);
Modified: stable/10/sys/i386/include/param.h
==============================================================================
--- stable/10/sys/i386/include/param.h Wed Aug 5 03:17:06 2015
(r286304)
+++ stable/10/sys/i386/include/param.h Wed Aug 5 07:21:44 2015
(r286305)
@@ -157,4 +157,7 @@
#define pgtok(x) ((x) * (PAGE_SIZE / 1024))
+#define INKERNEL(va) (((vm_offset_t)(va)) >= VM_MAXUSER_ADDRESS && \
+ ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
+
#endif /* !_I386_INCLUDE_PARAM_H_ */
Modified: stable/10/sys/i386/include/pmc_mdep.h
==============================================================================
--- stable/10/sys/i386/include/pmc_mdep.h Wed Aug 5 03:17:06 2015
(r286304)
+++ stable/10/sys/i386/include/pmc_mdep.h Wed Aug 5 07:21:44 2015
(r286305)
@@ -138,8 +138,7 @@ struct pmc_mdep;
#define PMC_IN_KERNEL_STACK(S,START,END) \
((S) >= (START) && (S) < (END))
-#define PMC_IN_KERNEL(va) (((va) >= USRSTACK) && \
- ((va) < VM_MAX_KERNEL_ADDRESS))
+#define PMC_IN_KERNEL(va) INKERNEL(va)
#define PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS)
Modified: stable/10/sys/i386/include/stack.h
==============================================================================
--- stable/10/sys/i386/include/stack.h Wed Aug 5 03:17:06 2015
(r286304)
+++ stable/10/sys/i386/include/stack.h Wed Aug 5 07:21:44 2015
(r286305)
@@ -32,8 +32,6 @@
/*
* Stack trace.
*/
-#define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK && \
- ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
struct i386_frame {
struct i386_frame *f_frame;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
