Turner/OS_Project
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I swear this is going to be a long day.

Browse Source
This commit is contained in:
Jonathan Turner 2023-11-29 08:21:52 -05:00
parent f25003e0d6
commit 18c6d3c858
1 changed files with 110 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
Part3/09_memory/kernel/kernel.c
View File

@ -1,137 +1,124 @@
#include "kernel.h" #include "kernel.h"
// Standard Bois #include "stdio.h"
#include <string.h>
#include <stdlib.h>
// This only runs once and from there on forth only interrupts will cause something to happen // This only runs once and from there on forth only interrupts will cause something to happen
// e.g. displaying to screen and taking input from keyboard // e.g. displaying to screen and taking input from keyboard
void _start() { void _start() {
// Initialize Global Variables and set up interrrupt handlers // Initialize Global Variables and set up interrrupt handlers
// These variables are a vulnerability to OS security if someone can adjust // These variables are a vulnerability to OS security if someone can adjust
// the lower value in the kernel code (exploiting, for example, an Intel address hack) // the lower value in the kernel code (exploiting, for example, an Intel address hack)
// than kernel memory and even kernel code can be overwritten // than kernel memory and even kernel code can be overwritten
// https://www.wired.com/story/intel-lab-istare-hack-chips/ // https://www.wired.com/story/intel-lab-istare-hack-chips/
// See libc/globals.h for KMEM_START and KMEM_END values // See libc/globals.h for KMEM_START and KMEM_END values
// See libc/globals.h for UMEM_START and UMEM_END values // See libc/globals.h for UMEM_START and UMEM_END values
kmem_addr = KMEM_START; kmem_addr = KMEM_START;
kernel_mem_limit = KMEM_END; kernel_mem_limit = KMEM_END;
umem_addr = UMEM_START; umem_addr = UMEM_START;
user_mem_limit = UMEM_END; user_mem_limit = UMEM_END;
global_head = NULL; global_head = NULL;
global_id = 0; global_id = 0;
isr_install(); isr_install();
irq_install(); irq_install();
kprint("Type something, it will go through the kernel\n" kprint("Type something, it will go through the kernel\n"
"Type HELP to list commands\n> "); "Type HELP to list commands\n> ");
}
// An interrupt calls this function to parse what was typed in, this is, essentially, your
// Command Line Interpreter for now.
void user_input(char *input) {
static u32 delete_id = 0; // static persistent variable for incrementing during test
static node* umem_head = NULL; // static persistent head variable for contiguous block allocations
if (strcmp(input, "END") == 0) {
kprint("Stopping the CPU. Bye!\n");
asm volatile("hlt");
// } else if (strcmp(input, "ADD") == 0) {
// umem_head = add_node( umem_head, 0x10000, 0x100, true, global_id++);
// }
} else if (strncmp(input, "ADD", 3) == 0) {
// Parse the base register value from the user input
char base_str[16];
// Get input from your input source (you need to implement this)
strncpy(base_str, input + 3, sizeof(base_str) - 1); // Skip the command part
base_str[sizeof(base_str) - 1] = '\0'; // Null-terminate the base_str
// Convert base_str to an integer (you need a suitable conversion function)
u32 base = digit_conver(base_str);
// Now you have the base register input, and you can use it as needed
umem_head = add_node(umem_head, base, 0x100, true, global_id++);
} else if (strcmp(input, "LIST") == 0) {
kprint("***** FORWARD ****\n");
print_list( umem_head, true);
kprint("***** REVERSE ****\n");
print_list( umem_head, false);
} else if (strcmp(input, "SHORTLIST") == 0) {
shortprint_list( umem_head, true);
kprint("\n******************\n");
shortprint_list( umem_head, false);
} else if (strcmp(input, "PAGE") == 0) {
u32 phys_addr = 0;
u32 page = umalloc(0x4200, 0, &phys_addr);
kprint_hex( "Page: ", page, 10);
kprint_hex(", physical address: ", phys_addr, 10);
kprint("\n");
} else if (strcmp(input, "DELETE") == 0) {
umem_head = remove_node_by_id( umem_head, delete_id++);
} else if (strcmp(input, "INSERT") == 0) {
node *new_node = create_node( 0x15000, 0x1100, true, global_id++);
node *insert_point = find_id( umem_head, 3);
umem_head = insert_node( umem_head, insert_point, new_node, true);
new_node = create_node( 0x18000, 0x2100, true, global_id++);
insert_point = find_id( umem_head, 5);
umem_head = insert_node( umem_head, insert_point, new_node, false);
} else if (strcmp(input, "SORTA") == 0) {
umem_head = hacksort_list( umem_head, true);
} else if (strcmp(input, "SORTD") == 0) {
umem_head = hacksort_list( umem_head, false);
} else if (strcmp(input, "SWAP") == 0) {
node *n1 = find_id( umem_head, 1);
node *n2 = find_id( umem_head, 5);
node *n3 = find_id( umem_head, 3);
node *n4 = find_id( umem_head, 7);
swap_node_data( n1, n2);
swap_node_data( n2, n3);
swap_node_data( n3, n4);
} else if (strcmp(input, "TEST") == 0) {
char s1[10] = "ABCDFFGH\0";
char s2[10] = "ABCDEGH\0";
int x = strncmp( s1, s2, 5);
kprint_hex( "STRNCMP: ", x, 16);
kprint("\n");
x = sstrlen( s2, 10);
kprint_hex( "SSTRLEN: ", x, 10);
kprint("\n");
x = strlen( s2);
kprint_hex( "STRLEN: ", x, 10);
kprint("\n");
} else if (strcmp(input, "HELP") == 0) {
kprint("Current Commands: ADD, LIST, SHORTLIST, PAGE, DELETE,\n");
kprint(" : END, INSERT, SORTA, SORTD, SWAP, TEST, HELP\n");
kprint(" Review the kernel.c source code to see what each command does.\n");
kprint(" These are hard coded and are just examples, modify as you see fit.\n");
kprint(" for example - TEST was just added so that I could test the strlen commands.\n");
} else {
kprint("You said: ");
kprint(input);
kprint("\n");
} }
kprint("> ");
}
// An interrupt calls this function to parse what was typed in, this is, essentially, your
// Command Line Interpreter for now.
void user_input(char *input) {
static u32 delete_id = 0; // static persistent variable for incrementing during test
static node* umem_head = NULL; // static persistent head variable for contiguous block allocations
if (strcmp(input, "END") == 0) {
kprint("Stopping the CPU. Bye!\n");
asm volatile("hlt");
} else if (strcmp(input, "ADD") == 0) {
if (sstrlen(input, 15) > 4) {
kprint("owo");
}
umem_head = add_node( umem_head, 0x10000, 0x100, true, global_id++);
} else if (strcmp(input, "LIST") == 0) {
kprint("***** FORWARD ****\n");
print_list( umem_head, true);
kprint("***** REVERSE ****\n");
print_list( umem_head, false);
} else if (strcmp(input, "SHORTLIST") == 0) {
shortprint_list( umem_head, true);
kprint("\n******************\n");
shortprint_list( umem_head, false);
} else if (strcmp(input, "PAGE") == 0) {
u32 phys_addr = 0;
u32 page = umalloc(0x4200, 0, &phys_addr);
kprint_hex( "Page: ", page, 10);
kprint_hex(", physical address: ", phys_addr, 10);
kprint("\n");
} else if (strcmp(input, "DELETE") == 0) {
umem_head = remove_node_by_id( umem_head, delete_id++);
} else if (strcmp(input, "INSERT") == 0) {
node *new_node = create_node( 0x15000, 0x1100, true, global_id++);
node *insert_point = find_id( umem_head, 3);
umem_head = insert_node( umem_head, insert_point, new_node, true);
new_node = create_node( 0x18000, 0x2100, true, global_id++);
insert_point = find_id( umem_head, 5);
umem_head = insert_node( umem_head, insert_point, new_node, false);
} else if (strcmp(input, "SORTA") == 0) {
umem_head = hacksort_list( umem_head, true);
} else if (strcmp(input, "SORTD") == 0) {
umem_head = hacksort_list( umem_head, false);
} else if (strcmp(input, "SWAP") == 0) {
node *n1 = find_id( umem_head, 1);
node *n2 = find_id( umem_head, 5);
node *n3 = find_id( umem_head, 3);
node *n4 = find_id( umem_head, 7);
swap_node_data( n1, n2);
swap_node_data( n2, n3);
swap_node_data( n3, n4);
} else if (strcmp(input, "TEST") == 0) {
char s1[10] = "ABCDFFGH\0";
char s2[10] = "ABCDEGH\0";
int x = strncmp( s1, s2, 5);
kprint_hex( "STRNCMP: ", x, 16);
kprint("\n");
int digconver(const char *str) { x = sstrlen( s2, 10);
int result = 0; kprint_hex( "SSTRLEN: ", x, 10);
int i = 0; kprint("\n");
while (str[i] != '\0') { x = strlen( s2);
if (str[i] >= '0' && str[i] <= '9') { kprint_hex( "STRLEN: ", x, 10);
result = result * 10 + (str[i] - '0'); kprint("\n");
} else if (strcmp(input, "HELP") == 0) {
kprint("Current Commands: ADD, LIST, SHORTLIST, PAGE, DELETE,\n");
kprint(" : END, INSERT, SORTA, SORTD, SWAP, TEST, HELP\n");
kprint(" Review the kernel.c source code to see what each command does.\n");
kprint(" These are hard coded and are just examples, modify as you see fit.\n");
kprint(" for example - TEST was just added so that I could test the strlen commands.\n");
} else { } else {
kprint("Error - Provided input is not a valid number.\n"); kprint("You said: ");
return 0; kprint(input);
kprint("\n");
} }
i++; kprint("> ");
}
int digconver(const char *str) {
int result = 0;
int i = 0;
while (str[i] != '\0') {
if (str[i] >= '0' && str[i] <= '9') {
result = result * 10 + (str[i] - '0');
} else {
kprint("Error - Provided input is not a valid number.\n");
return 0;
}
i++;
}
return result;
} }
return result;
}