Author: markj
Date: Wed Jul 20 00:02:10 2016
New Revision: 303050
URL: https://svnweb.freebsd.org/changeset/base/303050
Log:
Merge {amd64,i386}/instr_size.c into x86_instr_size.c.
Also reduce the diff between us and upstream: the input data model will
always be DATAMODEL_NATIVE because of a bug (p_model is never set but is
always initialized to 0), so we don't need to override the caller anyway.
This change is also necessary to support the pid provider for 32-bit
processes on amd64.
MFC after: 2 weeks
Added:
head/sys/cddl/dev/dtrace/x86/instr_size.c
- copied, changed from r303049, head/sys/cddl/dev/dtrace/i386/instr_size.c
Deleted:
head/sys/cddl/dev/dtrace/amd64/instr_size.c
head/sys/cddl/dev/dtrace/i386/instr_size.c
Modified:
head/sys/conf/files.amd64
head/sys/conf/files.i386
Copied and modified: head/sys/cddl/dev/dtrace/x86/instr_size.c (from r303049,
head/sys/cddl/dev/dtrace/i386/instr_size.c)
==============================================================================
--- head/sys/cddl/dev/dtrace/i386/instr_size.c Tue Jul 19 23:25:45 2016
(r303049, copy source)
+++ head/sys/cddl/dev/dtrace/x86/instr_size.c Wed Jul 20 00:02:10 2016
(r303050)
@@ -44,6 +44,9 @@
#include <vm/seg_enum.h>
#include <sys/privregs.h>
#else
+#include <sys/cred.h>
+#include <cddl/dev/dtrace/dtrace_cddl.h>
+
typedef u_int model_t;
#define DATAMODEL_NATIVE 0
int dtrace_instr_size(uchar_t *);
@@ -104,9 +107,7 @@ dtrace_dis_isize(uchar_t *instr, dis_isi
dis86_t x;
uint_t mode = SIZE32;
-#ifdef illumos
mode = (model == DATAMODEL_LP64) ? SIZE64 : SIZE32;
-#endif
x.d86_data = (void **)&instr;
x.d86_get_byte = dtrace_dis_get_byte;
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Tue Jul 19 23:25:45 2016 (r303049)
+++ head/sys/conf/files.amd64 Wed Jul 20 00:02:10 2016 (r303050)
@@ -142,7 +142,7 @@ cddl/dev/dtrace/amd64/dtrace_asm.S opt
cddl/dev/dtrace/amd64/dtrace_subr.c optional dtrace
compile-with "${DTRACE_C}"
cddl/dev/fbt/x86/fbt_isa.c optional dtrace_fbt |
dtraceall compile-with "${FBT_C}"
cddl/dev/dtrace/x86/dis_tables.c optional dtrace_fbt |
dtraceall compile-with "${DTRACE_C}"
-cddl/dev/dtrace/amd64/instr_size.c optional dtrace_fbt |
dtraceall compile-with "${DTRACE_C}"
+cddl/dev/dtrace/x86/instr_size.c optional dtrace_fbt |
dtraceall compile-with "${DTRACE_C}"
crypto/aesni/aeskeys_amd64.S optional aesni
crypto/aesni/aesni.c optional aesni
aesni_ghash.o optional aesni \
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Tue Jul 19 23:25:45 2016 (r303049)
+++ head/sys/conf/files.i386 Wed Jul 20 00:02:10 2016 (r303050)
@@ -83,7 +83,7 @@ cddl/dev/dtrace/i386/dtrace_asm.S opti
cddl/dev/dtrace/i386/dtrace_subr.c optional dtrace
compile-with "${DTRACE_C}"
cddl/dev/fbt/x86/fbt_isa.c optional dtrace_fbt |
dtraceall compile-with "${FBT_C}"
cddl/dev/dtrace/x86/dis_tables.c optional dtrace_fbt |
dtraceall compile-with "${DTRACE_C}"
-cddl/dev/dtrace/i386/instr_size.c optional dtrace_fbt |
dtraceall compile-with "${DTRACE_C}"
+cddl/dev/dtrace/x86/instr_size.c optional dtrace_fbt |
dtraceall compile-with "${DTRACE_C}"
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_event.c optional compat_linux
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
