diff options
Diffstat (limited to 'src/user/app')
-rw-r--r-- | src/user/app/init/Makefile | 2 | ||||
-rw-r--r-- | src/user/app/init/main.c | 24 | ||||
-rw-r--r-- | src/user/app/init/main.cpp | 23 | ||||
-rw-r--r-- | src/user/app/prime/Makefile | 2 | ||||
-rw-r--r-- | src/user/app/prime/main.c | 19 | ||||
-rw-r--r-- | src/user/app/prime/main.cpp | 18 |
6 files changed, 45 insertions, 43 deletions
diff --git a/src/user/app/init/Makefile b/src/user/app/init/Makefile index 6ab7cf8..3486f0d 100644 --- a/src/user/app/init/Makefile +++ b/src/user/app/init/Makefile @@ -1,6 +1,6 @@ Obj = main.o Out = init.elf -include $(SrcPath)/user/app/fwik.make +include $(SrcPath)/user/app/common.make LDFLAGS += -Map init.map diff --git a/src/user/app/init/main.c b/src/user/app/init/main.c new file mode 100644 index 0000000..92fb8f7 --- /dev/null +++ b/src/user/app/init/main.c @@ -0,0 +1,24 @@ +#include <tce/syscall.h> +#include <stdio.h> + +int main(char **args) { + FILE home_term = open("/.ui/home", 0); + int i, pid; + if (home_term < 0) return -1; + + printf("(init) Trivial/Computing Environment says hello. Press super to go home.\n"); + + for (i = 0; args[i]; i++) { + if (i == 0) continue; + printf("(init) Spawning %s...\n", args[i]); + + pid = run(args[i], 0, home_term); + if (pid < 0) { + printf("(init) Error. Sorry.\n"); + } else { + waitpid(pid, 1); + } + } + printf("(init) Goodbye.\n"); + return 0; +} diff --git a/src/user/app/init/main.cpp b/src/user/app/init/main.cpp deleted file mode 100644 index 759d804..0000000 --- a/src/user/app/init/main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include <tce/syscall.h> -#include <IO/IOStream.h> -#include <String.h> - -int Main(String *args) { - FILE home_term = libc::open("/.ui/home", 0); - if (home_term < 0) return -1; - - stdio << "(init) Trivial/Computing Environment says hello. Press super to go home.\n"; - - for (int i = 0; args[i]; i++) { - if (i == 0) continue; - stdio.printf("(init) Spawning %s...\n", args[i].c_str()); - int pid = libc::run(args[i].c_str(), 0, home_term); - if (pid < 0) { - stdio << "(init) Error. Sorry.\n"; - } else { - libc::waitpid(pid, 1); - } - } - stdio << "(init) Goodbye.\n"; - return 0; -} diff --git a/src/user/app/prime/Makefile b/src/user/app/prime/Makefile index 0e86c31..3a524e9 100644 --- a/src/user/app/prime/Makefile +++ b/src/user/app/prime/Makefile @@ -1,6 +1,6 @@ Obj = main.o Out = prime.elf -include $(SrcPath)/user/app/fwik.make +include $(SrcPath)/user/app/common.make LDFLAGS += -Map prime.map diff --git a/src/user/app/prime/main.c b/src/user/app/prime/main.c new file mode 100644 index 0000000..d3ebb7d --- /dev/null +++ b/src/user/app/prime/main.c @@ -0,0 +1,19 @@ +#include <stdio.h> + +int is_prime(int i) { + int j; + for (j = 2; j*j <= i; j++) { + if (i % j == 0) return 0; + } + return 1; +} + +int main(char **args) { + int i; + for (i = 2; i < 1000000; i++) { + if (is_prime(i)) printf("%d\t", i); + } + printf("\nThat's all prime numbers for today.\n"); + + return 0; +} diff --git a/src/user/app/prime/main.cpp b/src/user/app/prime/main.cpp deleted file mode 100644 index be8780f..0000000 --- a/src/user/app/prime/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include <IO/IOStream.h> -#include <String.h> - -bool is_prime(int i) { - for (int j = 2; j*j <= i; j++) { - if (i % j == 0) return false; - } - return true; -} - -int Main(String *args) { - for (int i = 2; i < 1000000; i++) { - if (is_prime(i)) stdio.printf("%d\t", i); - } - stdio.printf("\nThat's all prime numbers for today.\n"); - - return 0; -} |