xnu-517.3.15.tar.gz

[apple/xnu.git] / osfmk / i386 / genassym.c

diff --git a/osfmk/i386/genassym.c b/osfmk/i386/genassym.c
index 302dbe497746c44f671856898ce9e9f11c985fe0..07a4d1c27057b070943b3ca483ad2341f70143ec 100644 (file)
--- a/osfmk/i386/genassym.c
+++ b/osfmk/i386/genassym.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -94,6 +97,7 @@ cpu_data_t    cpu_data[NCPUS];
  * the values, but we cannot run anything on the target machine.
  */
 
+#undef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE)0)->MEMBER)
 
 #if  0
@@ -116,15 +120,30 @@ main(
 
        DECLARE("AST_URGENT",           AST_URGENT);
 
+       /* Simple Lock structure */
+       DECLARE("SLOCK_ILK",    offsetof(usimple_lock_t, interlock));
+#if    MACH_LDEBUG
+       DECLARE("SLOCK_TYPE",   offsetof(usimple_lock_t, lock_type));
+       DECLARE("SLOCK_PC",     offsetof(usimple_lock_t, debug.lock_pc));
+       DECLARE("SLOCK_THREAD", offsetof(usimple_lock_t, debug.lock_thread));
+       DECLARE("SLOCK_DURATIONH",offsetof(usimple_lock_t, debug.duration[0]));
+       DECLARE("SLOCK_DURATIONL",offsetof(usimple_lock_t, debug.duration[1]));
+       DECLARE("USLOCK_TAG",   USLOCK_TAG);
+#endif /* MACH_LDEBUG */
+
+       /* Mutex structure */
+       DECLARE("MUTEX_LOCKED", offsetof(mutex_t *, locked));
+       DECLARE("MUTEX_WAITERS",offsetof(mutex_t *, waiters));
+       DECLARE("MUTEX_PROMOTED_PRI",offsetof(mutex_t *, promoted_pri));
+#if    MACH_LDEBUG
+       DECLARE("MUTEX_TYPE",   offsetof(mutex_t *, type));
+       DECLARE("MUTEX_PC",     offsetof(mutex_t *, pc));
+       DECLARE("MUTEX_THREAD", offsetof(mutex_t *, thread));
+       DECLARE("MUTEX_TAG",    MUTEX_TAG);
+#endif /* MACH_LDEBUG */
+                                                
 #if    MACH_LDEBUG
-       /*
-        * XXX 
-        */
-#define        SIMPLE_LOCK_TAG 0x5353
-#define        MUTEX_TAG       0x4d4d
        DECLARE("TH_MUTEX_COUNT",       offsetof(thread_t, mutex_count));
-       DECLARE("SIMPLE_LOCK_TAG",      SIMPLE_LOCK_TAG);
-       DECLARE("MUTEX_TAG",            MUTEX_TAG);
 #endif /* MACH_LDEBUG */
        DECLARE("TH_RECOVER",           offsetof(thread_t, recover));
        DECLARE("TH_CONTINUATION",      offsetof(thread_t, continuation));
@@ -142,15 +161,11 @@ main(
         DECLARE("ACT_THREAD",  offsetof(thread_act_t, thread));
        DECLARE("ACT_TASK",     offsetof(thread_act_t, task));
        DECLARE("ACT_PCB",      offsetof(thread_act_t, mact.pcb));
-       DECLARE("ACT_KLOADED",  offsetof(thread_act_t, kernel_loaded));
-       DECLARE("ACT_KLOADING", offsetof(thread_act_t, kernel_loading));
        DECLARE("ACT_LOWER",    offsetof(thread_act_t, lower));
        DECLARE("ACT_MAP",      offsetof(thread_act_t, map));
 
        DECLARE("MAP_PMAP",     offsetof(vm_map_t, pmap));
 
-       DECLARE("HOST_NAME",    offsetof(host_t, host_self));
-
        DECLARE("DISP_MIN",     offsetof(eml_dispatch_t, disp_min));
        DECLARE("DISP_COUNT",   offsetof(eml_dispatch_t, disp_count));
        DECLARE("DISP_VECTOR",  offsetof(eml_dispatch_t, disp_vector[0]));
@@ -237,6 +252,14 @@ main(
                offsetof(cpu_data_t *, interrupt_level));
         DECLARE("CPD_SIMPLE_LOCK_COUNT",
                offsetof(cpu_data_t *,simple_lock_count));
+        DECLARE("CPD_CPU_NUMBER",
+               offsetof(cpu_data_t *,cpu_number));
+        DECLARE("CPD_CPU_PHYS_NUMBER",
+               offsetof(cpu_data_t *,cpu_phys_number));
+        DECLARE("CPD_CPU_STATUS",
+               offsetof(cpu_data_t *,cpu_status));
+        DECLARE("CPD_MCOUNT_OFF",
+               offsetof(cpu_data_t *,mcount_off));
 
        DECLARE("PTES_PER_PAGE",        NPTES);
        DECLARE("INTEL_PTE_KERNEL",     INTEL_PTE_VALID|INTEL_PTE_WRITE);