Changeset 3558ba93 in mainline for uspace/app
- Timestamp:
- 2013-12-09T15:55:40Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 5b89d43b
- Parents:
- 12735849 (diff), 9521eca (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. - Location:
- uspace/app
- Files:
-
- 5 added
- 3 edited
- 1 moved
-
tester/Makefile (modified) (1 diff)
-
tester/tester.c (modified) (1 diff)
-
tester/tester.h (modified) (2 diffs)
-
tester/thread/setjmp1.c (added)
-
tester/thread/setjmp1.def (added)
-
untar/Makefile (moved) (moved from uspace/lib/c/arch/ia32/src/setjmp.S ) (2 diffs)
-
untar/main.c (added)
-
untar/tar.c (added)
-
untar/tar.h (added)
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/tester/Makefile
r12735849 r3558ba93 37 37 util.c \ 38 38 thread/thread1.c \ 39 thread/setjmp1.c \ 39 40 print/print1.c \ 40 41 print/print2.c \ -
uspace/app/tester/tester.c
r12735849 r3558ba93 48 48 test_t tests[] = { 49 49 #include "thread/thread1.def" 50 #include "thread/setjmp1.def" 50 51 #include "print/print1.def" 51 52 #include "print/print2.def" -
uspace/app/tester/tester.h
r12735849 r3558ba93 39 39 #include <stdbool.h> 40 40 #include <stacktrace.h> 41 #include <stdio.h> 41 42 42 43 #define IPC_TEST_SERVICE 10240 … … 80 81 81 82 extern const char *test_thread1(void); 83 extern const char *test_setjmp1(void); 82 84 extern const char *test_print1(void); 83 85 extern const char *test_print2(void); -
uspace/app/untar/Makefile
r12735849 r3558ba93 1 1 # 2 # Copyright (c) 20 08 Josef Cejka2 # Copyright (c) 2013 Vojtech Horky 3 3 # All rights reserved. 4 4 # … … 27 27 # 28 28 29 #include <libarch/context_offset.h> 29 USPACE_PREFIX = ../.. 30 BINARY = untar 30 31 31 .text 32 .global setjmp 33 .global longjmp 32 SOURCES = \ 33 main.c \ 34 tar.c 34 35 35 .type setjmp,@function 36 setjmp: 37 movl 0(%esp), %eax # save pc value into eax 38 movl 4(%esp), %edx # address of the jmp_buf structure to save context to 39 40 # save registers to the jmp_buf structure 41 CONTEXT_SAVE_ARCH_CORE %edx %eax 42 43 xorl %eax, %eax # set_jmp returns 0 44 ret 45 46 .type longjmp,@function 47 longjmp: 48 movl 4(%esp), %ecx # put address of jmp_buf into ecx 49 movl 8(%esp), %eax # put return value into eax 50 51 # restore registers from the jmp_buf structure 52 CONTEXT_RESTORE_ARCH_CORE %ecx %edx 53 54 movl %edx, 0(%esp) # put saved pc on stack 55 ret 36 include $(USPACE_PREFIX)/Makefile.common
Note:
See TracChangeset
for help on using the changeset viewer.
