Changeset 5f70118 in mainline for kernel/arch/ia64

Timestamp:

2010-01-10T12:16:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (4 diffs)
• include/asm.h (modified) (1 diff)
• include/interrupt.h (modified) (2 diffs)
• src/cpu/cpu.c (modified) (1 diff)
• src/debug/stacktrace.c (moved) (moved from kernel/generic/include/stackarg.h ) (3 diffs)
• src/debug/stacktrace_asm.S (added)
• src/ivt.S (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)
• src/start.S (modified) (1 diff)

kernel/arch/ia64/Makefile.inc

@@ -53 +53 @@
         arch/$(KARCH)/src/context.S \
         arch/$(KARCH)/src/cpu/cpu.c \
+        arch/$(KARCH)/src/debug/stacktrace.c \
+        arch/$(KARCH)/src/debug/stacktrace_asm.S \
         arch/$(KARCH)/src/ivt.S \
         arch/$(KARCH)/src/interrupt.c \

kernel/arch/ia64/_link.ld.in

@@ -7 +7 @@
  */
 
+#define LOAD_ADDRESS_V  0xe000000004404000
+#define LOAD_ADDRESS_P  0x0000000004404000
+
 ENTRY(kernel_image_start)
 
 SECTIONS {
-        .image 0xe000000004404000: AT (0x0000000004404000) { 
+        .image LOAD_ADDRESS_V: AT (LOAD_ADDRESS_P) {
                 ktext_start = .;
                 *(K_TEXT_START);
@@ -21 +24 @@
                 *(.opd)
                 *(.data .data.*)
+                hardcoded_load_address = .;
+                QUAD(LOAD_ADDRESS_V);
+                hardcoded_ktext_size = .;
+                QUAD(ktext_end - ktext_start);
+                hardcoded_kdata_size = .;
+                QUAD(kdata_end - kdata_start);
                 *(.got .got.*)
                 *(.sdata)
@@ -28 +37 @@
                 *(COMMON);
 
+                . = ALIGN(8);
                 symbol_table = .;
                 *(symtab.*);            /* Symbol table, must be LAST symbol!*/
@@ -38 +48 @@
         }
 
-        _hardcoded_ktext_size = ktext_end - ktext_start;
-        _hardcoded_kdata_size = kdata_end - kdata_start;
-        _hardcoded_load_address = 0xe000000004404000;
-
 }

kernel/arch/ia64/include/asm.h

@@ -422 +422 @@
         asm volatile (
                 "rsm %[mask]\n"
+                ";;\n"
+                "srlz.d\n"
                 :: [mask] "i" (PSR_PK_MASK)
         );

kernel/arch/ia64/include/interrupt.h

@@ -72 +72 @@
 #define EOI  0  /**< The actual value doesn't matter. */
 
-typedef struct {
+typedef struct istate {
         uint128_t f2;
         uint128_t f3;
@@ -143 +143 @@
 }
 
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return 0;       /* FIXME */
+}
+
 static inline int istate_from_uspace(istate_t *istate)
 {

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

@@ -37 +37 @@
 #include <arch/register.h>
 #include <print.h>
+#include <memstr.h>
 
 void cpu_arch_init(void)

kernel/arch/ia64/src/debug/stacktrace.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup ia64
  * @{
  */
@@ -33 +33 @@
  */
 
-/*
- * Variable argument list manipulation macros
- * for architectures using stack to pass arguments.
- */
- 
-#ifndef KERN_STACKARG_H_
-#define KERN_STACKARG_H_
+#include <stacktrace.h>
+#include <syscall/copy.h>
+#include <arch/types.h>
+#include <typedefs.h>
 
-#include <arch/types.h>
+bool kernel_frame_pointer_validate(uintptr_t fp)
+{
+        return false;
+}
 
-typedef struct va_list {
-        int pos;
-        uint8_t *last;
-} va_list;
+bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
+{
+        return false;
+}
 
-#define va_start(ap, lst)               \
-        (ap).pos = sizeof(lst);                         \
-        (ap).last = (uint8_t *) &(lst)
+bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra)
+{
+        return false;
+}
 
-#define va_arg(ap, type)                \
-        (*((type *)((ap).last + ((ap).pos += sizeof(type)) - sizeof(type))))
+bool uspace_frame_pointer_validate(uintptr_t fp)
+{
+        return false;
+}
 
-#define va_copy(dst, src) dst = src
-#define va_end(ap)
+bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
+{
+        return false;
+}
 
-
-#endif
+bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra)
+{
+        return false;
+}
 
 /** @}

kernel/arch/ia64/src/ivt.S

@@ -391 +391 @@
 
     /* 10. call handler */
-        movl r1 = _hardcoded_load_address
+        movl r1 = kernel_image_start
     
         mov b1 = loc2

kernel/arch/ia64/src/mm/as.c

@@ -73 +73 @@
                 rr.map.ps = PAGE_WIDTH;
                 rr_write(i, rr.word);
+                srlz_d();
+                srlz_i();
         }
-        srlz_d();
-        srlz_i();
 }
 

kernel/arch/ia64/src/start.S

@@ -186 +186 @@
         movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
         or r20 = r20, r1 ;;
-        movl r1 = _hardcoded_load_address
+        movl r1 = kernel_image_start
         
         /*
-         * Initialize hardcoded_* variables. Do only BSP
+         * Initialize bootinfo on BSP.
          */
-(p3)    movl r14 = _hardcoded_ktext_size
-(p3)    movl r15 = _hardcoded_kdata_size
-(p3)    movl r16 = _hardcoded_load_address ;;
-(p3)    addl r17 = @gprel(hardcoded_ktext_size), gp
-(p3)    addl r18 = @gprel(hardcoded_kdata_size), gp
-(p3)    addl r19 = @gprel(hardcoded_load_address), gp
-(p3)    addl r21 = @gprel(bootinfo), gp
-                ;;
-(p3)    st8 [r17] = r14
-(p3)    st8 [r18] = r15
-(p3)    st8 [r19] = r16
+(p3)    addl r21 = @gprel(bootinfo), gp ;;
 (p3)    st8 [r21] = r20