diff --git a/include/config.h b/include/config.h index f3564ec..4b187da 100644 --- a/include/config.h +++ b/include/config.h @@ -9,8 +9,8 @@ /* version */ #define PEPPEROS_VERSION_MAJOR "0" -#define PEPPEROS_VERSION_MINOR "0" -#define PEPPEROS_VERSION_PATCH "109" +#define PEPPEROS_VERSION_MINOR "1" +#define PEPPEROS_VERSION_PATCH "121" #define PEPPEROS_SPLASH \ "\x1b[38;5;196m \x1b[38;5;231m____ _____\r\n\x1b[0m"\ "\x1b[38;5;196m ____ ___ ____ ____ ___ _____\x1b[38;5;231m/ __ \\/ ___/\r\n\x1b[0m"\ diff --git a/src/kmain.c b/src/kmain.c index 6f2b862..31ca493 100644 --- a/src/kmain.c +++ b/src/kmain.c @@ -130,6 +130,7 @@ void kmain() file = boot_ctx.module->modules[1]; process_create_user(file, "pedicel"); } + process_create("kshell", (void*)pedicel_main, 0); scheduler_init(); printf(PEPPEROS_SPLASH); diff --git a/user/hello.S b/user/hello.S index 0afc808..3f063c5 100644 --- a/user/hello.S +++ b/user/hello.S @@ -1,7 +1,7 @@ bits 64 section .data - hi db "hi from userland :) we did it man", 0 + hi db "hi from userland :) we did it man", 0x0A, 0x0d, 0 section .text @@ -9,7 +9,7 @@ hello: mov rax, 0x1 ;sys_write mov rdi, 0x1 ;stdout lea rsi, [rel hi] ;char* buf - mov rdx, 33 ;count + mov rdx, 35 ;count int 0x80 .end: diff --git a/user/pedicel.S b/user/pedicel.S index 4214e82..e1b92ef 100644 --- a/user/pedicel.S +++ b/user/pedicel.S @@ -1,7 +1,7 @@ bits 64 section .data -hello db 0x0A, 0x0D, "User program 2 speaking", 0 +hello db 0x0A, 0x0D, "User program 2 speaking", 0x0A, 0x0D, 0 section .text @@ -9,7 +9,7 @@ _start: mov rax, 0x1 ;sys_write mov rdi, 0x1 ;stdout lea rsi, [rel hello] - mov rdx, 25 ;count + mov rdx, 27 ;count int 0x80 ; when we are ready to have an os specific toolchain,