Module Name: src
Committed By: kamil
Date: Tue Dec 13 10:21:33 UTC 2016
Modified Files:
src/sys/arch/x86/include: cpufunc.h
src/sys/arch/xen/x86: xenfunc.c
Log Message:
Switch x86 CPU Debug Register types from vaddr_t to register_t
This is more opaque and appropriate type, as vaddr_t is meant to be used
for vitual address value. Not all DR on x86 are used to represent virtual
address (DR6 and DR7 are definitely not).
No functional change intended.
Change suggested by <christos>
Sponsored by <The NetBSD Foundation>
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/include/cpufunc.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/x86/xenfunc.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/include/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.20 src/sys/arch/x86/include/cpufunc.h:1.21
--- src/sys/arch/x86/include/cpufunc.h:1.20 Sun Nov 27 14:49:21 2016
+++ src/sys/arch/x86/include/cpufunc.h Tue Dec 13 10:21:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.h,v 1.20 2016/11/27 14:49:21 kamil Exp $ */
+/* $NetBSD: cpufunc.h,v 1.21 2016/12/13 10:21:33 kamil Exp $ */
/*-
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -69,18 +69,18 @@ vaddr_t rcr8(void);
void tlbflush(void);
void tlbflushg(void);
void dr0(void *, uint32_t, uint32_t, uint32_t);
-vaddr_t rdr0(void);
-void ldr0(vaddr_t);
-vaddr_t rdr1(void);
-void ldr1(vaddr_t);
-vaddr_t rdr2(void);
-void ldr2(vaddr_t);
-vaddr_t rdr3(void);
-void ldr3(vaddr_t);
-vaddr_t rdr6(void);
-void ldr6(vaddr_t);
-vaddr_t rdr7(void);
-void ldr7(vaddr_t);
+register_t rdr0(void);
+void ldr0(register_t);
+register_t rdr1(void);
+void ldr1(register_t);
+register_t rdr2(void);
+void ldr2(register_t);
+register_t rdr3(void);
+void ldr3(register_t);
+register_t rdr6(void);
+void ldr6(register_t);
+register_t rdr7(void);
+void ldr7(register_t);
void wbinvd(void);
void breakpoint(void);
void x86_hlt(void);
Index: src/sys/arch/xen/x86/xenfunc.c
diff -u src/sys/arch/xen/x86/xenfunc.c:1.14 src/sys/arch/xen/x86/xenfunc.c:1.15
--- src/sys/arch/xen/x86/xenfunc.c:1.14 Sun Nov 27 14:49:21 2016
+++ src/sys/arch/xen/x86/xenfunc.c Tue Dec 13 10:21:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xenfunc.c,v 1.14 2016/11/27 14:49:21 kamil Exp $ */
+/* $NetBSD: xenfunc.c,v 1.15 2016/12/13 10:21:33 kamil Exp $ */
/*
*
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.14 2016/11/27 14:49:21 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.15 2016/12/13 10:21:33 kamil Exp $");
#include <sys/param.h>
@@ -121,7 +121,7 @@ tlbflushg(void)
tlbflush();
}
-vaddr_t
+register_t
rdr0(void)
{
@@ -129,13 +129,13 @@ rdr0(void)
}
void
-ldr0(vaddr_t val)
+ldr0(register_t val)
{
HYPERVISOR_set_debugreg(0, val);
}
-vaddr_t
+register_t
rdr1(void)
{
@@ -143,13 +143,13 @@ rdr1(void)
}
void
-ldr1(vaddr_t val)
+ldr1(register_t val)
{
HYPERVISOR_set_debugreg(1, val);
}
-vaddr_t
+register_t
rdr2(void)
{
@@ -157,13 +157,13 @@ rdr2(void)
}
void
-ldr2(vaddr_t val)
+ldr2(register_t val)
{
HYPERVISOR_set_debugreg(2, val);
}
-vaddr_t
+register_t
rdr3(void)
{
@@ -171,12 +171,12 @@ rdr3(void)
}
void
-ldr3(vaddr_t val)
+ldr3(register_t val)
{
HYPERVISOR_set_debugreg(3, val);
}
-vaddr_t
+register_t
rdr6(void)
{
@@ -184,13 +184,13 @@ rdr6(void)
}
void
-ldr6(vaddr_t val)
+ldr6(register_t val)
{
HYPERVISOR_set_debugreg(6, val);
}
-vaddr_t
+register_t
rdr7(void)
{
@@ -198,7 +198,7 @@ rdr7(void)
}
void
-ldr7(vaddr_t val)
+ldr7(register_t val)
{
HYPERVISOR_set_debugreg(7, val);
