mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 04:07:45 +00:00
Kernel::CPU: Move headers into common directory
Alot of code is shared between i386/i686/x86 and x86_64 and a lot probably will be used for compatability modes. So we start by moving the headers into one Directory. We will probalby be able to move some cpp files aswell.
This commit is contained in:
Hendiadyoin1
Andreas Kling
parent
5a8cc07485
commit
0d934fc991
60 changed files with 412 additions and 208 deletions
|
|
@ -29,10 +29,10 @@
|
|||
#include <AK/String.h>
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <AK/Types.h>
|
||||
#include <Kernel/Arch/i386/CPU.h>
|
||||
#include <Kernel/Arch/i386/ISRStubs.h>
|
||||
#include <Kernel/Arch/i386/ProcessorInfo.h>
|
||||
#include <Kernel/Arch/i386/SafeMem.h>
|
||||
#include <Kernel/Arch/x86/CPU.h>
|
||||
#include <Kernel/Arch/x86/ISRStubs.h>
|
||||
#include <Kernel/Arch/x86/ProcessorInfo.h>
|
||||
#include <Kernel/Arch/x86/SafeMem.h>
|
||||
#include <Kernel/Debug.h>
|
||||
#include <Kernel/IO.h>
|
||||
#include <Kernel/Interrupts/APIC.h>
|
||||
|
|
@ -2309,8 +2309,8 @@ UNMAP_AFTER_INIT void Processor::gdt_init()
|
|||
tls_descriptor.dpl = 3;
|
||||
tls_descriptor.segment_present = 1;
|
||||
tls_descriptor.granularity = 0;
|
||||
tls_descriptor.zero = 0;
|
||||
tls_descriptor.operation_size = 1;
|
||||
tls_descriptor.operation_size64 = 0;
|
||||
tls_descriptor.operation_size32 = 1;
|
||||
tls_descriptor.descriptor_type = 1;
|
||||
tls_descriptor.type = 2;
|
||||
write_gdt_entry(GDT_SELECTOR_TLS, tls_descriptor); // tls3
|
||||
|
|
@ -2321,8 +2321,8 @@ UNMAP_AFTER_INIT void Processor::gdt_init()
|
|||
fs_descriptor.dpl = 0;
|
||||
fs_descriptor.segment_present = 1;
|
||||
fs_descriptor.granularity = 0;
|
||||
fs_descriptor.zero = 0;
|
||||
fs_descriptor.operation_size = 1;
|
||||
fs_descriptor.operation_size64 = 0;
|
||||
fs_descriptor.operation_size32 = 1;
|
||||
fs_descriptor.descriptor_type = 1;
|
||||
fs_descriptor.type = 2;
|
||||
write_gdt_entry(GDT_SELECTOR_PROC, fs_descriptor); // fs0
|
||||
|
|
@ -2333,8 +2333,8 @@ UNMAP_AFTER_INIT void Processor::gdt_init()
|
|||
tss_descriptor.dpl = 0;
|
||||
tss_descriptor.segment_present = 1;
|
||||
tss_descriptor.granularity = 0;
|
||||
tss_descriptor.zero = 0;
|
||||
tss_descriptor.operation_size = 1;
|
||||
tss_descriptor.operation_size64 = 0;
|
||||
tss_descriptor.operation_size32 = 1;
|
||||
tss_descriptor.descriptor_type = 0;
|
||||
tss_descriptor.type = 9;
|
||||
write_gdt_entry(GDT_SELECTOR_TSS, tss_descriptor); // tss
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,206 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Kernel/Arch/i386/Interrupts.h>
|
||||
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(80)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(81)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(82)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(83)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(84)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(85)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(86)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(87)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(88)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(89)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(90)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(91)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(92)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(93)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(94)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(95)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(96)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(97)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(98)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(99)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(100)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(101)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(102)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(103)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(104)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(105)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(106)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(107)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(108)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(109)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(110)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(111)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(112)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(113)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(114)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(115)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(116)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(117)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(118)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(119)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(120)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(121)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(122)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(123)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(124)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(125)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(126)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(127)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(128)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(129)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(130)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(131)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(132)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(133)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(134)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(135)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(136)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(137)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(138)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(139)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(140)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(141)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(142)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(143)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(144)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(145)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(146)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(147)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(148)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(149)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(150)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(151)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(152)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(153)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(154)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(155)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(156)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(157)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(158)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(159)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(160)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(161)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(162)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(163)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(164)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(165)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(166)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(167)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(168)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(169)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(170)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(171)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(172)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(173)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(174)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(175)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(176)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(177)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(178)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(179)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(180)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(181)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(182)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(183)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(184)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(185)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(186)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(187)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(188)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(189)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(190)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(191)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(192)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(193)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(194)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(195)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(196)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(197)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(198)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(199)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(200)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(201)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(202)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(203)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(204)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(205)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(206)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(207)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(208)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(209)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(210)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(211)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(212)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(213)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(214)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(215)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(216)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(217)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(218)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(219)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(220)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(221)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(222)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(223)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(224)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(225)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(226)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(227)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(228)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(229)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(230)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(231)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(232)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(233)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(234)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(235)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(236)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(237)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(238)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(239)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(240)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(241)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(242)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(243)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(244)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(245)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(246)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(247)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(248)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(249)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(250)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(251)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(252)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(253)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(254)
|
||||
GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(255)
|
||||
|
|
@ -24,24 +24,8 @@
|
|||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/Assertions.h>
|
||||
#include <AK/Types.h>
|
||||
#include <Kernel/Arch/i386/CPU.h>
|
||||
|
||||
extern "C" void interrupt_common_asm_entry();
|
||||
|
||||
#if ARCH(I386)
|
||||
|
||||
# define GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(isr_number) \
|
||||
extern "C" void interrupt_##isr_number##_asm_entry(); \
|
||||
asm(".globl interrupt_" #isr_number "_asm_entry\n" \
|
||||
"interrupt_" #isr_number "_asm_entry:\n" \
|
||||
" pushw $" #isr_number "\n" \
|
||||
" pushw $0\n" \
|
||||
" jmp interrupt_common_asm_entry\n");
|
||||
|
||||
#include <Kernel/Arch/x86/CPU.h>
|
||||
#include <Kernel/Arch/x86/DescriptorTable.h>
|
||||
// clang-format off
|
||||
asm(
|
||||
".globl interrupt_common_asm_entry\n"
|
||||
|
|
@ -68,9 +52,9 @@ asm(
|
|||
" movl %ebx, 0(%esp) \n" // push pointer to TrapFrame
|
||||
".globl common_trap_exit \n"
|
||||
"common_trap_exit: \n"
|
||||
// another thread may have handled this trap at this point, so don't
|
||||
// make assumptions about the stack other than there's a TrapFrame
|
||||
// and a pointer to it.
|
||||
// another thread may have handled this trap at this point, so don't
|
||||
// make assumptions about the stack other than there's a TrapFrame
|
||||
// and a pointer to it.
|
||||
" call exit_trap \n"
|
||||
" addl $" __STRINGIFY(TRAP_FRAME_SIZE + 4) ", %esp\n" // pop TrapFrame and pointer to it
|
||||
".globl interrupt_common_asm_exit \n"
|
||||
|
|
@ -85,19 +69,3 @@ asm(
|
|||
" iret\n"
|
||||
);
|
||||
// clang-format on
|
||||
|
||||
#elif ARCH(X86_64)
|
||||
|
||||
# define GENERATE_GENERIC_INTERRUPT_HANDLER_ASM_ENTRY(isr_number) \
|
||||
extern "C" void interrupt_##isr_number##_asm_entry(); \
|
||||
asm(".globl interrupt_" #isr_number "_asm_entry\n" \
|
||||
"interrupt_" #isr_number "_asm_entry:\n" \
|
||||
" cli\n" \
|
||||
" hlt\n");
|
||||
|
||||
asm(
|
||||
".globl common_trap_exit\n"
|
||||
"common_trap_exit:\n"
|
||||
" cli;hlt\n");
|
||||
|
||||
#endif
|
||||
|
|
@ -26,8 +26,8 @@
|
|||
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <AK/Types.h>
|
||||
#include <Kernel/Arch/i386/CPU.h>
|
||||
#include <Kernel/Arch/i386/ProcessorInfo.h>
|
||||
#include <Kernel/Arch/x86/CPU.h>
|
||||
#include <Kernel/Arch/x86/ProcessorInfo.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/String.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
class Processor;
|
||||
|
||||
class ProcessorInfo {
|
||||
Processor& m_processor;
|
||||
String m_cpuid;
|
||||
String m_brandstr;
|
||||
String m_features;
|
||||
u32 m_display_model;
|
||||
u32 m_display_family;
|
||||
u32 m_stepping;
|
||||
u32 m_type;
|
||||
u32 m_apic_id;
|
||||
|
||||
public:
|
||||
ProcessorInfo(Processor& processor);
|
||||
|
||||
const String& cpuid() const { return m_cpuid; }
|
||||
const String& brandstr() const { return m_brandstr; }
|
||||
const String& features() const { return m_features; }
|
||||
u32 display_model() const { return m_display_model; }
|
||||
u32 display_family() const { return m_display_family; }
|
||||
u32 stepping() const { return m_stepping; }
|
||||
u32 type() const { return m_type; }
|
||||
u32 apic_id() const { return m_apic_id; }
|
||||
|
||||
void set_apic_id(u32 apic_id) { m_apic_id = apic_id; }
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -24,8 +24,8 @@
|
|||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <Kernel/Arch/i386/CPU.h>
|
||||
#include <Kernel/Arch/i386/SafeMem.h>
|
||||
#include <Kernel/Arch/x86/CPU.h>
|
||||
#include <Kernel/Arch/x86/SafeMem.h>
|
||||
|
||||
#define CODE_SECTION(section_name) __attribute__((section(section_name)))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,120 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2020, the SerenityOS developers.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <AK/Atomic.h>
|
||||
#include <AK/Optional.h>
|
||||
#include <AK/Types.h>
|
||||
|
||||
#pragma once
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
struct RegisterState;
|
||||
|
||||
[[nodiscard]] bool safe_memcpy(void* dest_ptr, const void* src_ptr, size_t n, void*& fault_at);
|
||||
[[nodiscard]] ssize_t safe_strnlen(const char* str, size_t max_n, void*& fault_at);
|
||||
[[nodiscard]] bool safe_memset(void* dest_ptr, int c, size_t n, void*& fault_at);
|
||||
[[nodiscard]] Optional<u32> safe_atomic_fetch_add_relaxed(volatile u32* var, u32 val);
|
||||
[[nodiscard]] Optional<u32> safe_atomic_exchange_relaxed(volatile u32* var, u32 val);
|
||||
[[nodiscard]] Optional<u32> safe_atomic_load_relaxed(volatile u32* var);
|
||||
[[nodiscard]] bool safe_atomic_store_relaxed(volatile u32* var, u32 val);
|
||||
[[nodiscard]] Optional<bool> safe_atomic_compare_exchange_relaxed(volatile u32* var, u32& expected, u32 val);
|
||||
|
||||
[[nodiscard]] ALWAYS_INLINE Optional<u32> safe_atomic_fetch_and_relaxed(volatile u32* var, u32 val)
|
||||
{
|
||||
auto expected_value = safe_atomic_load_relaxed(var);
|
||||
if (!expected_value.has_value())
|
||||
return {}; // fault
|
||||
u32& expected = expected_value.value();
|
||||
for (;;) {
|
||||
auto result = safe_atomic_compare_exchange_relaxed(var, expected, expected & val);
|
||||
if (!result.has_value())
|
||||
return {}; // fault
|
||||
if (result.value())
|
||||
return expected; // exchanged
|
||||
|
||||
// This is only so that we don't saturate the bus...
|
||||
AK::atomic_thread_fence(AK::MemoryOrder::memory_order_acquire);
|
||||
}
|
||||
}
|
||||
|
||||
[[nodiscard]] ALWAYS_INLINE Optional<u32> safe_atomic_fetch_and_not_relaxed(volatile u32* var, u32 val)
|
||||
{
|
||||
auto expected_value = safe_atomic_load_relaxed(var);
|
||||
if (!expected_value.has_value())
|
||||
return {}; // fault
|
||||
u32& expected = expected_value.value();
|
||||
for (;;) {
|
||||
auto result = safe_atomic_compare_exchange_relaxed(var, expected, expected & ~val);
|
||||
if (!result.has_value())
|
||||
return {}; // fault
|
||||
if (result.value())
|
||||
return expected; // exchanged
|
||||
|
||||
// This is only so that we don't saturate the bus...
|
||||
AK::atomic_thread_fence(AK::MemoryOrder::memory_order_acquire);
|
||||
}
|
||||
}
|
||||
|
||||
[[nodiscard]] ALWAYS_INLINE Optional<u32> safe_atomic_fetch_or_relaxed(volatile u32* var, u32 val)
|
||||
{
|
||||
auto expected_value = safe_atomic_load_relaxed(var);
|
||||
if (!expected_value.has_value())
|
||||
return {}; // fault
|
||||
u32& expected = expected_value.value();
|
||||
for (;;) {
|
||||
auto result = safe_atomic_compare_exchange_relaxed(var, expected, expected | val);
|
||||
if (!result.has_value())
|
||||
return {}; // fault
|
||||
if (result.value())
|
||||
return expected; // exchanged
|
||||
|
||||
// This is only so that we don't saturate the bus...
|
||||
AK::atomic_thread_fence(AK::MemoryOrder::memory_order_acquire);
|
||||
}
|
||||
}
|
||||
|
||||
[[nodiscard]] ALWAYS_INLINE Optional<u32> safe_atomic_fetch_xor_relaxed(volatile u32* var, u32 val)
|
||||
{
|
||||
auto expected_value = safe_atomic_load_relaxed(var);
|
||||
if (!expected_value.has_value())
|
||||
return {}; // fault
|
||||
u32& expected = expected_value.value();
|
||||
for (;;) {
|
||||
auto result = safe_atomic_compare_exchange_relaxed(var, expected, expected ^ val);
|
||||
if (!result.has_value())
|
||||
return {}; // fault
|
||||
if (result.value())
|
||||
return expected; // exchanged
|
||||
|
||||
// This is only so that we don't saturate the bus...
|
||||
AK::atomic_thread_fence(AK::MemoryOrder::memory_order_acquire);
|
||||
}
|
||||
}
|
||||
|
||||
bool handle_safe_access_fault(RegisterState& regs, u32 fault_address);
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue