Changeset 244f284 in mainline

Timestamp:

2005-05-13T21:45:35Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eb43679

Parents:

da79d0fd

Message:

IA-64 cosmetics.
Add ski_init_console() and ski_putchar() to ski.c to perform ski specific tasks.

Change the copyright string in main.c to display both copyrights on a new line.

Files:

• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/ia64/include/ski/ski.h (modified) (1 diff)
• arch/ia64/src/fake.s (modified) (2 diffs)
• arch/ia64/src/ia64.c (modified) (1 diff)
• arch/ia64/src/putchar.c (modified) (1 diff)
• arch/ia64/src/ski/ski.c (added)
• arch/ia64/src/start.S (modified) (4 diffs)
• src/main/main.c (modified) (1 diff)

arch/ia64/Makefile.inc

@@ -22 +22 @@
         arch/ia64.c \
         arch/fpu_context.c \
-        arch/context.S 
+        arch/context.S \
+        arch/ski/ski.c

arch/ia64/include/ski/ski.h

@@ -30 +30 @@
 #define __SKI_H__
 
-#define SKI_CONSOLE_INIT        20
-#define SKI_CONSOLE_PUTC        31
+#define SKI_INIT_CONSOLE        20
+#define SKI_PUTCHAR             31
+
+extern void ski_init_console(void);
+extern void ski_putchar(const char ch);
         
 #endif

arch/ia64/src/fake.s

@@ -34 +34 @@
 .global before_thread_runs_arch
 .global arch_late_init
-.global arch_post_mm_init
-.global arch_pre_mm_init
 .global cpu_arch_init
 .global cpu_halt
@@ -55 +53 @@
 asm_delay_loop:
 arch_late_init:
-arch_post_mm_init:
-arch_pre_mm_init:
 cpu_arch_init:
 cpu_halt:

arch/ia64/src/ia64.c

@@ -27 +27 @@
  */
 
+#include <arch.h>
+#include <arch/ski/ski.h>
+
+void arch_pre_mm_init(void)
+{
+}
+
+void arch_post_mm_init(void)
+{
+        ski_init_console();
+}

arch/ia64/src/putchar.c

@@ -28 +28 @@
 
 #include <putchar.h>
-#include <arch/types.h>
 #include <arch/ski/ski.h>
 
 void putchar(const char ch)
 {
-        __asm__ (
-                "mov r15=%0\n"
-                "mov r32=%1\n"          /* r32 is in0 */
-                "break 0x80000\n"       /* modifies r8 */
-                :
-                : "i" (SKI_CONSOLE_PUTC), "r" (ch)
-                : "r15", "in0", "r8"
-        );
-        
-        if (ch == '\n') putchar('\r');
+        ski_putchar(ch);
 }

arch/ia64/src/start.S

@@ -27 +27 @@
 #
 
-#include <arch/ski/ski.h>
-
 .section K_TEXT_START
 .global k_text_start
@@ -52 +50 @@
         movl r8 = k_text_start  ;;
         movl r9 = k_text_end    ;;
-        sub r8 = r9, r8         ;;
+        sub r8 = r9, r8         
         addl r10 = @gprel(hardcoded_ktext_size), gp;;
         st4 [r10] = r8          ;;
@@ -58 +56 @@
         movl r8 = k_data_start  ;;
         movl r9 = k_data_end    ;;
-        sub r8 = r9, r8         ;;
+        sub r8 = r9, r8         
         addl r10 = @gprel(hardcoded_kdata_size), gp;;
         st4 [r10] = r8          ;;
@@ -65 +63 @@
         st8 [r10] = r1
         
-        # initialize Ski console using SSC (Simulator System Call)
-        mov r15=SKI_CONSOLE_INIT
-        break 0x80000
-
         br.call.sptk.many b0=main_bsp
 

src/main/main.c

@@ -57 +57 @@
 
 char *project = "SPARTAN kernel";
-char *copyright = "Copyright (C) 2001-2005 Jakub Jermar, Copyright (C) 2005 HelenOS project";
+char *copyright = "Copyright (C) 2001-2005 Jakub Jermar\nCopyright (C) 2005 HelenOS project";
 
 config_t config;