Changeset b3f8fb7 in mainline for kernel/arch/sparc64/include/mm/as.h

Timestamp:

2007-01-28T13:25:49Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8e8c1a5

Parents:

1ba41c5

Message:

huge type system cleanup
remove cyclical type dependencies across multiple header files
many minor coding style fixes

File:

• kernel/arch/sparc64/include/mm/as.h (modified) (2 diffs)

kernel/arch/sparc64/include/mm/as.h

@@ -36 +36 @@
 #define KERN_sparc64_AS_H_
 
-#ifdef CONFIG_TSB
-#include <arch/mm/tsb.h>
-#endif
+#include <arch/mm/tte.h>
 
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      1
@@ -47 +45 @@
 #define USER_ADDRESS_SPACE_END_ARCH             (unsigned long) 0xffffffffffffffff
 
-#define USTACK_ADDRESS_ARCH     (0xffffffffffffffffULL-(PAGE_SIZE-1))
+#define USTACK_ADDRESS_ARCH     (0xffffffffffffffffULL - (PAGE_SIZE - 1))
+
+#ifdef CONFIG_TSB
+
+/** TSB Tag Target register. */
+typedef union tsb_tag_target {
+        uint64_t value;
+        struct {
+                unsigned invalid : 1;   /**< Invalidated by software. */
+                unsigned : 2;
+                unsigned context : 13;  /**< Software ASID. */
+                unsigned : 6;
+                uint64_t va_tag : 42;   /**< Virtual address bits <63:22>. */
+        } __attribute__ ((packed));
+} tsb_tag_target_t;
+
+/** TSB entry. */
+typedef struct tsb_entry {
+        tsb_tag_target_t tag;
+        tte_data_t data;
+} __attribute__ ((packed)) tsb_entry_t;
 
 typedef struct {
-#ifdef CONFIG_TSB
         tsb_entry_t *itsb;
         tsb_entry_t *dtsb;
-#endif /* CONFIG_TSB */
 } as_arch_t;
 
+#else
+
+typedef struct {
+} as_arch_t;
+
+#endif /* CONFIG_TSB */
+
+#include <genarch/mm/as_ht.h>
+
 #ifdef CONFIG_TSB
+#       include <arch/mm/tsb.h>
 #       define as_invalidate_translation_cache(as, page, cnt)   tsb_invalidate(as, page, cnt)
 #else