diff options
Diffstat (limited to 'sys/cddl/dev')
| -rw-r--r-- | sys/cddl/dev/dtrace/amd64/instr_size.c | 6 | ||||
| -rw-r--r-- | sys/cddl/dev/dtrace/dtrace_ioctl.c | 10 | ||||
| -rw-r--r-- | sys/cddl/dev/dtrace/i386/instr_size.c | 6 | ||||
| -rw-r--r-- | sys/cddl/dev/dtrace/x86/regset.h | 12 |
4 files changed, 17 insertions, 17 deletions
diff --git a/sys/cddl/dev/dtrace/amd64/instr_size.c b/sys/cddl/dev/dtrace/amd64/instr_size.c index 1acf2c5..b3afcb7 100644 --- a/sys/cddl/dev/dtrace/amd64/instr_size.c +++ b/sys/cddl/dev/dtrace/amd64/instr_size.c @@ -30,14 +30,14 @@ /* All Rights Reserved */ -#if defined(sun) +#ifdef illumos #pragma ident "@(#)instr_size.c 1.14 05/07/08 SMI" #endif #include <sys/types.h> #include <sys/param.h> #include <sys/proc.h> -#if defined(sun) +#ifdef illumos #include <sys/cmn_err.h> #include <sys/archsystm.h> #include <sys/copyops.h> @@ -104,7 +104,7 @@ dtrace_dis_isize(uchar_t *instr, dis_isize_t which, model_t model, int *rmindex) dis86_t x; uint_t mode = SIZE64; -#if defined(sun) +#ifdef illumos mode = (model == DATAMODEL_LP64) ? SIZE64 : SIZE32; #endif diff --git a/sys/cddl/dev/dtrace/dtrace_ioctl.c b/sys/cddl/dev/dtrace/dtrace_ioctl.c index e261091..ef9bed5 100644 --- a/sys/cddl/dev/dtrace/dtrace_ioctl.c +++ b/sys/cddl/dev/dtrace/dtrace_ioctl.c @@ -578,14 +578,14 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, return (EINVAL); mutex_enter(&dtrace_provider_lock); -#if defined(sun) +#ifdef illumos mutex_enter(&mod_lock); #endif mutex_enter(&dtrace_lock); if (desc->dtargd_id > dtrace_nprobes) { mutex_exit(&dtrace_lock); -#if defined(sun) +#ifdef illumos mutex_exit(&mod_lock); #endif mutex_exit(&dtrace_provider_lock); @@ -594,7 +594,7 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, if ((probe = dtrace_probes[desc->dtargd_id - 1]) == NULL) { mutex_exit(&dtrace_lock); -#if defined(sun) +#ifdef illumos mutex_exit(&mod_lock); #endif mutex_exit(&dtrace_provider_lock); @@ -620,7 +620,7 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, probe->dtpr_id, probe->dtpr_arg, desc); } -#if defined(sun) +#ifdef illumos mutex_exit(&mod_lock); #endif mutex_exit(&dtrace_provider_lock); @@ -779,7 +779,7 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, dstate = &state->dts_vstate.dtvs_dynvars; for (i = 0; i < NCPU; i++) { -#if !defined(sun) +#ifndef illumos if (pcpu_find(i) == NULL) continue; #endif diff --git a/sys/cddl/dev/dtrace/i386/instr_size.c b/sys/cddl/dev/dtrace/i386/instr_size.c index 7f667f7..11fbf9b 100644 --- a/sys/cddl/dev/dtrace/i386/instr_size.c +++ b/sys/cddl/dev/dtrace/i386/instr_size.c @@ -30,14 +30,14 @@ /* All Rights Reserved */ -#if defined(sun) +#ifdef illumos #pragma ident "@(#)instr_size.c 1.14 05/07/08 SMI" #endif #include <sys/types.h> #include <sys/param.h> #include <sys/proc.h> -#if defined(sun) +#ifdef illumos #include <sys/cmn_err.h> #include <sys/archsystm.h> #include <sys/copyops.h> @@ -104,7 +104,7 @@ dtrace_dis_isize(uchar_t *instr, dis_isize_t which, model_t model, int *rmindex) dis86_t x; uint_t mode = SIZE32; -#if defined(sun) +#ifdef illumos mode = (model == DATAMODEL_LP64) ? SIZE64 : SIZE32; #endif diff --git a/sys/cddl/dev/dtrace/x86/regset.h b/sys/cddl/dev/dtrace/x86/regset.h index b1c5116..ad12e26 100644 --- a/sys/cddl/dev/dtrace/x86/regset.h +++ b/sys/cddl/dev/dtrace/x86/regset.h @@ -61,7 +61,7 @@ extern "C" { #define REG_GSBASE 27 #define REG_FSBASE 26 -#if defined(sun) +#ifdef illumos #define REG_DS 25 #define REG_ES 24 @@ -89,7 +89,7 @@ extern "C" { #define REG_R13 2 #define REG_R14 1 #define REG_R15 0 -#else +#else /* !illumos */ #define REG_SS 25 #define REG_RSP 24 #define REG_RFL 23 @@ -116,13 +116,13 @@ extern "C" { #define REG_R13 2 #define REG_R14 1 #define REG_R15 0 -#endif +#endif /* illumos */ /* * The names and offsets defined here are specified by i386 ABI suppl. */ -#if defined(sun) +#ifdef illumos #define SS 18 /* only stored on a privilege transition */ #define UESP 17 /* only stored on a privilege transition */ #define EFL 16 @@ -142,7 +142,7 @@ extern "C" { #define ES 2 #define FS 1 #define GS 0 -#else +#else /* !illumos */ #define GS 18 #define SS 17 /* only stored on a privilege transition */ #define UESP 16 /* only stored on a privilege transition */ @@ -162,7 +162,7 @@ extern "C" { #define DS 2 #define ES 1 #define FS 0 -#endif +#endif /* illumos */ #define REG_PC EIP #define REG_FP EBP |
