elleoma/os-in-1000-lines
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small refactoring & fix

Browse Source
This commit is contained in:
Amoelle
2025-07-27 12:24:50 +03:00
parent f742d1fe9b
commit ee6c87c6d7
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel.c
View File

@@ -198,7 +198,7 @@ struct process *create_process(uint32_t pc) {
// Find an unused proccess control structure // Find an unused proccess control structure
struct process *proc = NULL; struct process *proc = NULL;
int i; int i;
for (i = 0; i <= PROCS_MAX; i++) { for (i = 0; i < PROCS_MAX; i++) {
if (procs[i].state == PROC_UNUSED) { if (procs[i].state == PROC_UNUSED) {
proc = &procs[i]; proc = &procs[i];
break; break;
@@ -262,11 +262,14 @@ void yield(void) {
return; return;
__asm__ __volatile__( __asm__ __volatile__(
"sfence.vma\n"
"csrw satp, %[satp]\n"
"sfence.vma\n"
"csrw sscratch, %[sscratch]\n" "csrw sscratch, %[sscratch]\n"
: :
: [sscratch] "r" ((uint32_t) &next->stack[sizeof(next->stack)]) : [satp] "r" (SATP_SV32 | ((uint32_t) next->page_table / PAGE_SIZE)),
[sscratch] "r" ((uint32_t) &next->stack[sizeof(next->stack)])
); );
// Context switch // Context switch
struct process *prev = current_proc; struct process *prev = current_proc;
current_proc = next; current_proc = next;

39
kernel.h
View File

@@ -1,6 +1,24 @@
#pragma once #pragma once
#include "common.h" #include "common.h"
#define PROCS_MAX 8 // Maximum ammount of processes
#define PROC_UNUSED 0 // Unused processes control structure
#define PROC_RUNNABLE 1 // Runnable proccess
#define SATP_SV32 (1u << 31)
#define PAGE_V (1 << 0) // "Valid" bit (entry is allowed)
#define PAGE_R (1 << 1) // Readable
#define PAGE_W (1 << 2) // Writable
#define PAGE_X (1 << 3) // Executable
#define PAGE_U (1 << 4) // User (accessible in user mode)
struct process {
int pid; // ID of a process
int state; // State of the process: either PROC_UNUSED or PROC_RUNNABLE
vaddr_t sp; // Stack pointer
uint32_t *page_table; // points to first level page table
uint8_t stack[8192]; // Kernel stack
};
struct sbiret { struct sbiret {
long error; long error;
long value; long value;
@@ -59,24 +77,3 @@ struct trap_frame {
while (1) {} \ while (1) {} \
} while (0) } while (0)
#define PROCS_MAX 8 // Maximum ammount of processes
#define PROC_UNUSED 0 // Unused processes control structure
#define PROC_RUNNABLE 1 // Runnable proccess
// Page table
#define SATP_SV32 (1u << 32)
#define PAGE_V (1 << 0) // "Valid" bit (entry is allowed)
#define PAGE_R (1 << 1) // Readable
#define PAGE_W (1 << 2) // Writable
#define PAGE_X (1 << 3) // Executable
#define PAGE_U (1 << 4) // User (accessible in user mode)
struct process {
int pid; // ID of a process
int state; // State of the process: either PROC_UNUSED or PROC_RUNNABLE
vaddr_t sp; // Stack pointer
uint32_t *page_table;
uint8_t stack[8192]; // Kernel stack
};