Changeset 86748ff in rtems

Timestamp:

10/24/00 21:50:37 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

5b53d97

Parents:

fda47cd

Message:

2000-10-24 Alan Cudmore <alanc@…> and

Joel Sherrill <joel@…>

• This is a major reworking of the mips64orion port to use gcc predefines as much as possible and a big push to multilib the mips port. The mips64orion port was copied/renamed to mips to be more like other GNU tools. Alan did most of the technical work of determining how to map old macro names used by the mips64orion port to standard compiler macro definitions. Joel did the merge with CVS magic to keep individual file history and did the BSP modifications. Details follow:
• console/led.S: Switch from using <idtmon.h> to <asm.h>.
• console/start.S: Switch from using <idtmon.h> to <asm.h>. Added define of PMON stacksize.
• console/idtmem.S: Switch from using <idtmon.h> to <asm.h>. Also reworked conditionals to use gcc predefines.
• console/idttlb.S: Ditto.

Location:

c/src/lib/libbsp/mips/p4000

Files:

• ChangeLog (modified) (1 diff)
• console/led.S (modified) (1 diff)
• start/start.S (modified) (2 diffs)
• startup/idtmem.S (modified) (5 diffs)
• startup/idttlb.S (modified) (12 diffs)

c/src/lib/libbsp/mips/p4000/ChangeLog

@@ +1 @@
+2000-10-24      Alan Cudmore <alanc@linuxstart.com> and
+        Joel Sherrill <joel@OARcorp.com>
+
+        * This is a major reworking of the mips64orion port to use 
+        gcc predefines as much as possible and a big push to multilib
+        the mips port.  The mips64orion port was copied/renamed to mips
+        to be more like other GNU tools.  Alan did most of the technical
+        work of determining how to map old macro names used by the mips64orion
+        port to standard compiler macro definitions.  Joel did the merge
+        with CVS magic to keep individual file history and did the BSP
+        modifications. Details follow:
+        * console/led.S: Switch from using <idtmon.h> to <asm.h>.
+        * console/start.S: Switch from using <idtmon.h> to <asm.h>. Added
+        define of PMON stacksize.
+        * console/idtmem.S: Switch from using <idtmon.h> to <asm.h>.  Also
+        reworked conditionals to use gcc predefines.
+        * console/idttlb.S: Ditto.
+
 2000-09-04      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/lib/libbsp/mips/p4000/console/led.S

@@ -4 +4 @@
 
 #include <iregdef.h>
-#include <idtmon.h>
 #include <idtcpu.h>
+#include <asm.h>
 
 

c/src/lib/libbsp/mips/p4000/start/start.S

@@ -34 +34 @@
 #include <iregdef.h>
 #include <idtcpu.h>
-#include <idtmon.h>
+#include <asm.h>
 
 
@@ -213 +213 @@
 
 
+/*
+ * P_STACKSIZE is the size of the Prom Stack.
+ * the prom stack grows downward
+ */
+#define P_STACKSIZE     0x2000   /* sets stack size to 8k */
+
 
 /**************************************************************************

c/src/lib/libbsp/mips/p4000/startup/idtmem.S

@@ -41 +41 @@
 #include <iregdef.h>
 #include <idtcpu.h>
-#include <idtmon.h>
+#include <asm.h>
 
         .data
@@ -49 +49 @@
         .word   0               
 icache_size:
-#if defined(CPU_R3000)
+#if __mips == 1
         .word   MINCACHE        
 #endif
-#if defined(CPU_R4000)
+#if __mips == 3
         .word   0
 #endif
 
-#if defined(CPU_R4000)
+#if __mips == 3
         .data
 scache_size:
@@ -71 +71 @@
                 .text
 
-#if defined (CPU_R3000)
+#if __mips == 1
 #define CONFIGFRM ((2*4)+4)     
 
@@ -403 +403 @@
 
 ENDFRAME(get_mem_conf)
-#endif /* defined CPU_R3000 */
-
-#if defined(CPU_R4000)
+#endif /* __mips == 1 */
+
+#if __mips == 3
 #define LEAF(label)     FRAME(label,sp,0,ra)
 #define XLEAF(label) \
@@ -923 +923 @@
 ENDFRAME(get_mem_conf)
 
-#endif /* defined(CPU_R4000) */
+#endif /* __mips == 3 */
 
 /*

c/src/lib/libbsp/mips/p4000/startup/idttlb.S

@@ -33 +33 @@
 #include <iregdef.h>
 #include <idtcpu.h>
-#include <idtmon.h>
+#include <asm.h>
 
 
         .text
 
-#if defined(CPU_R3000)
+#if __mips == 1
 /*
 ** ret_tlblo -- returns the 'entrylo' contents for the TLB
@@ -65 +65 @@
 ENDFRAME(ret_tlblo)
 #endif
-#if defined(CPU_R4000)
+#if __mips == 3
 /*
 ** ret_tlblo[01] -- returns the 'entrylo' contents for the TLB
@@ -143 +143 @@
 */
 FRAME(ret_tlbhi,sp,0,ra)
-#if defined(CPU_R3000)
+#if __mips == 1
         .set    noreorder
         mfc0    t0,C0_SR                # save sr
@@ -162 +162 @@
         .set    reorder
 #endif
-#if defined(CPU_R4000)
+#if __mips == 3
         mfc0    t0,C0_SR                # save sr
         mtc0    zero,C0_SR              # disable interrupts
@@ -185 +185 @@
 */
 FRAME(ret_tlbpid,sp,0,ra)
-#if defined(CPU_R3000)
+#if __mips == 1
         .set    noreorder
         mfc0    v0,C0_TLBHI             # fetch tlb high 
@@ -195 +195 @@
         .set    reorder
 #endif
-#if defined(CPU_R4000)
+#if __mips == 3
         mfc0    v0,C0_TLBHI     # to return value
         nop
@@ -215 +215 @@
 */
 FRAME(tlbprobe,sp,0,ra)
-#if defined(CPU_R3000)
+#if __mips == 1
         .set    noreorder
         mfc0    t0,C0_SR                /* fetch status reg */
@@ -241 +241 @@
         .set    reorder
 #endif
-#if defined(CPU_R4000)
+#if __mips == 3
         mfc0    t0,C0_SR                # save sr
         mtc0    zero,C0_SR              # disable interrupts
@@ -270 +270 @@
 */
 FRAME(resettlb,sp,0,ra)
-#if defined(CPU_R3000)
+#if __mips == 1
         .set    noreorder
         mfc0    t0,C0_TLBHI             # fetch the current hi 
@@ -290 +290 @@
         .set    reorder
 #endif
-#if defined(CPU_R4000)
+#if __mips == 3
         li      t2,K0BASE&TLBHI_VPN2MASK
         mfc0    t0,C0_TLBHI             # save current TLBHI
@@ -312 +312 @@
 ENDFRAME(resettlb)
 
-#if defined(CPU_R3000)
+#if __mips == 1
 /*
 ** Setup TLB entry
@@ -341 +341 @@
         .set    reorder
 ENDFRAME(map_tlb)
- #endif
-#if defined(CPU_R4000)
+#endif
+#if __mips == 3
 /*
 ** Setup R4000 TLB entry