Skip to content

Improve messages text #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ProgMiner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve messages text #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kernel/memory/paging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void page_fault(registers_t regs) {
int id = regs.err_code & 0x10;

print_newline();
print_d("Page fault! ( ");
print_d("Page fisting! ( ");
if (present) print_d("present ");
if (rw) print_d("read-only ");
if (us) print_d("user mode ");
Expand All @@ -169,4 +169,4 @@ struct page* get_page_at(void* ptr) {
struct page* cur_page = &cur_page_table->pages[p_t_idx];

return cur_page;
}
}
16 changes: 8 additions & 8 deletions kernel/shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "../drivers/screen.h"
#include "memory/include/test.h"

#define MSG_LEN 9
#define MSG_LEN 7
#define MAX_ARGS 5
#define MAX_LEN MAX_COLS - MSG_LEN
#define COMMANDS_COUNT 10
Expand All @@ -28,7 +28,7 @@ static struct command cmds[COMMANDS_COUNT] = {
(struct command) { 9, 0, "memtest" },
};

static char cli_msg[MSG_LEN] = "~console>";
static char cli_msg[MSG_LEN] = "~slave>";
static char cur_row[MAX_LEN];
static int cur_row_pos;
char* cmd_args[MAX_ARGS];
Expand All @@ -51,7 +51,7 @@ void echo() {

void panic(const char *msg) {
print_newline();
print_d("KERNEL PANIC( ");
print_d("KERNEL CUMMING( ");
print(msg, 0x04);
print_d(" )");
print_newline();
Expand All @@ -61,7 +61,7 @@ void panic(const char *msg) {
void yes() {
int yes_rep = MAX_ROWS - 1;
if (cmd_args[1] == NULL) {
for (int i = 0; i<yes_rep; i++) print_d("\nyes");
for (int i = 0; i<yes_rep; i++) print_d("\nass");
} else {
for (int i = 0; i<yes_rep; i++) {
print_newline();
Expand Down Expand Up @@ -103,9 +103,9 @@ void wmem() {
int c;
for(c = 0; c < size; c++) *(addr + c) = data[c];

print_d("\n: Written ");
print_d("\n: Fisted ");
print_d(int_to_str(size));
print_d(" bytes -> ");
print_d(" asses -> ");
print_d(cmd_args[1]);
}

Expand All @@ -120,7 +120,7 @@ void add() {
*(res_addr) = result;
}

print_d("RESULT: ");
print_d("DO YOU LIKE WHAT YOU SEE: ");
print_hex_d(result);
}

Expand All @@ -144,7 +144,7 @@ void help() {
"\nadd (addr_1) (addr_2) [res_addr] - sums two bytes of data",
"\nclear - flushes the screen data",
"\nexit - shutdowns the machine",
"\nhelp - show help",
"\nhelp - fist ass",
"\n(addr) in DECIMAL, (size) in DECIMAL, (data) in CHARACTERS"
};

Expand Down