Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-27 15:04:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixme

Browse Source
This commit is contained in:
Alex 2023-02-24 10:15:05 +02:00
parent f767d950c4
commit 62e9d7b9c9
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
4 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Architecture/amd64/cpu/InterruptDescriptorTable.cpp
View File

@ -284,7 +284,7 @@ namespace InterruptDescriptorTable
INTERRUPT_HANDLER(0x3a)
INTERRUPT_HANDLER(0x3b)
INTERRUPT_HANDLER(0x3c)
EXCEPTION_HANDLER(0x3d)
INTERRUPT_HANDLER(0x3d)
/* Free */

43
Core/Crash/CrashHandler.cpp
View File

@ -724,19 +724,33 @@ namespace CrashHandler
SafeFunction void StopAllCores()
{
#if defined(__amd64__) || defined(__i386__)
if (SMP::CPUCores > 1)
{
CPU::Interrupts(CPU::Enable);
for (int i = 1; i < SMP::CPUCores; i++)
{
APIC::InterruptCommandRegisterLow icr;
icr.Vector = CPU::x86::IRQ29;
icr.Level = APIC::APICLevel::Assert;
((APIC::APIC *)Interrupts::apic[0])->IPI(i, icr);
__sync;
}
CPU::Interrupts(CPU::Disable);
}
/* FIXME: Can't send IPIs to other cores
* because it causes another exception on
* the other cores.
*
* Also it makes every core to stay at 100% usage for some reason.
*/
// if (SMP::CPUCores > 1)
// {
// for (int i = 1; i < SMP::CPUCores; i++)
// {
// APIC::InterruptCommandRegisterLow icr;
// icr.Vector = CPU::x86::IRQ29;
// icr.Level = APIC::APICLevel::Assert;
// ((APIC::APIC *)Interrupts::apic[i])->IPI(i, icr);
// __sync;
// }
// }
// APIC::InterruptCommandRegisterLow icr;
// icr.Vector = CPU::x86::IRQ29;
// icr.Level = APIC::APICLevel::Assert;
// icr.DestinationShorthand = APIC::APICDestinationShorthand::AllExcludingSelf;
// ((APIC::APIC *)Interrupts::apic[0])->IPI(0, icr);
// CPU::Interrupts(CPU::Enable);
__sync;
CPU::Interrupts(CPU::Disable);
// }
#elif defined(__aarch64__)
#endif
}
@ -748,9 +762,6 @@ namespace CrashHandler
SBIdx = 255;
CHArchTrapFrame *Frame = (CHArchTrapFrame *)Data;
#if defined(__amd64__)
if (Frame->InterruptNumber == CPU::x86::IRQ29)
CPU::Stop();
error("An exception occurred!");
error("Exception: %#llx", Frame->InterruptNumber);
for (size_t i = 0; i < INT_FRAMES_MAX; i++)

7
Core/Interrupts/IntManager.cpp
View File

@ -107,7 +107,7 @@ namespace Interrupts
SafeFunction void RemoveAll()
{
for (int i = 0; i < CPU::x86::IRQ223; i++)
RegisteredEvents->DeleteNode(i);
RegisteredEvents->DeleteNode(i);
}
extern "C" SafeFunction void MainInterruptHandler(void *Data)
@ -117,7 +117,7 @@ namespace Interrupts
memmove(InterruptFrames + 1, InterruptFrames, sizeof(InterruptFrames) - sizeof(InterruptFrames[0]));
InterruptFrames[0] = (void *)Frame->rip;
CPUData *CoreData = GetCurrentCPU();
int Core = 0;
if (likely(CoreData != nullptr))
@ -126,6 +126,9 @@ namespace Interrupts
// If this is false, we have a big problem.
if (likely(Frame->InterruptNumber < CPU::x86::IRQ223 && Frame->InterruptNumber > CPU::x86::ISR0))
{
if (Frame->InterruptNumber == CPU::x86::IRQ29) // Halt core interrupt
CPU::Stop();
Handler *handler = (Handler *)RegisteredEvents->Get(Frame->InterruptNumber);
if (likely(handler != (Handler *)HASHMAP_ERROR))
handler->OnInterruptReceived(Frame);

1
Core/Time.cpp
View File

@ -42,7 +42,6 @@ namespace Time
Clock ConvertFromUnix(int Timestamp)
{
Clock result;
if (Timestamp == 0)
return result;