Changeset 35f3b8c in mainline for arch/ppc32/include

Timestamp:

2006-05-18T23:24:40Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c0bc189

Parents:

8424198

Message:

ppc32 work
update framebuffer
get rid of the BAT memory mapping (not finished yet)

Location:

arch/ppc32/include

Files:

• asm.h (modified) (1 diff)
• asm/regname.h (modified) (1 diff)
• console.h (deleted)
• mm/frame.h (modified) (1 diff)
• mm/page.h (modified) (2 diffs)
• mm/tlb.h (modified) (1 diff)
• types.h (modified) (1 diff)

arch/ppc32/include/asm.h

@@ -141 +141 @@
 void cpu_halt(void);
 void asm_delay_loop(__u32 t);
+void invalidate_bat(void);
 
 extern void userspace_asm(__address uspace_uarg, __address stack, __address entry);

arch/ppc32/include/asm/regname.h

@@ -190 +190 @@
 #define sprg3   275
 #define prv             287
+#define ibat0u  528
+#define ibat0l  529
+#define ibat1u  530
+#define ibat1l  531
+#define ibat2u  532
+#define ibat2l  533
+#define ibat3u  534
+#define ibat3l  535
+#define dbat0u  536
+#define dbat0l  537
+#define dbat1u  538
+#define dbat1l  539
+#define dbat2u  540
+#define dbat2l  541
+#define dbat3u  542
+#define dbat3l  543
 #define hid0    1008
 

arch/ppc32/include/mm/frame.h

@@ -36 +36 @@
 #ifndef __ASM__
 
+#include <arch/types.h> 
+
+extern __address last_frame;
+
 extern void frame_arch_init(void);
 

arch/ppc32/include/mm/page.h

@@ -109 +109 @@
                 (1 << PAGE_READ_SHIFT) |
                 (1 << PAGE_WRITE_SHIFT) |
-                (1 << PAGE_EXEC_SHIFT)
+                (1 << PAGE_EXEC_SHIFT) |
+                (p->g << PAGE_GLOBAL_SHIFT)
         );
 }
@@ -118 +119 @@
         
         p->p = !(flags & PAGE_NOT_PRESENT);
+        p->g = (flags & PAGE_GLOBAL) != 0;
         p->valid = 1;
 }
 
 extern void page_arch_init(void);
+
+#define PHT_BITS        16
+#define PHT_ORDER       4
+
+typedef struct {
+        unsigned v : 1;          /**< Valid */
+        unsigned vsid : 24;      /**< Virtual Segment ID */
+        unsigned h : 1;          /**< Primary/secondary hash */
+        unsigned api : 6;        /**< Abbreviated Page Index */
+        unsigned rpn : 20;       /**< Real Page Number */
+        unsigned reserved0 : 3;
+        unsigned r : 1;          /**< Reference */
+        unsigned c : 1;          /**< Change */
+        unsigned wimg : 4;       /**< Access control */
+        unsigned reserved1 : 1;
+        unsigned pp : 2;         /**< Page protection */
+} phte_t;
+
+extern void pht_refill(bool data, istate_t *istate);
+extern void pht_init(void);
 
 #endif /* __ASM__ */

arch/ppc32/include/mm/tlb.h

@@ -30 +30 @@
 #define __ppc32_TLB_H__
 
-#include <arch/exception.h>
-#include <typedefs.h>
-
-#define PHT_BITS        16
-#define PHT_ORDER       4
-
-typedef struct {
-        unsigned v : 1;          /**< Valid */
-        unsigned vsid : 24;      /**< Virtual Segment ID */
-        unsigned h : 1;          /**< Primary/secondary hash */
-        unsigned api : 6;        /**< Abbreviated Page Index */
-        unsigned rpn : 20;       /**< Real Page Number */
-        unsigned reserved0 : 3;
-        unsigned r : 1;          /**< Reference */
-        unsigned c : 1;          /**< Change */
-        unsigned wimg : 4;       /**< Access control */
-        unsigned reserved1 : 1;
-        unsigned pp : 2;         /**< Page protection */
-} phte_t;
-
-extern void pht_refill(bool data, istate_t *istate);
 
 #endif

arch/ppc32/include/types.h

@@ -53 +53 @@
         unsigned p : 1;       /**< Present bit. */
         unsigned a : 1;       /**< Accessed bit. */
+        unsigned g : 1;       /**< Global bit. */
         unsigned valid : 1;   /**< Valid content even if not present. */
         unsigned pfn : 20;    /**< Physical frame number. */