Changeset 15819e37 in mainline

Timestamp:

2007-02-04T21:04:36Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7d307e7

Parents:

5573942

Message:

Minor cleanup in ia64.

Location:

kernel/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• include/drivers/ega.h (moved) (moved from kernel/arch/ia64/include/simics/ega.h ) (2 diffs)
• src/cpu/cpu.c (modified) (1 diff)
• src/drivers/ega.c (moved) (moved from kernel/arch/ia64/src/simics/ega.c ) (5 diffs)
• src/ia64.c (modified) (1 diff)
• src/start.S (modified) (4 diffs)

kernel/arch/ia64/Makefile.inc

@@ -90 +90 @@
 
 ifeq ($(MACHINE),i460GX)
-        ARCH_SOURCES += arch/$(ARCH)/src/simics/ega.c
+        ARCH_SOURCES += arch/$(ARCH)/src/drivers/ega.c
         DEFS += -DI460GX
 endif

kernel/arch/ia64/include/drivers/ega.h

@@ -34 +34 @@
  */
 
-#ifndef simics_ega_h
-#define simics_ega_h
+#ifndef KERN_ia64_EGA_H
+#define KERN_ia64_EGA_H
 
 #define VIDEORAM (0xE0000000000B8000LL)
@@ -49 +49 @@
 /** @}
  */
-

kernel/arch/ia64/src/cpu/cpu.c

@@ -52 +52 @@
 {
         char *family_str;
-        char vendor[2*sizeof(uint64_t)+1];
+        char vendor[2 * sizeof(uint64_t) + 1];
         
-        *((uint64_t *) &vendor[0*sizeof(uint64_t)]) = CPU->arch.cpuid0;
-        *((uint64_t *) &vendor[1*sizeof(uint64_t)]) = CPU->arch.cpuid1;
-        vendor[sizeof(vendor)-1] = '\0';
+        *((uint64_t *) &vendor[0 * sizeof(uint64_t)]) = CPU->arch.cpuid0;
+        *((uint64_t *) &vendor[1 * sizeof(uint64_t)]) = CPU->arch.cpuid1;
+        vendor[sizeof(vendor) - 1] = '\0';
         
         switch(m->arch.cpuid3.family) {
-            case FAMILY_ITANIUM:
-                family_str = "Itanium";
+        case FAMILY_ITANIUM:
+                family_str = "Itanium";
                 break;
-            case FAMILY_ITANIUM2:
-                family_str = "Itanium 2";
+        case FAMILY_ITANIUM2:
+                family_str = "Itanium 2";
                 break;
-            default:
-                family_str = "Unknown";
+        default:
+                family_str = "Unknown";
                 break;
         }
         
-        printf("cpu%d: %s (%s), archrev=%d, model=%d, revision=%d\n", CPU->id, family_str, vendor, CPU->arch.cpuid3.archrev, CPU->arch.cpuid3.model, CPU->arch.cpuid3.revision);
+        printf("cpu%d: %s (%s), archrev=%d, model=%d, revision=%d\n", CPU->id,
+            family_str, vendor, CPU->arch.cpuid3.archrev, CPU->arch.cpuid3.model,
+            CPU->arch.cpuid3.revision);
 }
 

kernel/arch/ia64/src/drivers/ega.c

@@ -46 +46 @@
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
-#include <arch/simics/ega.h>
+#include <arch/drivers/ega.h>
 
 /*
@@ -67 +67 @@
 void ega_init(void)
 {
-        
         videoram = (uint8_t *) (VIDEORAM);
+
+        /*
+         * Clear the screen.
+         */
+        _memsetw((uintptr_t) videoram, SCREEN, 0x0720); 
 
         chardev_initialize("ega_out", &ega_console, &ega_ops);
@@ -87 +91 @@
 {
         videoram[ega_cursor * 2] = ch;
-        videoram[ega_cursor * 2+1] = 7;
+        videoram[ega_cursor * 2 + 1] = 7;
 }
 
@@ -95 +99 @@
 static void ega_check_cursor(void)
 {
-        int i;
         if (ega_cursor < SCREEN)
                 return;
 
         memcpy((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2);
-        for(i=0;i<ROW*2;i+=2)
-        {
-                videoram[(SCREEN-ROW)*2+i+0]=0x20;
-                videoram[(SCREEN-ROW)*2+i+1]=0x07;
-        }
+        _memsetw((uintptr_t) (videoram + (SCREEN - ROW) * 2), ROW, 0x0720);
         ega_cursor = ega_cursor - ROW;
 }
@@ -137 +136 @@
 }
 
-
 /** @}
  */

kernel/arch/ia64/src/ia64.c

@@ -51 +51 @@
 #include <syscall/syscall.h>
 #include <ddi/irq.h>
-#include <arch/simics/ega.h>
+#include <arch/drivers/ega.h>
 
 void arch_pre_main(void)

kernel/arch/ia64/src/start.S

@@ -49 +49 @@
         # Fill TR.i and TR.d using Region Register #VRN_KERNEL
 
-        movl r8=(VRN_KERNEL<<VRN_SHIFT)
-        mov r9=rr[r8]
-        movl r10=(RR_MASK)
-        and r9=r10,r9
-        movl r10=((RID_KERNEL<<RID_SHIFT)|(KERNEL_PAGE_WIDTH<<PS_SHIFT))
-        or  r9=r10,r9
-        mov rr[r8]=r9
+        movl r8 = (VRN_KERNEL << VRN_SHIFT)
+        mov r9 = rr[r8]
+        movl r10 = (RR_MASK)
+        and r9 = r10, r9
+        movl r10 = ((RID_KERNEL << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT))
+        or  r9 = r10, r9
+        mov rr[r8] = r9
 
-        movl r8=(VRN_KERNEL<<VRN_SHIFT)
-        mov cr.ifa=r8
-        movl r10=(KERNEL_PAGE_WIDTH<<PS_SHIFT)
-        mov cr.itir=r10
-        movl r10=(KERNEL_TRANSLATION_I)
-        itr.i itr[r0]=r10
-        movl r10=(KERNEL_TRANSLATION_D)
-        itr.d dtr[r0]=r10
+        movl r8 = (VRN_KERNEL << VRN_SHIFT)
+        mov cr.ifa = r8
+        movl r10 = (KERNEL_PAGE_WIDTH << PS_SHIFT)
+        mov cr.itir = r10
+        movl r10 = (KERNEL_TRANSLATION_I)
+        itr.i itr[r0] = r10
+        movl r10 = (KERNEL_TRANSLATION_D)
+        itr.d dtr[r0] = r10
 
         # initialize PSR
@@ -70 +70 @@
         srlz.i
         srlz.d
-        movl r10=(PSR_DT_MASK|PSR_RT_MASK|PSR_IT_MASK|PSR_IC_MASK)  /* Enable paging */
-        mov r9=psr
-        or r10=r10,r9
-        mov cr.ipsr=r10
-        mov cr.ifs=r0
-        movl r8=paging_start
-        mov cr.iip=r8
+        movl r10 = (PSR_DT_MASK | PSR_RT_MASK | PSR_IT_MASK | PSR_IC_MASK)  /* Enable paging */
+        mov r9 = psr
+        or r10 = r10, r9
+        mov cr.ipsr = r10
+        mov cr.ifs = r0
+        movl r8 = paging_start
+        mov cr.iip = r8
         srlz.d
         srlz.i
@@ -98 +98 @@
         # initialize register stack
         mov ar.rsc = r0
-        movl r8=(VRN_KERNEL<<VRN_SHIFT) ;;
+        movl r8 = (VRN_KERNEL << VRN_SHIFT) ;;
         mov ar.bspstore = r8
         loadrs
 
         # initialize memory stack to some sane value
-        movl r12 = stack0;;
+        movl r12 = stack0 ;;
         
-        add r12 = - 16, r12     /* allocate a scratch area on the stack */
+        add r12 = -16, r12      /* allocate a scratch area on the stack */
 
         # initialize gp (Global Pointer) register
@@ -124 +124 @@
         st8 [r19] = r16
 
-        ssm (1<<19);; /* Disable f32 - f127 */
-        srlz.i;
-        srlz.d;;
+        ssm (1 << 19) ;; /* Disable f32 - f127 */
+        srlz.i
+        srlz.d ;;
 
         br.call.sptk.many b0 = arch_pre_main
 
-        movl r18=main_bsp ;;
-        mov b1=r18 ;;
-        br.call.sptk.many b0=b1
+        movl r18 = main_bsp ;;
+        mov b1 = r18 ;;
+        br.call.sptk.many b0 = b1