patch-1.3.4 linux/include/asm-sparc/processor.h

• Lines: 207
• Date: Sat Jun 10 08:55:58 1995
• Orig file: v1.3.3/linux/include/asm-sparc/processor.h
• Orig date: Wed Mar 1 09:12:33 1995

diff -u --recursive --new-file v1.3.3/linux/include/asm-sparc/processor.h linux/include/asm-sparc/processor.h
@@ -6,10 +6,14 @@
 #ifndef __ASM_SPARC_PROCESSOR_H
 #define __ASM_SPARC_PROCESSOR_H
 
+#include <linux/sched.h>  /* For intr_count */
+
+#include <asm/ptrace.h>   /* For pt_regs declaration */
+
 /*
  * Bus types
  */
-#define EISA_bus 1
+#define EISA_bus 0
 #define EISA_bus__is_a_macro /* for versions in ksyms.c */
 #define MCA_bus 0
 #define MCA_bus__is_a_macro /* for versions in ksyms.c */
@@ -17,24 +21,30 @@
 /*
  * Write Protection works right in supervisor mode on the Sparc
  */
-
+#if 0  /* Let's try this out ;) */
 #define wp_works_ok 1
 #define wp_works_ok__is_a_macro /* for versions in ksyms.c */
+#else
+extern char wp_works_ok;
+#endif
 
 /*
  * User space process size: 3GB. This is hardcoded into a few places,
  * so don't change it unless you know what you are doing.
  *
- * "this is gonna have to change to 1gig for the sparc" - David S. Miller
+ * With the way identity mapping works on the sun4c, this is the best
+ * value to use.
+ *
+ * This has to be looked into for a unified sun4c/sun4m task size.
  */
-#define TASK_SIZE	(0xC0000000UL)
+#define TASK_SIZE	(0xC000000UL)
 
 /*
  * Size of io_bitmap in longwords: 32 is ports 0-0x3ff.
  */
 #define IO_BITMAP_SIZE	32
 
-/* The first five entries here MUST be the first four. This allows me to
+/* The first four entries here MUST be the first four. This allows me to
  * do %lo(offset) loads and stores in entry.S. See TRAP_WIN_CLEAN to see
  * why.
  */
@@ -43,61 +53,32 @@
 	unsigned long uwindows;       /* how many user windows are in the set */
 	unsigned long wim;            /* user's window invalid mask */
 	unsigned long w_saved;        /* how many windows saved in reg_window[] */
-	unsigned long ksp;          /* kernel stack pointer */
-	unsigned long usp;          /* user's sp, throw reg windows here */
-	unsigned long psr;          /* save for condition codes */
-	unsigned long reg_window[16*24];
-	unsigned long cr3;          /* why changed from ptbr? */
-	unsigned int pcc;
-	unsigned int asn;
-	unsigned long unique;
-	unsigned long flags;
-	unsigned long res1, res2;
-	unsigned long pc;           /* program counter */
-	unsigned long npc;          /* next program counter */
+	unsigned long ksp;            /* kernel stack pointer */
+	unsigned long usp;            /* user's sp, throw reg windows here */
+	unsigned long psr;            /* save for condition codes */
+	unsigned long pc;             /* program counter */
+	unsigned long npc;            /* next program counter */
+	unsigned long yreg;
+	unsigned long align;          /* to get 8-byte alignment  XXX  */
+	unsigned long reg_window[16];
+	unsigned long pgd_ptr;
+	int context;                  /* The context allocated to this thread */
 
 /* 8 local registers + 8 in registers * 24 register windows.
- * Most sparcs I know of only have 8 windows implemented,
+ * Most sparcs I know of only have 7 or 8 windows implemented,
  * we determine how many at boot time and store that value
  * in nwindows.
  */
-	unsigned long globl_regs[8];  /* global regs need to be saved too */
-	unsigned long yreg;
 	unsigned long float_regs[64]; /* V8 and below have 32, V9 has 64 */
 };
 
-#define INIT_MMAP { &init_task, 0x0, 0x40000000, \
-		      PAGE_SHARED , VM_READ | VM_WRITE | VM_EXEC }
+#define INIT_MMAP { &init_task, (PAGE_OFFSET), (0xff000000UL), \
+		    0x0 , VM_READ | VM_WRITE | VM_EXEC }
 
 #define INIT_TSS  { \
-	0, 0, 0, 0, 0, 0, \
-        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, \
-	0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        { 0, 0, 0, 0, 0, 0, 0, 0, }, \
-        0, \
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
+        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, \
+	(long) &swapper_pg_dir, -1,  \
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
@@ -109,16 +90,14 @@
  * spill if things don't go right (bad user stack pointer). In reality
  * it is not per-process per se, it just sits in the kernel stack while
  * the current process is in a handler then it is basically forgotten
- * about.
+ * about the next time flow control goes back to that process.
  */
 
-struct thread_frame {
-  unsigned int thr_psr;
-  unsigned int thr_pc;
-  unsigned int thr_npc;
-  unsigned int thr_y;
-  unsigned int thr_globals[8];
-  unsigned int thr_outs[8];
+/* Sparc stack save area allocated for each save, not very exciting. */
+struct sparc_save_stack {
+  unsigned int locals[8];
+  unsigned int ins[8];
+  unsigned int padd[8];
 };
 
 /*
@@ -128,28 +107,36 @@
  */
 extern inline void start_bh_atomic(void)
 {
-	unsigned long dummy, psr;
-	__asm__ __volatile__("rd %%psr, %2\n\t"
-			     "wr %2, 0x20, %%psr\n\t"  /* disable traps */
-			     "ld %1,%0\n\t"
-			     "add %0,1,%0\n\t"
-			     "st %0,%1\n\t"
-			     "wr %2, 0x0, %%psr\n\t"   /* enable traps */
-			     : "=r" (dummy), "=m" (intr_count)
-			     : "0" (0), "r" (psr=0));
+	__asm__ __volatile__("rd %%psr, %%g2\n\t"
+			     "wr %%g2, 0x20, %%psr\n\t"  /* disable traps */
+			     "ld %0,%%g3\n\t"
+			     "add %%g3,1,%%g3\n\t"
+			     "st %%g3,%0\n\t"
+			     "wr %%g2, 0x0, %%psr\n\t"   /* enable traps */
+			     : "=m" (intr_count)
+			     : : "g2", "g3", "memory");
 }
 
 extern inline void end_bh_atomic(void)
 {
-	unsigned long dummy, psr;
-	__asm__ __volatile__("rd %%psr, %2\n\t"
-			     "wr %2, 0x20, %%psr\n\t"
-			     "ld %1,%0\n\t"
-			     "sub %0,1,%0\n\t"
-			     "st %0,%1\n\t"
-			     "wr %2, 0x0, %%psr\n\t"
-			     : "=r" (dummy), "=m" (intr_count)
-			     : "0" (0), "r" (psr=0));
+	__asm__ __volatile__("rd %%psr, %%g2\n\t"
+			     "wr %%g2, 0x20, %%psr\n\t"
+			     "ld %0,%%g3\n\t"
+			     "sub %%g3,1,%%g3\n\t"
+			     "st %%g3,%0\n\t"
+			     "wr %%g2, 0x0, %%psr\n\t"
+			     : "=m" (intr_count)
+			     : : "g2", "g3", "memory");
+}
+
+/*
+ * Do necessary setup to start up a newly executed thread.
+ */
+static inline void start_thread(struct pt_regs * regs, unsigned long sp,
+				unsigned long fp)
+{
+  printk("start_thread called, halting..n");
+  halt();
 }
 
 #endif /* __ASM_SPARC_PROCESSOR_H */