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 9a62924517fbfae6b01feca6b5c87c17f9eed319..147140acd30038f4d2444790ac5780c682ccc1cb 100644 (file)
--- a/osfmk/i386/db_machdep.h
+++ b/osfmk/i386/db_machdep.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -119,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,
@@ -173,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,