diff options
| author | markj <markj@FreeBSD.org> | 2014-07-19 02:27:31 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2014-07-19 02:27:31 +0000 |
| commit | e18e12eeda651225217c76222f3c02c0a4be7e21 (patch) | |
| tree | fa6acb894a16dcf66be48bf8b580edf47ec7b566 /sys/amd64/amd64/exception.S | |
| parent | b52adc3cf784516c00d22e01d78cc3affddab3bd (diff) | |
| download | FreeBSD-src-e18e12eeda651225217c76222f3c02c0a4be7e21.zip FreeBSD-src-e18e12eeda651225217c76222f3c02c0a4be7e21.tar.gz | |
Use a C wrapper for trap() instead of checking and calling the DTrace trap
hook in assembly.
Suggested by: kib
Reviewed by: kib (original version)
X-MFC-With: r268600
Diffstat (limited to 'sys/amd64/amd64/exception.S')
| -rw-r--r-- | sys/amd64/amd64/exception.S | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index bb5fd56..2a908a9 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -228,24 +228,7 @@ alltraps_pushregs_no_rdi: .type calltrap,@function calltrap: movq %rsp,%rdi -#ifdef KDTRACE_HOOKS - /* - * Give DTrace a chance to vet this trap and skip the call to trap() if - * it turns out that it was caused by a DTrace probe. - */ - movq dtrace_trap_func,%rax - testq %rax,%rax - je skiphook - call *%rax - testq %rax,%rax - jne skiptrap - movq %rsp,%rdi -skiphook: -#endif - call trap -#ifdef KDTRACE_HOOKS -skiptrap: -#endif + call trap_check MEXITCOUNT jmp doreti /* Handle any pending ASTs */ |
