Changeset 371bd7d in mainline for uspace/lib/c/arch/arm32/src

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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:

uspace/lib/c/arch/arm32/src

Files:

• eabi.S (moved) (moved from uspace/lib/libc/arch/arm32/src/eabi.S )
• entry.s (moved) (moved from uspace/lib/libc/arch/arm32/src/entry.s ) (2 diffs)
• fibril.S (moved) (moved from uspace/lib/libc/arch/arm32/src/fibril.S )
• stacktrace.c (added)
• stacktrace_asm.S (added)
• syscall.c (moved) (moved from uspace/lib/libc/arch/arm32/src/syscall.c ) (2 diffs)
• thread_entry.s (moved) (moved from uspace/lib/libc/arch/arm32/src/thread_entry.s ) (1 diff)
• tls.c (moved) (moved from uspace/lib/libc/arch/arm32/src/tls.c )

uspace/lib/c/arch/arm32/src/entry.s

@@ -36 +36 @@
 #
 # r1 contains the PCB pointer
+# r2 contains the RAS page address
 #
 __entry:
+        # Store the RAS page address into the ras_page variable
+        ldr r0, =ras_page
+        str r2, [r0]
+
+        #
+        # Create the first stack frame.
+        #
+        mov fp, #0
+        mov ip, sp
+        push {fp, ip, lr, pc}
+        sub fp, ip, #4
+
         # Pass pcb_ptr to __main as the first argument (in r0)
         mov r0, r1
@@ -43 +56 @@
 
         bl __exit
+
+.data
+
+.global ras_page
+ras_page:
+        .long 0
+

uspace/lib/c/arch/arm32/src/syscall.c

@@ -60 +60 @@
         register sysarg_t __arm_reg_r5 asm("r5") = p6;
         register sysarg_t __arm_reg_r6 asm("r6") = id;
-
-        asm volatile ( "swi"
+        
+        asm volatile (
+                "swi 0"
                 : "=r" (__arm_reg_r0)
                 : "r" (__arm_reg_r0),
@@ -71 +72 @@
                   "r" (__arm_reg_r6)
         );
-
+        
         return __arm_reg_r0;
 }

uspace/lib/c/arch/arm32/src/thread_entry.s

@@ -35 +35 @@
 #
 __thread_entry:
+        #
+        # Create the first stack frame.
+        #
+        mov fp, #0
+        mov ip, sp
+        push {fp, ip, lr, pc}
+        sub fp, ip, #4
+
         b __thread_main