Console

.gitignore

@@ -13,3 +13,4 @@ dump
 .cache/*
 compile_commands.json
 .clangd
+*.d

Makefile

@@ -1,21 +1,4 @@
-ARCH       ?= aarch64-none-elf
-CC         := $(ARCH)-gcc
-LD         := $(ARCH)-ld
-AR         := $(ARCH)-ar
-OBJCOPY    := $(ARCH)-objcopy
-
-CFLAGS_BASE  ?= -g -O0 -nostdlib -ffreestanding \
-                -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables \
-                -Wall -Wextra -Wno-unused-parameter -Wno-address-of-packed-member -mcpu=cortex-a72
-CONLY_FLAGS_BASE ?= -std=c17
-LDFLAGS_BASE ?=
-
-LOAD_ADDR      ?= 0x41000000
-XHCI_CTX_SIZE  ?= 32
-QEMU           ?= true
-MODE           ?= virt
-
-export ARCH CC LD AR OBJCOPY CFLAGS_BASE CONLY_FLAGS_BASE LDFLAGS_BASE LOAD_ADDR XHCI_CTX_SIZE QEMU
+include common.mk
 
 OS      := $(shell uname)
 FS_DIRS := fs/redos/user
@@ -42,13 +25,13 @@ kernel:
 	$(MAKE) -C kernel LOAD_ADDR=$(LOAD_ADDR) XHCI_CTX_SIZE=$(XHCI_CTX_SIZE) QEMU=$(QEMU)
 
 clean:
-	$(MAKE) -C shared clean
-	$(MAKE) -C user   clean
-	$(MAKE) -C kernel clean
+	$(MAKE) -C shared $@
+	$(MAKE) -C user   $@
+	$(MAKE) -C kernel $@
 	@echo "removing fs dirs"
-	rm -rf $(FS_DIRS)
+	$(RM) -r $(FS_DIRS)
 	@echo "removing images"
-	rm -f kernel.img kernel.elf disk.img dump
+	$(RM) kernel.img kernel.elf disk.img dump
 
 raspi:
 	$(MAKE) LOAD_ADDR=0x80000 XHCI_CTX_SIZE=64 QEMU=true all
@@ -63,11 +46,11 @@ run:
 debug:
 	$(MAKE) $(MODE)
 	./rundebug MODE=$(MODE) $(ARGS)
-  
+
 dump:
 	$(OBJCOPY) -O binary kernel.elf kernel.img
-	aarch64-none-elf-objdump -D kernel.elf > dump
-  
+	$(ARCH)-objdump -D kernel.elf > dump
+
 install:
 	$(MAKE) clean
 	$(MAKE) LOAD_ADDR=0x80000 XHCI_CTX_SIZE=64 QEMU=false all
@@ -89,4 +72,6 @@ help:
   make debug        build and run with debugger\n\
   make dump         disassemble kernel.elf\n\
   make install      create raspi kernel and mount it on a bootable partition\n\
-  make prepare-fs   create directories for the filesystem\n\n"
+  make prepare-fs   create directories for the filesystem\n\n"\
+  \n\
+  Use 'make V=1' for verbose build output.

common.mk

@@ -0,0 +1,34 @@
+ARCH       ?= aarch64-none-elf
+CC         := $(ARCH)-gcc
+CXX        := $(ARCH)-g++
+LD         := $(ARCH)-ld
+AR         := $(ARCH)-ar
+OBJCOPY    := $(ARCH)-objcopy
+
+COMMON_FLAGS  ?= -ffreestanding -nostdlib -fno-exceptions -fno-unwind-tables \
+                 -fno-asynchronous-unwind-tables -g -O0 -Wall -Wextra \
+                 -Wno-unused-parameter -Wno-address-of-packed-member \
+                 -mcpu=cortex-a72
+
+CFLAGS_BASE   ?= $(COMMON_FLAGS) -std=c17
+CXXFLAGS_BASE ?= $(COMMON_FLAGS) -fno-rtti
+LDFLAGS_BASE  ?=
+
+LOAD_ADDR      ?= 0x41000000
+XHCI_CTX_SIZE  ?= 32
+QEMU           ?= true
+MODE           ?= virt
+
+ifeq ($(V), 1)
+  VAR  = $(AR)
+  VAS  = $(CC)
+  VCC  = $(CC)
+  VCXX = $(CXX)
+  VLD  = $(LD)
+else
+  VAR  = @echo "  [AR]   $@" && $(AR)
+  VAS  = @echo "  [AS]   $@" && $(CC)
+  VCC  = @echo "  [CC]   $@" && $(CC)
+  VCXX = @echo "  [CXX]  $@" && $(CXX)
+  VLD  = @echo "  [LD]   $@" && $(LD)
+endif

kernel/Makefile

@@ -1,35 +1,46 @@
 #kernel
 # toolchain (inherited from top-level)
 
-CFLAGS := $(CFLAGS_BASE) -I. -I../shared -I../user -DXHCI_CTX_SIZE=$(XHCI_CTX_SIZE)
+include ../common.mk
+
+CPPFLAGS := -I. -I../shared -I../user -DXHCI_CTX_SIZE=$(XHCI_CTX_SIZE)
+
 ifeq ($(QEMU),true)
-  CFLAGS += -DQEMU
+  CPPFLAGS += -DQEMU
 endif
 
-LDFLAGS := $(LDFLAGS_BASE) -T $(shell ls *.ld) --defsym=LOAD_ADDR=$(LOAD_ADDR)
+CFLAGS   := $(CFLAGS_BASE) $(CPPFLAGS)
+CXXFLAGS := $(CXXFLAGS_BASE) $(CPPFLAGS)
+LDFLAGS  := $(LDFLAGS_BASE) -T $(shell ls *.ld) --defsym=LOAD_ADDR=$(LOAD_ADDR)
 
 CLEAN_OBJS := $(shell find . -name '*.o')
+CLEAN_DEPS := $(shell find . -name '*.d')
 C_SRC   := $(shell find . -name '*.c')
 ASM_SRC := $(shell find . -name '*.S')
 CPP_SRC := $(shell find . -name '*.cpp')
 OBJ     := $(C_SRC:.c=.o) $(ASM_SRC:.S=.o) $(CPP_SRC:.cpp=.o)
 OBJL    := $(filter-out ./boot.o,$(OBJ))
+DEP     := $(C_SRC:.c=.d) $(ASM_SRC:.S=.d) $(CPP_SRC:.cpp=.d)
 
 ELF     := ../kernel.elf
 TARGET  := ../kernel.img
 
 all: $(TARGET)
 
 $(TARGET): ../shared/libshared.a $(OBJ)
-	$(LD) $(LDFLAGS) -o $(ELF) $(OBJL) ../shared/libshared.a
+	$(VLD) $(LDFLAGS) -o $(ELF) $(OBJL) ../shared/libshared.a
 	$(OBJCOPY) -O binary $(ELF) $@
 
 %.o: %.S
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(VAS) $(CFLAGS) -c $< -o $@
+
 %.o: %.c
-	$(CC) $(CFLAGS) $(CONLY_FLAGS_BASE) -c $< -o $@
+	$(VCC) $(CFLAGS) -c -MMD -MP $< -o $@
+
 %.o: %.cpp
-	$(CC) $(CFLAGS) -fno-rtti -c $< -o $@
+	$(VCXX) $(CXXFLAGS) -c -MMD -MP $< -o $@
 
 clean:
-	rm -f $(CLEAN_OBJS) $(ELF) $(TARGET)
+	$(RM) $(CLEAN_OBJS) $(CLEAN_DEPS) $(ELF) $(TARGET)
+
+-include $(DEP)

kernel/audio/virtio_audio_pci.cpp

@@ -195,11 +195,12 @@ bool VirtioAudioDriver::config_streams(uint32_t streams){
             kprintf("[VIRTIO_AUDIO error] Failed to configure stream %i",stream);
         }
 
+#if false
         if (stream_info[stream].direction == VIRTIO_SND_D_OUTPUT){
             kprintf("Playing from stream %i",stream);
             select_queue(&audio_dev, TRANSMIT_QUEUE);
 
-            for (uint16_t i = 0; i < 100; i++){
+            for (uint16_t i = 0; i < 10; i++){
                 size_t total_size = sizeof(virtio_snd_pcm_status) + sizeof(virtio_snd_pcm_xfer) + TOTAL_BUF_SIZE;
                 uintptr_t full_buffer = (uintptr_t)kalloc(audio_dev.memory_page, total_size, ALIGN_4KB, true, true);
                 virtio_snd_pcm_xfer *header = (virtio_snd_pcm_xfer*)full_buffer;
@@ -218,8 +219,8 @@ bool VirtioAudioDriver::config_streams(uint32_t streams){
 
             select_queue(&audio_dev, CONTROL_QUEUE);
         }
+#endif 
     }
-
     return true;
 }
 

kernel/bin/bin_mod.c

@@ -0,0 +1,52 @@
+#include "bin_mod.h"
+#include "cat.h"
+#include "kernel_processes/kprocess_loader.h"
+
+#define N_ARR(arr) (sizeof(arr)/sizeof((arr)[0]))
+
+bool init_bin(){
+    return true;
+}
+
+typedef struct open_bin_ref {
+    char *name;
+    int (*func)(int argc, char* argv[]);
+} open_bin_ref;
+
+open_bin_ref available_cmds[] = {
+    { "cat", run_cat }
+};
+
+process_t* exec(const char* prog_name, int argc, const char* argv[]){
+    for (uint32_t i = 0; i < N_ARR(available_cmds); i++){
+        if (strcmp(available_cmds[i].name, prog_name, false) == 0){
+            return create_kernel_process(available_cmds[i].name, available_cmds[i].func, argc, argv);
+        }
+    }
+    return 0;
+}
+
+FS_RESULT open_bin(){
+    return FS_RESULT_DRIVER_ERROR;
+}
+
+size_t read_bin(){
+    return 0;
+}
+
+sizedptr list_bin(const char *path){
+    return (sizedptr){0,0};
+}
+
+driver_module bin_module = (driver_module){
+    .name = "bin",
+    .mount = "/bin",
+    .version = VERSION_NUM(0, 1, 0, 1),
+    .init = init_bin,
+    .fini = 0,
+    .open = 0,
+    .read = read_bin,
+    .write = 0,
+    .seek = 0,
+    .readdir = list_bin,
+};

kernel/bin/bin_mod.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "dev/driver_base.h"
+#include "process/process.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+process_t* exec(const char* prog_name, int argc, const char* argv[]);
+
+#ifdef __cplusplus
+}
+#endif
+
+extern driver_module bin_module;

kernel/bin/cat.c

@@ -0,0 +1,36 @@
+#include "cat.h"
+#include "kernel_processes/kprocess_loader.h"
+#include "filesystem/filesystem.h"
+#include "process/scheduler.h"
+#include "syscalls/syscalls.h"
+#include "console/kio.h"
+
+int run_cat(int argc, char* argv[]){
+    uint16_t pid = get_current_proc_pid();
+    string s = string_format("/proc/%i/out",pid);
+    file fd2;
+    open_file(s.data, &fd2);
+    if (argc != 2){
+        string err_msg = string_l("Usage cat <path> <size>");
+        write_file(&fd2, err_msg.data, err_msg.length);
+        free(err_msg.data, err_msg.mem_length);
+        return 2;
+    }
+    const char* path = argv[0];
+    size_t size = parse_int_u64(argv[1], UINT32_MAX);
+    file fd;
+    open_file(path, &fd);
+    if (fd.size == 0){
+        string err_msg = string_format("Couldn't find file %s", argv[0]);
+        write_file(&fd2, err_msg.data, err_msg.length);
+        free(err_msg.data, err_msg.mem_length);
+        return 1;
+    } 
+    if (size == 0) size = fd.size;
+    char* buf = (char*)malloc(size);
+    read_file(&fd, buf, size);
+
+    write_file(&fd2, buf, size);
+    free(s.data, s.mem_length);
+    return 0;
+}

kernel/bin/cat.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "process/process.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int run_cat(int argc, char* argv[]);
+
+#ifdef __cplusplus
+}
+#endif

kernel/boot.S

@@ -102,7 +102,7 @@ el2_entry:
     eret
 
 stack_setup:
-    ldr x1, =stack_top
+    ldr x1, =ksp
     mov sp, x1
 
     mov x29, xzr

kernel/console/kconsole/console.cpp

@@ -1,6 +1,9 @@
 #include "kconsole.hpp"
 #include "kconsole.h"
 #include "graph/graphics.h"
+#include "input/input_dispatch.h"
+#include "kernel_processes/windows/windows.h"
+#include "terminal.hpp"
 
 KernelConsole kconsole;
 
@@ -15,4 +18,37 @@ extern "C" void kconsole_puts(const char *s) {
 
 extern "C" void kconsole_clear() {
     kconsole.clear();
+}
+
+extern "C" int toggle_visual(int argc, char* argv[]){
+    keypress kp = {
+        .modifier = KEY_MOD_LALT,
+        .rsvd = 0,
+        .keys = {0x13},
+    };
+    uint16_t shortcut = sys_subscribe_shortcut_current(kp);
+    bool active = false;
+    Terminal *terminal = new Terminal();
+    terminal->initialize();
+    while (1){
+        if (sys_shortcut_triggered_current(shortcut)){
+            active = !active;
+            if (active){
+                pause_window_draw();
+                sys_focus_current();
+                terminal->refresh();
+            } else {
+                resume_window_draw();
+                terminal->clear();
+            }
+        }
+        if (active){
+            terminal->update();
+        }
+    }
+    return 1;
+}
+
+process_t* start_terminal(){
+    return create_kernel_process("terminal",toggle_visual, 0, 0);
 }