Changeset 544a2e4 in mainline for uspace/lib/c/arch/arm32/src/entryjmp.s

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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.

File:

• uspace/lib/c/arch/arm32/src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/arm32/arm32.s ) (1 diff)

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

@@ -27 +27 @@
 #
 
-.globl program_run
+.globl entry_point_jmp
 
-## void program_run(void *entry_point, void *pcb);
+## void entry_point_jmp(void *entry_point, void *pcb);
 #
 # r0    contains entry_point
 # r1    contains pcb
 #
-# Jump to a program entry point
-program_run:
+# Jump to program entry point
+entry_point_jmp:
         # load ras_page address to r2
         ldr r2, =ras_page