From b825df51c6a45a54f0bfc8eba6f68857a3883d6a Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Fri, 28 Mar 1997 12:46:52 +0000 Subject: [PATCH] Backed out rev.1.5. if %cs is bad, %eip may be bad, but this is no longer fatal. --- sys/amd64/include/db_machdep.h | 5 ++--- sys/i386/include/db_machdep.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h index 644f266c2cc4..aaa32f66661f 100644 --- a/sys/amd64/include/db_machdep.h +++ b/sys/amd64/include/db_machdep.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $Id$ + * $Id: db_machdep.h,v 1.12 1997/02/22 09:34:24 peter Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ @@ -41,8 +41,7 @@ typedef struct i386_saved_state db_regs_t; extern db_regs_t ddb_regs; /* register state */ #define DDB_REGS (&ddb_regs) -#define PC_REGS(regs) (((regs)->tf_cs & 0xfffc) == 0x08 \ - ? (db_addr_t)(regs)->tf_eip : 0) +#define PC_REGS(regs) ((db_addr_t)(regs)->tf_eip) #define BKPT_INST 0xcc /* breakpoint instruction */ #define BKPT_SIZE (1) /* size of breakpoint inst */ diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h index 644f266c2cc4..aaa32f66661f 100644 --- a/sys/i386/include/db_machdep.h +++ b/sys/i386/include/db_machdep.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $Id$ + * $Id: db_machdep.h,v 1.12 1997/02/22 09:34:24 peter Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ @@ -41,8 +41,7 @@ typedef struct i386_saved_state db_regs_t; extern db_regs_t ddb_regs; /* register state */ #define DDB_REGS (&ddb_regs) -#define PC_REGS(regs) (((regs)->tf_cs & 0xfffc) == 0x08 \ - ? (db_addr_t)(regs)->tf_eip : 0) +#define PC_REGS(regs) ((db_addr_t)(regs)->tf_eip) #define BKPT_INST 0xcc /* breakpoint instruction */ #define BKPT_SIZE (1) /* size of breakpoint inst */