diff options
| -rw-r--r-- | sys/amd64/amd64/exception.S | 6 | ||||
| -rw-r--r-- | sys/amd64/amd64/exception.s | 6 | ||||
| -rw-r--r-- | sys/i386/i386/exception.s | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 419fbd252948..ddfd38834b24 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -109,8 +109,6 @@ __CONCAT(__CONCAT(bdb_,name),_ljmp): \ #define BDBTRAP(name) #endif -#define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) - MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) @@ -118,12 +116,12 @@ IDTVEC(div) pushl $0; TRAP(T_DIVIDE) IDTVEC(dbg) BDBTRAP(dbg) - pushl $0; BPTTRAP(T_TRCTRAP) + pushl $0; TRAP(T_TRCTRAP) IDTVEC(nmi) pushl $0; TRAP(T_NMI) IDTVEC(bpt) BDBTRAP(bpt) - pushl $0; BPTTRAP(T_BPTFLT) + pushl $0; TRAP(T_BPTFLT) IDTVEC(ofl) pushl $0; TRAP(T_OFLOW) IDTVEC(bnd) diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s index 419fbd252948..ddfd38834b24 100644 --- a/sys/amd64/amd64/exception.s +++ b/sys/amd64/amd64/exception.s @@ -109,8 +109,6 @@ __CONCAT(__CONCAT(bdb_,name),_ljmp): \ #define BDBTRAP(name) #endif -#define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) - MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) @@ -118,12 +116,12 @@ IDTVEC(div) pushl $0; TRAP(T_DIVIDE) IDTVEC(dbg) BDBTRAP(dbg) - pushl $0; BPTTRAP(T_TRCTRAP) + pushl $0; TRAP(T_TRCTRAP) IDTVEC(nmi) pushl $0; TRAP(T_NMI) IDTVEC(bpt) BDBTRAP(bpt) - pushl $0; BPTTRAP(T_BPTFLT) + pushl $0; TRAP(T_BPTFLT) IDTVEC(ofl) pushl $0; TRAP(T_OFLOW) IDTVEC(bnd) diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 419fbd252948..ddfd38834b24 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -109,8 +109,6 @@ __CONCAT(__CONCAT(bdb_,name),_ljmp): \ #define BDBTRAP(name) #endif -#define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) - MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) @@ -118,12 +116,12 @@ IDTVEC(div) pushl $0; TRAP(T_DIVIDE) IDTVEC(dbg) BDBTRAP(dbg) - pushl $0; BPTTRAP(T_TRCTRAP) + pushl $0; TRAP(T_TRCTRAP) IDTVEC(nmi) pushl $0; TRAP(T_NMI) IDTVEC(bpt) BDBTRAP(bpt) - pushl $0; BPTTRAP(T_BPTFLT) + pushl $0; TRAP(T_BPTFLT) IDTVEC(ofl) pushl $0; TRAP(T_OFLOW) IDTVEC(bnd) |