Changeset 6da1013f in mainline for kernel/arch/mips32

Timestamp:

2009-02-12T20:09:19Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

84266669

Parents:

7004747

Message:

simplify configuration
introduce arch_construct_function and inb/outb (sometimes empty) on all platforms
various code cleanup

Location:

kernel/arch/mips32

Files:

• include/asm.h (modified) (1 diff)
• include/context_offset.h (modified) (4 diffs)
• src/asm.S (modified) (2 diffs)
• src/drivers/msim.c (modified) (1 diff)
• src/fpu_context.c (modified) (2 diffs)
• src/mips32.c (modified) (4 diffs)
• src/mm/frame.c (modified) (4 diffs)

kernel/arch/mips32/include/asm.h

@@ -71 +71 @@
 extern ipl_t interrupts_read(void);
 
+/** No I/O port address space on MIPS. */
+static inline void outb(ioport_t port, uint8_t v)
+{
+}
+
+/** No I/O port address space on MIPS. */
+static inline uint8_t inb(ioport_t port)
+{
+        return 0;
+}
+
 #endif
 

kernel/arch/mips32/include/context_offset.h

@@ -115 +115 @@
         sw $gp,OFFSET_GP(\ctx)
 
-#ifndef KERNEL          
+#ifndef KERNEL
         sw $k1,OFFSET_TLS(\ctx)
 
-# ifdef CONFIG_MIPS_FPU 
+#ifdef CONFIG_FPU
         mfc1 $t0,$20
         sw $t0, OFFSET_F20(\ctx)
@@ -151 +151 @@
         mfc1 $t0,$30
         sw $t0, OFFSET_F30(\ctx)
-# endif /* CONFIG_MIPS_FPU */   
+#endif /* CONFIG_FPU */
 #endif /* KERNEL */
 
@@ -173 +173 @@
         lw $k1,OFFSET_TLS(\ctx)
 
-# ifdef CONFIG_MIPS_FPU 
+#ifdef CONFIG_FPU
         lw $t0, OFFSET_F20(\ctx)
         mtc1 $t0,$20
@@ -206 +206 @@
         lw $t0, OFFSET_F30(\ctx)
         mtc1 $t0,$30
-# endif /* CONFIG_MIPS_FPU */
-        
+#endif /* CONFIG_FPU */
 #endif /* KERNEL */
+
         lw $ra,OFFSET_PC(\ctx)
         lw $sp,OFFSET_SP(\ctx)

kernel/arch/mips32/src/asm.S

@@ -160 +160 @@
 .global fpu_context_save
 fpu_context_save:
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
         fpu_gp_save 0,$a0
         fpu_gp_save 1,$a0
@@ -231 +231 @@
 .global fpu_context_restore
 fpu_context_restore:
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
         fpu_gp_restore 0,$a0
         fpu_gp_restore 1,$a0

kernel/arch/mips32/src/drivers/msim.c

@@ -77 +77 @@
 }
 
-#include <print.h>
 /** Read character using polling, assume interrupts disabled */
 static char msim_do_read(chardev_t *dev)

kernel/arch/mips32/src/fpu_context.c

@@ -41 +41 @@
 void fpu_disable(void)
 {       
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
         cp0_status_write(cp0_status_read() & ~cp0_status_fpu_bit);
 #endif
@@ -48 +48 @@
 void fpu_enable(void)
 {
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
         cp0_status_write(cp0_status_read() | cp0_status_fpu_bit);
 #endif

kernel/arch/mips32/src/mips32.c

@@ -112 +112 @@
         cp0_status_write(cp0_status_read() &
             ~(cp0_status_bev_bootstrap_bit | cp0_status_erl_error_bit));
-
-        /* 
-         * Mask all interrupts 
+        
+        /*
+         * Mask all interrupts
          */
         cp0_mask_all_int();
-                
+        
         debugger_init();
 }
@@ -133 +133 @@
                 .y = 480,
                 .scan = 1920,
-                .visual = VISUAL_RGB_8_8_8,
+                .visual = VISUAL_BGR_8_8_8,
         };
         fb_init(&gxemul_prop);
 #endif
-        sysinfo_set_item_val("machine." STRING(MACHINE), NULL, 1);
+
+#ifdef msim
+        sysinfo_set_item_val("machine.msim", NULL, 1);
+#endif
+
+#ifdef simics
+        sysinfo_set_item_val("machine.simics", NULL, 1);
+#endif
+
+#ifdef bgxemul
+        sysinfo_set_item_val("machine.bgxemul", NULL, 1);
+#endif
+
+#ifdef lgxemul
+        sysinfo_set_item_val("machine.lgxemul", NULL, 1);
+#endif
 }
 
@@ -162 +177 @@
             (uintptr_t) kernel_uarg->uspace_entry);
         
-        while (1)
-                ;
+        while (1);
 }
 
@@ -196 +210 @@
         ___halt();
         
-        while (1)
-                ;
+        while (1);
+}
+
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+        return addr;
 }
 

kernel/arch/mips32/src/mm/frame.c

@@ -76 +76 @@
 static bool frame_available(pfn_t frame)
 {
-#if MACHINE == msim
+#ifdef msim
         /* MSIM device (dprinter) */
         if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH))
@@ -86 +86 @@
 #endif
 
-#if MACHINE == simics
+#ifdef simics
         /* Simics device (serial line) */
         if (frame == (KA2PA(SERIAL_ADDRESS) >> ZERO_PAGE_WIDTH))
@@ -92 +92 @@
 #endif
 
-#if (MACHINE == lgxemul) || (MACHINE == bgxemul)
+#if defined(lgxemul) || defined(bgxemul)
         /* gxemul devices */
         if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
@@ -219 +219 @@
                                         if (ZERO_PAGE_VALUE != 0xdeadbeef)
                                                 avail = false;
-#if (MACHINE == lgxemul) || (MACHINE == bgxemul)
+#if defined(lgxemul) || defined(bgxemul)
                                         else {
                                                 ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;