WebSVN – HelenOS-historic – Path Comparison – / – /kernel/trunk/arch/ppc32/include/ Rev 1373 and /kernel/trunk/arch/ppc32/include/ Rev 1374

Ignore whitespace Rev 1373 → Rev 1374

/kernel/trunk/arch/ppc32/include/console.h
File deleted

 /kernel/trunk/arch/ppc32/include/asm/regname.h
 ,6 → 189,22
 #define sprg2   274
 #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
 /* MSR bits */

/kernel/trunk/arch/ppc32/include/types.h
52,6 → 52,7
typedef struct {
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. /
} pte_t;

/kernel/trunk/arch/ppc32/include/asm.h
140,6 → 140,7

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);

 /kernel/trunk/arch/ppc32/include/mm/frame.h
 ,6 → 35,10
 #ifdef KERNEL
 #ifndef __ASM__
+#include <arch/types.h>
+extern __address last_frame;
 extern void frame_arch_init(void);
 #endif /* __ASM__ */

 /kernel/trunk/arch/ppc32/include/mm/page.h
 ,7 → 108,8
         (1 << PAGE_USER_SHIFT) |
         (1 << PAGE_READ_SHIFT) |
         (1 << PAGE_WRITE_SHIFT) |
-        (1 << PAGE_EXEC_SHIFT)
+        (1 << PAGE_EXEC_SHIFT) |
+        (p->g << PAGE_GLOBAL_SHIFT)
     );
 }
 ,11 → 118,32
     pte_t *p = &pt[i];
     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__ */
 #endif /* KERNEL */

 /kernel/trunk/arch/ppc32/include/mm/tlb.h
 ,26 → 29,5
 #ifndef __ppc32_TLB_H__
 #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