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

changes

Browse Source
This commit is contained in:
Eggert Jung
2025-06-22 11:45:31 +02:00
parent d9978ddc37
commit 94249eda37
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
interrupt/handlers.cc
View File

@@ -60,12 +60,7 @@ enum PAGE_FAULT_ERROR {
[[gnu::interrupt]] void handle_page_fault(InterruptContext *context, [[gnu::interrupt]] void handle_page_fault(InterruptContext *context,
uint64_t error) { uint64_t error) {
<<<<<<< HEAD
(void)error;
DBG << "Page fault encoutered at linear address " << hex
=======
DBG << "Page fault encountered 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 << Core::CR<2>::read() << endl
<< (error & PF_ERR_PRESENT ? "present" : "non-present") << " page|" << (error & PF_ERR_PRESENT ? "present" : "non-present") << " page|"
<< (error & PF_ERR_WRITE ? "write" : "read") << " access|" << (error & PF_ERR_WRITE ? "write" : "read") << " access|"

1
main.cc
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
#include "arch/lapic.h" #include "arch/lapic.h"
#include "boot/startup_ap.h" #include "boot/startup_ap.h"
#include "arch/core_interrupt.h" #include "arch/core_interrupt.h"

2
thread/scheduler.cc
View File

@@ -2,7 +2,7 @@
#include "scheduler.h" #include "scheduler.h"
Queue<Thread> readyList = Queue<Thread>(0); Queue<Thread> readyList = Queue<Thread>();
Scheduler::Scheduler() { Scheduler::Scheduler() {
} }

2
user/app1/appl.cc
View File

@@ -53,6 +53,6 @@ void Application::action() { // NOLINT
activeWaitDelay(10000000); activeWaitDelay(10000000);
if(cnt >= sizeof(text)-1) if(cnt >= sizeof(text)-1)
cnt=0; cnt=0;
context_switch(test2,test1); //context_switch(test2,test1);
} }
} }