CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src
Committed By: hannken
Date: Sat Jan 12 10:41:31 UTC 2019
Modified Files:
src/external/cddl/osnet/dev/dtrace/amd64: dtrace_subr.c
Log Message:
There is no such function read_rflags(), probably meant x86_read_flags().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.11 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.12
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.11 Thu Aug 16 14:14:51 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Sat Jan 12 10:41:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_subr.c,v 1.11 2018/08/16 14:14:51 christos Exp $ */
+/* $NetBSD: dtrace_subr.c,v 1.12 2019/01/12 10:41:31 hannken Exp $ */
/*
* CDDL HEADER START
@@ -412,7 +412,7 @@ dtrace_trap(struct trapframe *frame, u_i
*/
nofault = (cpu_core[cpuid].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0;
if (nofault) {
- KASSERTMSG((read_rflags() & PSL_I) == 0, "interrupts enabled");
+ KASSERTMSG((x86_read_flags() & PSL_I) == 0, "interrupts enabled");
/*
* There are only a couple of trap types that are expected.
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src
Committed By: christos
Date: Thu Aug 16 14:14:52 UTC 2018
Modified Files:
src/external/cddl/osnet/dev/dtrace/amd64: dtrace_isa.c dtrace_subr.c
Log Message:
get rid of kernelbase
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.9 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.10
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.9 Sun Aug 12 12:07:27 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c Thu Aug 16 10:14:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_isa.c,v 1.9 2018/08/12 16:07:27 christos Exp $ */
+/* $NetBSD: dtrace_isa.c,v 1.10 2018/08/16 14:14:51 christos Exp $ */
/*
* CDDL HEADER START
@@ -45,12 +45,6 @@ uint16_t dtrace_fuword16_nocheck(void *)
uint32_t dtrace_fuword32_nocheck(void *);
uint64_t dtrace_fuword64_nocheck(void *);
-#ifdef VM_MIN_KERNEL_ADDRESS_DEFAULT
-__strong_alias(kernelbase, vm_min_kernel_address)
-#else
-uintptr_t kernelbase = (uintptr_t)VM_MIN_KERNEL_ADDRESS;
-#endif
-
#define INKERNEL(va) ((intptr_t)(va) < 0) /* XXX horror */
struct amd64_frame {
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.10 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.11
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.10 Tue Jun 5 08:04:19 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Thu Aug 16 10:14:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_subr.c,v 1.10 2018/06/05 12:04:19 christos Exp $ */
+/* $NetBSD: dtrace_subr.c,v 1.11 2018/08/16 14:14:51 christos Exp $ */
/*
* CDDL HEADER START
@@ -48,8 +48,6 @@
#include
#include
-extern uintptr_t kernelbase;
-
int dtrace_invop(uintptr_t, struct trapframe *, uintptr_t);
typedef struct dtrace_invop_hdlr {
@@ -117,7 +115,7 @@ dtrace_invop_remove(int (*func)(uintptr_
void
dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit))
{
- (*func)(0, kernelbase);
+ (*func)(0, VM_MIN_KERNEL_ADDRESS);
}
static void
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src Committed By: christos Date: Sun Aug 12 16:07:27 UTC 2018 Modified Files: src/external/cddl/osnet/dev/dtrace/amd64: dtrace_isa.c Log Message: handle variable kernel vm min address To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.8 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.9 --- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.8 Fri Jul 27 03:32:59 2018 +++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c Sun Aug 12 12:07:27 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: dtrace_isa.c,v 1.8 2018/07/27 07:32:59 maxv Exp $ */ +/* $NetBSD: dtrace_isa.c,v 1.9 2018/08/12 16:07:27 christos Exp $ */ /* * CDDL HEADER START @@ -45,7 +45,11 @@ uint16_t dtrace_fuword16_nocheck(void *) uint32_t dtrace_fuword32_nocheck(void *); uint64_t dtrace_fuword64_nocheck(void *); +#ifdef VM_MIN_KERNEL_ADDRESS_DEFAULT +__strong_alias(kernelbase, vm_min_kernel_address) +#else uintptr_t kernelbase = (uintptr_t)VM_MIN_KERNEL_ADDRESS; +#endif #define INKERNEL(va) ((intptr_t)(va) < 0) /* XXX horror */
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src
Committed By: maxv
Date: Fri Jul 27 07:32:59 UTC 2018
Modified Files:
src/external/cddl/osnet/dev/dtrace/amd64: dtrace_isa.c
Log Message:
Replace KERN_BASE by VM_MIN_KERNEL_ADDRESS. Also add XXX on INKERNEL.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.7 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.8
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.7 Mon May 28 21:05:03 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c Fri Jul 27 07:32:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_isa.c,v 1.7 2018/05/28 21:05:03 chs Exp $ */
+/* $NetBSD: dtrace_isa.c,v 1.8 2018/07/27 07:32:59 maxv Exp $ */
/*
* CDDL HEADER START
@@ -45,9 +45,9 @@ uint16_t dtrace_fuword16_nocheck(void *)
uint32_t dtrace_fuword32_nocheck(void *);
uint64_t dtrace_fuword64_nocheck(void *);
-uintptr_t kernelbase = (uintptr_t)KERN_BASE;
+uintptr_t kernelbase = (uintptr_t)VM_MIN_KERNEL_ADDRESS;
-#define INKERNEL(va) ((intptr_t)(va) < 0)
+#define INKERNEL(va) ((intptr_t)(va) < 0) /* XXX horror */
struct amd64_frame {
struct amd64_frame *f_frame;
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src Committed By: christos Date: Tue Jun 5 12:04:19 UTC 2018 Modified Files: src/external/cddl/osnet/dev/dtrace/amd64: dtrace_subr.c Log Message: remove done in the dtrace header now. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.9 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.10 --- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.9 Mon May 28 17:05:03 2018 +++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Tue Jun 5 08:04:19 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: dtrace_subr.c,v 1.9 2018/05/28 21:05:03 chs Exp $ */ +/* $NetBSD: dtrace_subr.c,v 1.10 2018/06/05 12:04:19 christos Exp $ */ /* * CDDL HEADER START @@ -33,7 +33,6 @@ * Copyright (c) 2011, Joyent, Inc. All rights reserved. */ -#include #include #include #include
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src Committed By: christos Date: Mon May 18 14:41:41 UTC 2015 Modified Files: src/external/cddl/osnet/dev/dtrace/amd64: dtrace_asm.S Log Message: don't re-define END() now that amd64 defines it To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.4 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.5 --- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.4 Mon Jun 11 11:18:05 2012 +++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S Mon May 18 10:41:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dtrace_asm.S,v 1.4 2012/06/11 15:18:05 chs Exp $ */ +/* $NetBSD: dtrace_asm.S,v 1.5 2015/05/18 14:41:41 christos Exp $ */ /* * CDDL HEADER START @@ -35,7 +35,6 @@ #include sys/cpuvar_defs.h #include sys/dtrace.h #include machine/asm.h -#define END(a) #define MEXITCOUNT #include assym.h
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src Committed By: christos Date: Mon Jul 18 00:42:40 UTC 2011 Modified Files: src/external/cddl/osnet/dev/dtrace/amd64: dis_tables.c Log Message: fix uninitialized gcc variables To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dev/dtrace/amd64/dis_tables.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dev/dtrace/amd64/dis_tables.c diff -u src/external/cddl/osnet/dev/dtrace/amd64/dis_tables.c:1.2 src/external/cddl/osnet/dev/dtrace/amd64/dis_tables.c:1.3 --- src/external/cddl/osnet/dev/dtrace/amd64/dis_tables.c:1.2 Sat Feb 20 20:46:33 2010 +++ src/external/cddl/osnet/dev/dtrace/amd64/dis_tables.c Sun Jul 17 20:42:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dis_tables.c,v 1.2 2010/02/21 01:46:33 darran Exp $ */ +/* $NetBSD: dis_tables.c,v 1.3 2011/07/18 00:42:40 christos Exp $ */ /* * CDDL HEADER START @@ -1716,9 +1716,9 @@ uint_t opcode2; /* low nibble of 1st byte */ uint_t opcode3; /* extra opcode bits usually from ModRM byte */ uint_t opcode4; /* high nibble of 2nd byte */ - uint_t opcode5; /* low nibble of 2ne byte */ + uint_t opcode5 = 0; /* low nibble of 2ne byte */ /* XXX: gcc */ uint_t opcode6; /* high nibble of 3rd byte */ - uint_t opcode7; /* low nibble of 3rd byte */ + uint_t opcode7 = 0; /* low nibble of 3rd byte */ /* XXX: gcc */ uint_t opcode_bytes = 1; /*
