X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..e2fac8b15b12a7979f72090454d850e612fc5b13:/osfmk/i386/commpage/commpage.h?ds=sidebyside

diff --git a/osfmk/i386/commpage/commpage.h b/osfmk/i386/commpage/commpage.h
index caa6cba68..0288a906c 100644
--- a/osfmk/i386/commpage/commpage.h
+++ b/osfmk/i386/commpage/commpage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -33,8 +33,15 @@
 #include <stdint.h>
 #endif /* __ASSEMBLER__ */
 
+/* The following macro is used to generate the 64-bit commpage address for a given
+ * routine, based on its 32-bit address.  This is used in the kernel to compile
+ * the 64-bit commpage.  Since the kernel is a 32-bit object, cpu_capabilities.h
+ * only defines the 32-bit address.
+ */
+#define	_COMM_PAGE_32_TO_64( ADDRESS )	( ADDRESS + _COMM_PAGE64_START_ADDRESS - _COMM_PAGE32_START_ADDRESS )
+
+
 #ifdef	__ASSEMBLER__
-#include <machine/asm.h>
 
 #define	COMMPAGE_DESCRIPTOR(label,address,must,cant)	\
 L ## label ## _end:					;\
@@ -65,18 +72,31 @@ typedef	struct	commpage_descriptor	{
 } commpage_descriptor;
 
 
-extern	char	*commPagePtr;				// virt address of commpage in kernel map
+/* Warning: following structure must match the layout of the commpage.  */
+/* This is the data starting at _COMM_PAGE_TIME_DATA_START, ie for nanotime() and gettimeofday() */
+
+typedef	volatile struct	commpage_time_data	{
+	uint64_t	nt_tsc_base;				// _COMM_PAGE_NT_TSC_BASE
+	uint32_t	nt_scale;				// _COMM_PAGE_NT_SCALE
+	uint32_t	nt_shift;				// _COMM_PAGE_NT_SHIFT
+	uint64_t	nt_ns_base;				// _COMM_PAGE_NT_NS_BASE
+	uint32_t	nt_generation;				// _COMM_PAGE_NT_GENERATION
+	uint32_t	gtod_generation;			// _COMM_PAGE_GTOD_GENERATION
+	uint64_t	gtod_ns_base;				// _COMM_PAGE_GTOD_NS_BASE
+	uint64_t	gtod_sec_base;				// _COMM_PAGE_GTOD_SEC_BASE
+} commpage_time_data;
+
+
+extern	char	*commPagePtr32;				// virt address of 32-bit commpage in kernel map
+extern	char	*commPagePtr64;				// ...and of 64-bit commpage
+
+extern	void	commpage_set_timestamp(uint64_t abstime, uint64_t secs);
+
+extern	void	commpage_disable_timestamp( void );
 
-extern	void	commpage_set_timestamp(uint64_t tbr,uint32_t secs,uint32_t usecs,uint32_t ticks_per_sec);
+extern  void	commpage_set_nanotime(uint64_t tsc_base, uint64_t ns_base, uint32_t scale, uint32_t shift);
 
-typedef struct {
-	uint64_t	nt_base_tsc;
-	uint64_t	nt_base_ns; 
-	uint32_t	nt_scale;
-	uint32_t	nt_shift;
-	uint64_t	nt_check_tsc;
-} commpage_nanotime_t;
-extern  void	commpage_set_nanotime(commpage_nanotime_t *new_nanotime);
+extern	void	commpage_sched_gen_inc(void);
 
 #endif	/* __ASSEMBLER__ */