Changeset 3375bd4 in mainline for uspace/lib/c/arch/mips32/src/entryjmp.s

Timestamp:

2011-05-17T07:44:17Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (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

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

File:

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

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

@@ -29 +29 @@
 .text
 .section .text
-.global program_run
+.global entry_point_jmp
 .set noreorder
 
-## void program_run(void *entry_point, void *pcb);
+## void entry_point_jmp(void *entry_point, void *pcb);
 #
 # $a0 (=$4)     contains entry_point
 # $a1 (=$5)     contains pcb
 #
-# Jump to a program entry point
-.ent program_run
-program_run:
+# Jump to program entry point
+.ent entry_point_jmp
+entry_point_jmp:
         # tmp := entry_point
         move $25, $a0