Kernel to receive argv via syscall spawn

Author: scopeInfinity

Makefile

@@ -102,7 +102,7 @@ binaries: $(bt_stage1) $(bt_stage2) $(kernel_core) $(rm_static)
 SECTOR_COUNT_BT_STAGE1 = 1
 SECTOR_COUNT_SHARED_LIBRARY = 1
 SECTOR_COUNT_BT_STAGE2 = 11
-SECTOR_COUNT_KERNEL = 45
+SECTOR_COUNT_KERNEL = 47
 
 SECTOR_START_BT_STAGE1 = 0
 SECTOR_START_SHARED_LIBRARY = $(shell expr $(SECTOR_START_BT_STAGE1) + $(SECTOR_COUNT_BT_STAGE1) )

include/fuzzy/kernel/process/process.h

@@ -36,7 +36,7 @@ int get_idt_ds_entry(int process_id);
 int get_idt_reverse_pid_lookup(int cs);
 
 // process create or kill
-int process_create();
+int process_create(char *argv[]);
 void process_kill(int user_ds, int status);
 
 // scheduler

memory_layout.md

@@ -7,7 +7,7 @@
 | 0x7E00    | 0x7EFF    | 256B      | SHARED STATIC CODE for real_mode library      |
 | 0x7F00    | 0x7FFF    | 256B      | SHARED STATIC MEMORY for real_mode library    |
 | 0x8000    | 0xBFFF    | -         | BOOT LOADER STAGE 2  + own stack              |
-| 0xC000    | 0x10200   | -         | KERNEL                                        |
+| 0xC000    | 0x1FFFF   | -         | KERNEL                                        |
 | 0x20000   | 0x2FFFF   | -         | Application 0                                 |
 | 0x30000   | 0x3FFFF   | -         | Application 1                                 |
 ...

src/kernel/core.c

@@ -33,6 +33,7 @@ void kernel_core_entry() {
     set_color_bg(C_BLUE);
     set_color_fg(C_WHITE);
     print_rectangle(0, 0, TEXT_WINDOW_WIDTH-1, TEXT_WINDOW_HEIGHT-1);
+    move_xy(0, 0);
     print_log("Initializing Kernel");
 
 
@@ -50,7 +51,7 @@ void kernel_core_entry() {
     clrscr();
 
     int init_pid = spawnl(INIT_APPNAME, INIT_APPNAME, NULL);
-    print_log("init process created: %d", init_pid);
+    print_log("init process got created: %d", init_pid);
 
     // interrupt_pit_enable();
     while (1);

src/kernel/process/allocation.c

@@ -9,7 +9,7 @@
  *  pid 2 : user app 2 and so on...
  *
  * Process Cycle
- *  - process_create()
+ *  - process_create(...)
  *  - process_load_from_disk()
  *  - OR process_load_from_ram()
  */
@@ -88,7 +88,7 @@ void process_scheduler_init() {
     load_gdt_table(&gdtr);
 }
 
-int process_create() {
+int process_create(char *argv[]) {
     // returnd pid >= 0 if success
     int pid = -1;
     for (int i = 0; i < MAX_PROCESS; ++i) {
@@ -130,6 +130,7 @@ int process_create() {
     // initially ds == ss
     process->ss = get_gdt_number_from_entry_id(idt_ds_entry);
     process->sp = create_infant_process_irq0_stack(process->ss);
+    // TODO: Push argv in process stack
     return pid;
 }
 

src/kernel/process/process.c

@@ -7,11 +7,9 @@
 #include <lib/utils/logging.h>
 #include <lib/utils/output.h>
 
-extern int call_main(int cs, int ds, int argc, char *argv[]);
-
-int process_spawn(int lba_index, int sector_count) {
+int process_spawn(int lba_index, int sector_count, char *argv[]) {
     print_info("[process_spawn] create");
-    int pid = process_create();
+    int pid = process_create(argv);
     if(pid<0) {
         print_log("Failed to reserved a new pid");
         return -1;
@@ -39,7 +37,8 @@ int syscall_1_process_exit(int user_ds, int status) {
 }
 
 int syscall_1_process_spawn_lba_sc(int lba_start, int sector_count) {
-    return process_spawn(lba_start, sector_count);
+    char *fake_argv[]={"fake_spawn", NULL};
+    return process_spawn(lba_start, sector_count, fake_argv);
 }
 
 int syscall_1_process_exec_lba_sc(int lba_start, int sector_count) {
@@ -48,19 +47,23 @@ int syscall_1_process_exec_lba_sc(int lba_start, int sector_count) {
 
 int syscall_1_process_spawn_fname(int user_ds, char *_us_filename, char *_us_argv[]) {
     char filename[FS_FFS_FILENAME_LIMIT];
-    char argv_with_uspointer[PROCESS_MAX_ARGC];
-    char *argv_with_kspointer[PROCESS_MAX_ARGC];
-    char argv[PROCESS_MAX_ARGC][PROCESS_MAX_ARG_LEN];  // data store
+    char argv_data[PROCESS_MAX_ARGC][PROCESS_MAX_ARG_LEN];
+    char *argv_with_uspointer[PROCESS_MAX_ARGC];
+    char *argv[PROCESS_MAX_ARGC];  // kernel mode
     syscall_strncpy_user_to_kernel(user_ds, _us_filename, filename, sizeof(filename));
     syscall_strncpy_user_to_kernel(user_ds, _us_argv, argv_with_uspointer, sizeof(argv_with_uspointer));
-    // if src string is NULL, then dst should be null.
+    // if src string is NULL, then dst string also should be null.
     for (int i = 0; i < PROCESS_MAX_ARGC; i++) {
         if(argv_with_uspointer[i]==NULL) {
-            argv_with_kspointer[i]=NULL;
+            argv[i]=NULL;
             break;
         }
-        syscall_strncpy_user_to_kernel(user_ds, argv[i], argv_with_uspointer[i], sizeof(argv[i]));
-        argv_with_kspointer[i] = argv[i];
+        syscall_strncpy_user_to_kernel(user_ds, argv_with_uspointer[i], argv_data[i], sizeof(argv_data[i]));
+        argv[i] = argv_data[i];
+    }
+
+    for (int i = 0; argv[i]; i++) {
+        printf("[kernel] arg%d: %s\n", i, argv[i]);
     }
 
     union FFSFileEntry entry;
@@ -71,8 +74,7 @@ int syscall_1_process_spawn_fname(int user_ds, char *_us_filename, char *_us_arg
     int lba_start = resolve_abs_lba(FFS_UNIQUE_PARITION_ID, entry.content.start_block_id);
     int sector_count = (entry.content.filesize + FS_BLOCK_SIZE -1)/FS_BLOCK_SIZE;
 
-    // TODO: process created should have argv pushed on top of stack.
-    return syscall_1_process_spawn_lba_sc(lba_start, sector_count);
+    return process_spawn(lba_start, sector_count, argv);
 }
 
 int syscall_1_process(int operation, int a0, int a1, int a2, int a3, int user_ds) {

src/usr/include/process.h

@@ -5,8 +5,8 @@
 #define SYSCALL_PROCESS_SUB_EXEC_LBA_SC  2
 #define SYSCALL_PROCESS_SUB_SPAWN_FNAME  3
 
-#define PROCESS_MAX_ARGC     32
-#define PROCESS_MAX_ARG_LEN  64
+#define PROCESS_MAX_ARGC     6
+#define PROCESS_MAX_ARG_LEN  32
 
 // if non-negative value is returned
 //   then it's the pid of the new process

src/usr/lib/process.c

@@ -10,7 +10,8 @@ int spawnl(char *file_path, char *arg0, ...) {
 
     // prepare argv
     {
-        int i = 0;
+        argv[0] = arg0;
+        int i = 1;
         while(i<PROCESS_MAX_ARGC-1) {
             char *arg = va_arg(args, char *);
             if(arg==NULL) break;

src/usr/local/src/sh.c

@@ -28,7 +28,7 @@ int cmd_run(char *fname) {
         printf("usage: run <filename>\n");
         return -2;
     }
-    return spawnl(fname, fname, NULL);
+    return spawnl(fname, fname, "testing", "yoyo", NULL);
 }
 
 int cmd_echo(char *text) {