xnu-792.6.61.tar.gz

[apple/xnu.git] / osfmk / i386 / db_machdep.h

diff --git a/osfmk/i386/db_machdep.h b/osfmk/i386/db_machdep.h
index 09acd12c9edc0227779dbdda8c8376c5473bed64..147140acd30038f4d2444790ac5780c682ccc1cb 100644 (file)
--- a/osfmk/i386/db_machdep.h
+++ b/osfmk/i386/db_machdep.h
@@ -116,13 +116,9 @@ int db_inst_store(unsigned long);
 
 /*
  * Given pointer to i386_saved_state, determine if it represents
- * a thread executing a) in user space, b) in the kernel, or c)
- * in a kernel-loaded task.  Return true for cases a) and c).
+ * a thread executing in user space.
  */
-#define IS_USER_TRAP(regs, etext)      ((((regs)->cs & 3) != 0) || \
-       (current_act() &&                                       \
-               current_act()->kernel_loaded &&                 \
-               ((char *)(regs)->eip > (etext))))
+#define IS_USER_TRAP(regs, etext)      (((regs)->cs & 3) != 0)
 
 extern boolean_t       db_check_access(
                                vm_offset_t     addr,
@@ -170,7 +166,7 @@ extern void         db_task_name(
 
 /* macro for checking if a thread has used floating-point */
 
-#define db_act_fp_used(act)    (act && act->mact.pcb->ims.ifps)
+#define db_act_fp_used(act)    (act && act->machine.pcb->ims.ifps)
 
 extern void            db_tss_to_frame(
                                int                     tss_sel,