ejung/bsb1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify Qeue, update some comments and include paths

Browse Source
This commit is contained in:
Niklas Gollenstede
2025-05-26 18:21:22 +02:00
committed by Eggert Jung
parent 68e11c9793
commit d9978ddc37
13 changed files with 55 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
interrupt/epilogues.h
View File

@@ -28,7 +28,7 @@ namespace Epilogues {
* \todo(15) Store the key to the keyboard buffer for user threads. Wake user
* threads waiting for a key using the key semaphore.
*
* @param g
* @param v The vault.
*/
void keyboard(Vault& g);
@@ -37,7 +37,7 @@ void keyboard(Vault& g);
* \todo(15) Preemptively reschedule threads
* \todo(16) Check the bellringer
* \todo(17) Refresh screen with fixed FPS rate
* @param g
* @param v The vault.
*/
void timer(Vault& g);
@@ -45,6 +45,7 @@ void timer(Vault& g);
* it is set.
*
* \todo(15) Implement the rescheduling (in \MPStuBS only)
* @param v The vault.
*/
void assassin(Vault& g);
}; // namespace Epilogues

9
interrupt/handlers.cc
View File

@@ -1,4 +1,4 @@
#include "handlers.h"
#include "./handlers.h"
#include "../arch/core_cr.h"
#include "../arch/idt.h"
@@ -29,8 +29,7 @@ void printContext(const InterruptContext *context) {
[[gnu::interrupt]] void handle_double_fault(InterruptContext *context,
uint64_t error) {
(void)error;
DBG << "Double fault encoutered" << endl;
DBG << "Double fault encountered. Error code: " << dec << error << endl;
printContext(context);
kernelpanic("Double fault!");
}
@@ -61,8 +60,12 @@ enum PAGE_FAULT_ERROR {
[[gnu::interrupt]] void handle_page_fault(InterruptContext *context,
uint64_t error) {
<<<<<<< HEAD
(void)error;
DBG << "Page fault encoutered at linear address " << hex
=======
DBG << "Page fault encountered at linear address " << hex
>>>>>>> c0b78ee (simplify Qeue, update some comments and include paths)
<< Core::CR<2>::read() << endl
<< (error & PF_ERR_PRESENT ? "present" : "non-present") << " page|"
<< (error & PF_ERR_WRITE ? "write" : "read") << " access|"