reorganize headers

mips/Makefile.arch

@@ -35,7 +35,7 @@ uimage:
 mips/entry.o: $(boot_threads)
 mips/init.o: TARGET_FLAGS = -I/usr/include
 $(boot_threads): TARGET_FLAGS = -I.
-$(boot_threads): boot-programs/jz4730.hh boot-programs/devices.hh
+$(boot_threads): mips/jz4730.hh boot-programs/devices.hh
 
 # Transform ':' into ';' so vim doesn't think there are errors.
 uimage: kernel.raw.gz Makefile mips/Makefile.arch

mips/arch.hhp

@@ -20,6 +20,11 @@
 #define _ARCH_HH
 
 #ifdef ARCH
+
+#ifndef ASM
+#include "jz4730.hh"
+#endif
+
 #define reg_hack(x...) #x
 #define cp0_get(reg, target) do { __asm__ volatile ("mfc0 %0, $" reg_hack(reg) : "=r" (target)); } while (0)
 #define cp0_set(reg, value) do { __asm__ volatile ("mtc0 %0, $" reg_hack(reg) :: "r" (value)); } while (0)
@@ -59,8 +64,10 @@
 #define CP0_DATA_HI 29, 1
 #define CP0_ERROR_EPC 30
 #define CP0_DESAVE 31
+
 #endif
 
+#ifdef __KERNEL
 // register save positions in Thread
 #define SAVE_PC (5 * 4)
 #define SAVE_SP (SAVE_PC + 4)
@@ -157,6 +164,8 @@ extern unsigned thread_start[NUM_THREADS + 1]
 // Fast pointer to page directory, for tlb miss events
 extern unsigned **directory
 
-#endif // defined ASM
+#endif // not defined ASM
+
+#endif // defined __KERNEL
 
 #endif

mips/entry.S

@@ -25,6 +25,7 @@
 
 #define ARCH
 #define ASM
+#define __KERNEL
 #include "arch.hh"
 
 addr_000: