diff options
| author | bde <bde@FreeBSD.org> | 2001-08-13 12:42:13 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2001-08-13 12:42:13 +0000 |
| commit | bde6e6cc5a5b4bbb6ac0c999b4d6b5c4a798fb53 (patch) | |
| tree | 1a09905b68b255f007a252992c19aea33ded8895 /sys/amd64 | |
| parent | 87c263c2a197c7dbdf536a888c08e18f9fb640bb (diff) | |
| download | FreeBSD-src-bde6e6cc5a5b4bbb6ac0c999b4d6b5c4a798fb53.zip FreeBSD-src-bde6e6cc5a5b4bbb6ac0c999b4d6b5c4a798fb53.tar.gz | |
Removed he BPTTRAP() macro and its use. It was intended for restoring
bug for bug compatibility to ddb trap handlers after fixing the debugger
trap gates to be interrupt gates, but the fix was never committed. Now
I want the fix to apply to ddb.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/exception.S | 6 | ||||
| -rw-r--r-- | sys/amd64/amd64/exception.s | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 419fbd2..ddfd388 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 419fbd2..ddfd388 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) |
