1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:57:36 +00:00

Kernel: Run clang-format on files

Let's rip off the band-aid
This commit is contained in:
Shannon Booth 2020-03-22 13:12:45 +13:00 committed by Andreas Kling
parent d0629d0a8c
commit 81adefef27
25 changed files with 2992 additions and 2995 deletions

View file

@ -29,70 +29,70 @@
namespace Kernel { namespace Kernel {
namespace ACPI { namespace ACPI {
void DynamicParser::initialize(PhysicalAddress rsdp) void DynamicParser::initialize(PhysicalAddress rsdp)
{ {
if (!StaticParser::is_initialized()) { if (!StaticParser::is_initialized()) {
new DynamicParser(rsdp); new DynamicParser(rsdp);
} }
} }
void DynamicParser::initialize_without_rsdp() void DynamicParser::initialize_without_rsdp()
{ {
if (!StaticParser::is_initialized()) { if (!StaticParser::is_initialized()) {
new DynamicParser(); new DynamicParser();
} }
} }
DynamicParser::DynamicParser() DynamicParser::DynamicParser()
: IRQHandler(9) : IRQHandler(9)
, StaticParser() , StaticParser()
{ {
klog() << "ACPI: Dynamic Parsing Enabled, Can parse AML"; klog() << "ACPI: Dynamic Parsing Enabled, Can parse AML";
} }
DynamicParser::DynamicParser(PhysicalAddress rsdp) DynamicParser::DynamicParser(PhysicalAddress rsdp)
: IRQHandler(9) : IRQHandler(9)
, StaticParser(rsdp) , StaticParser(rsdp)
{ {
klog() << "ACPI: Dynamic Parsing Enabled, Can parse AML"; klog() << "ACPI: Dynamic Parsing Enabled, Can parse AML";
} }
void DynamicParser::handle_irq(const RegisterState&) void DynamicParser::handle_irq(const RegisterState&)
{ {
// FIXME: Implement IRQ handling of ACPI signals! // FIXME: Implement IRQ handling of ACPI signals!
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void DynamicParser::enable_aml_interpretation() void DynamicParser::enable_aml_interpretation()
{ {
// FIXME: Implement AML Interpretation // FIXME: Implement AML Interpretation
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void DynamicParser::enable_aml_interpretation(File&) void DynamicParser::enable_aml_interpretation(File&)
{ {
// FIXME: Implement AML Interpretation // FIXME: Implement AML Interpretation
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void DynamicParser::enable_aml_interpretation(u8*, u32) void DynamicParser::enable_aml_interpretation(u8*, u32)
{ {
// FIXME: Implement AML Interpretation // FIXME: Implement AML Interpretation
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void DynamicParser::disable_aml_interpretation() void DynamicParser::disable_aml_interpretation()
{ {
// FIXME: Implement AML Interpretation // FIXME: Implement AML Interpretation
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void DynamicParser::try_acpi_shutdown() void DynamicParser::try_acpi_shutdown()
{ {
// FIXME: Implement AML Interpretation to perform ACPI shutdown // FIXME: Implement AML Interpretation to perform ACPI shutdown
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void DynamicParser::build_namespace() void DynamicParser::build_namespace()
{ {
// FIXME: Implement AML Interpretation to build the ACPI namespace // FIXME: Implement AML Interpretation to build the ACPI namespace
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
} }
} }

View file

@ -35,9 +35,9 @@
namespace Kernel { namespace Kernel {
namespace ACPI { namespace ACPI {
class DynamicParser final : public IRQHandler class DynamicParser final : public IRQHandler
, StaticParser { , StaticParser {
public: public:
static void initialize(PhysicalAddress rsdp); static void initialize(PhysicalAddress rsdp);
static void initialize_without_rsdp(); static void initialize_without_rsdp();
@ -49,16 +49,16 @@ namespace ACPI {
virtual bool can_shutdown() override { return true; } virtual bool can_shutdown() override { return true; }
virtual const char* purpose() const override { return "ACPI Parser"; } virtual const char* purpose() const override { return "ACPI Parser"; }
protected: protected:
DynamicParser(); DynamicParser();
explicit DynamicParser(PhysicalAddress); explicit DynamicParser(PhysicalAddress);
private: private:
void build_namespace(); void build_namespace();
// ^IRQHandler // ^IRQHandler
virtual void handle_irq(const RegisterState&) override; virtual void handle_irq(const RegisterState&) override;
OwnPtr<Region> m_acpi_namespace; OwnPtr<Region> m_acpi_namespace;
}; };
} }
} }

View file

@ -28,85 +28,85 @@
namespace Kernel { namespace Kernel {
namespace ACPI { namespace ACPI {
static Parser* s_acpi_parser; static Parser* s_acpi_parser;
Parser& Parser::the() Parser& Parser::the()
{ {
ASSERT(s_acpi_parser != nullptr); ASSERT(s_acpi_parser != nullptr);
return *s_acpi_parser; return *s_acpi_parser;
} }
void Parser::initialize_limited() void Parser::initialize_limited()
{ {
if (!Parser::is_initialized()) { if (!Parser::is_initialized()) {
s_acpi_parser = new Parser(false); s_acpi_parser = new Parser(false);
} }
} }
bool Parser::is_initialized() bool Parser::is_initialized()
{ {
return (s_acpi_parser != nullptr); return (s_acpi_parser != nullptr);
} }
Parser::Parser(bool usable) Parser::Parser(bool usable)
{ {
if (usable) { if (usable) {
klog() << "ACPI: Setting up a functional parser"; klog() << "ACPI: Setting up a functional parser";
} else { } else {
klog() << "ACPI: Limited Initialization. Vital functions are disabled by a request"; klog() << "ACPI: Limited Initialization. Vital functions are disabled by a request";
} }
s_acpi_parser = this; s_acpi_parser = this;
} }
PhysicalAddress Parser::find_table(const char*) PhysicalAddress Parser::find_table(const char*)
{ {
klog() << "ACPI: Requested to search for a table, Abort!"; klog() << "ACPI: Requested to search for a table, Abort!";
return {}; return {};
} }
void Parser::try_acpi_reboot() void Parser::try_acpi_reboot()
{ {
klog() << "ACPI: Cannot invoke reboot!"; klog() << "ACPI: Cannot invoke reboot!";
} }
void Parser::try_acpi_shutdown() void Parser::try_acpi_shutdown()
{ {
klog() << "ACPI: Cannot invoke shutdown!"; klog() << "ACPI: Cannot invoke shutdown!";
} }
void Parser::enable_aml_interpretation() void Parser::enable_aml_interpretation()
{ {
klog() << "ACPI: No AML Interpretation Allowed"; klog() << "ACPI: No AML Interpretation Allowed";
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void Parser::enable_aml_interpretation(File&) void Parser::enable_aml_interpretation(File&)
{ {
klog() << "ACPI: No AML Interpretation Allowed"; klog() << "ACPI: No AML Interpretation Allowed";
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void Parser::enable_aml_interpretation(u8*, u32) void Parser::enable_aml_interpretation(u8*, u32)
{ {
klog() << "ACPI: No AML Interpretation Allowed"; klog() << "ACPI: No AML Interpretation Allowed";
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
void Parser::disable_aml_interpretation() void Parser::disable_aml_interpretation()
{ {
klog() << "ACPI Limited: No AML Interpretation Allowed"; klog() << "ACPI Limited: No AML Interpretation Allowed";
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
const FADTFlags::HardwareFeatures& Parser::hardware_features() const const FADTFlags::HardwareFeatures& Parser::hardware_features() const
{ {
klog() << "ACPI Limited: Hardware features cannot be obtained"; klog() << "ACPI Limited: Hardware features cannot be obtained";
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
const FADTFlags::x86_Specific_Flags& Parser::x86_specific_flags() const const FADTFlags::x86_Specific_Flags& Parser::x86_specific_flags() const
{ {
klog() << "ACPI Limited: x86 specific features cannot be obtained"; klog() << "ACPI Limited: x86 specific features cannot be obtained";
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
bool Parser::is_operable() bool Parser::is_operable()
{ {
return false; return false;
} }
} }
} }

View file

@ -35,34 +35,34 @@
namespace Kernel { namespace Kernel {
namespace ACPI { namespace ACPI {
void StaticParser::initialize(PhysicalAddress rsdp) void StaticParser::initialize(PhysicalAddress rsdp)
{ {
if (!Parser::is_initialized()) { if (!Parser::is_initialized()) {
new StaticParser(rsdp); new StaticParser(rsdp);
} }
} }
void StaticParser::initialize_without_rsdp() void StaticParser::initialize_without_rsdp()
{ {
if (!Parser::is_initialized()) { if (!Parser::is_initialized()) {
new StaticParser(); new StaticParser();
} }
} }
bool StaticParser::is_initialized() bool StaticParser::is_initialized()
{ {
return Parser::is_initialized(); return Parser::is_initialized();
} }
void StaticParser::locate_static_data() void StaticParser::locate_static_data()
{ {
locate_main_system_description_table(); locate_main_system_description_table();
initialize_main_system_description_table(); initialize_main_system_description_table();
init_fadt(); init_fadt();
init_facs(); init_facs();
} }
PhysicalAddress StaticParser::find_table(const char* sig) PhysicalAddress StaticParser::find_table(const char* sig)
{ {
#ifdef ACPI_DEBUG #ifdef ACPI_DEBUG
dbg() << "ACPI: Calling Find Table method!"; dbg() << "ACPI: Calling Find Table method!";
#endif #endif
@ -80,24 +80,24 @@ namespace ACPI {
} }
} }
return {}; return {};
} }
void StaticParser::init_facs() void StaticParser::init_facs()
{ {
m_facs = find_table("FACS"); m_facs = find_table("FACS");
} }
const FADTFlags::HardwareFeatures& StaticParser::hardware_features() const const FADTFlags::HardwareFeatures& StaticParser::hardware_features() const
{ {
return m_hardware_flags; return m_hardware_flags;
} }
const FADTFlags::x86_Specific_Flags& StaticParser::x86_specific_flags() const const FADTFlags::x86_Specific_Flags& StaticParser::x86_specific_flags() const
{ {
return m_x86_specific_flags; return m_x86_specific_flags;
} }
void StaticParser::init_fadt() void StaticParser::init_fadt()
{ {
klog() << "ACPI: Initializing Fixed ACPI data"; klog() << "ACPI: Initializing Fixed ACPI data";
klog() << "ACPI: Searching for the Fixed ACPI Data Table"; klog() << "ACPI: Searching for the Fixed ACPI Data Table";
@ -139,19 +139,19 @@ namespace ACPI {
m_hardware_flags.use_platform_clock = (sdt->flags & (u32)FADTFlags::FeatureFlags::USE_PLATFORM_CLOCK); m_hardware_flags.use_platform_clock = (sdt->flags & (u32)FADTFlags::FeatureFlags::USE_PLATFORM_CLOCK);
m_hardware_flags.wbinvd = (sdt->flags & (u32)FADTFlags::FeatureFlags::WBINVD); m_hardware_flags.wbinvd = (sdt->flags & (u32)FADTFlags::FeatureFlags::WBINVD);
m_hardware_flags.wbinvd_flush = (sdt->flags & (u32)FADTFlags::FeatureFlags::WBINVD_FLUSH); m_hardware_flags.wbinvd_flush = (sdt->flags & (u32)FADTFlags::FeatureFlags::WBINVD_FLUSH);
} }
bool StaticParser::can_reboot() bool StaticParser::can_reboot()
{ {
auto region = MM.allocate_kernel_region(m_fadt.page_base(), (PAGE_SIZE * 2), "ACPI Static Parser", Region::Access::Read); auto region = MM.allocate_kernel_region(m_fadt.page_base(), (PAGE_SIZE * 2), "ACPI Static Parser", Region::Access::Read);
auto* fadt = (const Structures::FADT*)region->vaddr().offset(m_fadt.offset_in_page()).as_ptr(); auto* fadt = (const Structures::FADT*)region->vaddr().offset(m_fadt.offset_in_page()).as_ptr();
if (fadt->h.revision < 2) if (fadt->h.revision < 2)
return false; return false;
return m_hardware_flags.reset_register_supported; return m_hardware_flags.reset_register_supported;
} }
void StaticParser::access_generic_address(const Structures::GenericAddressStructure& structure, u32 value) void StaticParser::access_generic_address(const Structures::GenericAddressStructure& structure, u32 value)
{ {
switch (structure.address_space) { switch (structure.address_space) {
case (u8)GenericAddressStructure::AddressSpace::SystemIO: { case (u8)GenericAddressStructure::AddressSpace::SystemIO: {
IOAddress address(structure.address); IOAddress address(structure.address);
@ -223,18 +223,18 @@ namespace ACPI {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
bool StaticParser::validate_reset_register() bool StaticParser::validate_reset_register()
{ {
// According to the ACPI spec 6.2, page 152, The reset register can only be located in I/O bus, PCI bus or memory-mapped. // According to the ACPI spec 6.2, page 152, The reset register can only be located in I/O bus, PCI bus or memory-mapped.
auto region = MM.allocate_kernel_region(m_fadt.page_base(), (PAGE_SIZE * 2), "ACPI Static Parser", Region::Access::Read); auto region = MM.allocate_kernel_region(m_fadt.page_base(), (PAGE_SIZE * 2), "ACPI Static Parser", Region::Access::Read);
auto* fadt = (const Structures::FADT*)region->vaddr().offset(m_fadt.offset_in_page()).as_ptr(); auto* fadt = (const Structures::FADT*)region->vaddr().offset(m_fadt.offset_in_page()).as_ptr();
return (fadt->reset_reg.address_space == (u8)GenericAddressStructure::AddressSpace::PCIConfigurationSpace || fadt->reset_reg.address_space == (u8)GenericAddressStructure::AddressSpace::SystemMemory || fadt->reset_reg.address_space == (u8)GenericAddressStructure::AddressSpace::SystemIO); return (fadt->reset_reg.address_space == (u8)GenericAddressStructure::AddressSpace::PCIConfigurationSpace || fadt->reset_reg.address_space == (u8)GenericAddressStructure::AddressSpace::SystemMemory || fadt->reset_reg.address_space == (u8)GenericAddressStructure::AddressSpace::SystemIO);
} }
void StaticParser::try_acpi_reboot() void StaticParser::try_acpi_reboot()
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
if (!can_reboot()) { if (!can_reboot()) {
klog() << "ACPI: Reboot, Not supported!"; klog() << "ACPI: Reboot, Not supported!";
@ -250,15 +250,15 @@ namespace ACPI {
access_generic_address(fadt->reset_reg, fadt->reset_value); access_generic_address(fadt->reset_reg, fadt->reset_value);
for (;;) for (;;)
; ;
} }
void StaticParser::try_acpi_shutdown() void StaticParser::try_acpi_shutdown()
{ {
klog() << "ACPI: Shutdown is not supported with the current configuration, Abort!"; klog() << "ACPI: Shutdown is not supported with the current configuration, Abort!";
} }
size_t StaticParser::get_table_size(PhysicalAddress table_header) size_t StaticParser::get_table_size(PhysicalAddress table_header)
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
#ifdef ACPI_DEBUG #ifdef ACPI_DEBUG
dbg() << "ACPI: Checking SDT Length"; dbg() << "ACPI: Checking SDT Length";
@ -266,10 +266,10 @@ namespace ACPI {
auto region = MM.allocate_kernel_region(table_header.page_base(), (PAGE_SIZE * 2), "ACPI get_table_size()", Region::Access::Read); auto region = MM.allocate_kernel_region(table_header.page_base(), (PAGE_SIZE * 2), "ACPI get_table_size()", Region::Access::Read);
auto* sdt = (volatile Structures::SDTHeader*)region->vaddr().offset(table_header.offset_in_page()).as_ptr(); auto* sdt = (volatile Structures::SDTHeader*)region->vaddr().offset(table_header.offset_in_page()).as_ptr();
return sdt->length; return sdt->length;
} }
u8 StaticParser::get_table_revision(PhysicalAddress table_header) u8 StaticParser::get_table_revision(PhysicalAddress table_header)
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
#ifdef ACPI_DEBUG #ifdef ACPI_DEBUG
dbg() << "ACPI: Checking SDT Revision"; dbg() << "ACPI: Checking SDT Revision";
@ -277,10 +277,10 @@ namespace ACPI {
auto region = MM.allocate_kernel_region(table_header.page_base(), (PAGE_SIZE * 2), "ACPI get_table_revision()", Region::Access::Read); auto region = MM.allocate_kernel_region(table_header.page_base(), (PAGE_SIZE * 2), "ACPI get_table_revision()", Region::Access::Read);
auto* sdt = (volatile Structures::SDTHeader*)region->vaddr().offset(table_header.offset_in_page()).as_ptr(); auto* sdt = (volatile Structures::SDTHeader*)region->vaddr().offset(table_header.offset_in_page()).as_ptr();
return sdt->revision; return sdt->revision;
} }
void StaticParser::initialize_main_system_description_table() void StaticParser::initialize_main_system_description_table()
{ {
#ifdef ACPI_DEBUG #ifdef ACPI_DEBUG
dbg() << "ACPI: Checking Main SDT Length to choose the correct mapping size"; dbg() << "ACPI: Checking Main SDT Length to choose the correct mapping size";
#endif #endif
@ -319,10 +319,10 @@ namespace ACPI {
m_sdt_pointers.append(PhysicalAddress(rsdt->table_ptrs[i])); m_sdt_pointers.append(PhysicalAddress(rsdt->table_ptrs[i]));
} }
} }
} }
void StaticParser::locate_main_system_description_table() void StaticParser::locate_main_system_description_table()
{ {
auto rsdp_region = MM.allocate_kernel_region(m_rsdp.page_base(), (PAGE_SIZE * 2), "ACPI Static Parser Initialization", Region::Access::Read, false, true); auto rsdp_region = MM.allocate_kernel_region(m_rsdp.page_base(), (PAGE_SIZE * 2), "ACPI Static Parser Initialization", Region::Access::Read, false, true);
volatile auto* rsdp = (Structures::RSDPDescriptor20*)rsdp_region->vaddr().offset(m_rsdp.offset_in_page()).as_ptr(); volatile auto* rsdp = (Structures::RSDPDescriptor20*)rsdp_region->vaddr().offset(m_rsdp.offset_in_page()).as_ptr();
if (rsdp->base.revision == 0) { if (rsdp->base.revision == 0) {
@ -339,12 +339,12 @@ namespace ACPI {
} else { } else {
m_main_system_description_table = PhysicalAddress(rsdp->xsdt_ptr); m_main_system_description_table = PhysicalAddress(rsdp->xsdt_ptr);
} }
} }
StaticParser::StaticParser() StaticParser::StaticParser()
: Parser(true) : Parser(true)
, m_rsdp(StaticParsing::search_rsdp()) , m_rsdp(StaticParsing::search_rsdp())
{ {
if (!m_rsdp.is_null()) { if (!m_rsdp.is_null()) {
klog() << "ACPI: Using RSDP @ " << m_rsdp; klog() << "ACPI: Using RSDP @ " << m_rsdp;
m_operable = true; m_operable = true;
@ -353,19 +353,19 @@ namespace ACPI {
m_operable = false; m_operable = false;
klog() << "ACPI: Disabled, due to RSDP being absent"; klog() << "ACPI: Disabled, due to RSDP being absent";
} }
} }
StaticParser::StaticParser(PhysicalAddress rsdp) StaticParser::StaticParser(PhysicalAddress rsdp)
: Parser(true) : Parser(true)
, m_rsdp(rsdp) , m_rsdp(rsdp)
{ {
klog() << "ACPI: Using RSDP @ " << rsdp; klog() << "ACPI: Using RSDP @ " << rsdp;
m_operable = true; m_operable = true;
locate_static_data(); locate_static_data();
} }
PhysicalAddress StaticParsing::search_rsdp_in_ebda(u16 ebda_segment) PhysicalAddress StaticParsing::search_rsdp_in_ebda(u16 ebda_segment)
{ {
auto rsdp_region = MM.allocate_kernel_region(PhysicalAddress(page_base_of((u32)(ebda_segment << 4))), PAGE_ROUND_UP(1024), "ACPI Static Parser RSDP Finding #1", Region::Access::Read, false, true); auto rsdp_region = MM.allocate_kernel_region(PhysicalAddress(page_base_of((u32)(ebda_segment << 4))), PAGE_ROUND_UP(1024), "ACPI Static Parser RSDP Finding #1", Region::Access::Read, false, true);
char* p_rsdp_str = (char*)(PhysicalAddress(ebda_segment << 4).as_ptr()); char* p_rsdp_str = (char*)(PhysicalAddress(ebda_segment << 4).as_ptr());
for (char* rsdp_str = (char*)rsdp_region->vaddr().offset(offset_in_page((u32)(ebda_segment << 4))).as_ptr(); rsdp_str < (char*)(rsdp_region->vaddr().offset(offset_in_page((u32)(ebda_segment << 4))).get() + 1024); rsdp_str += 16) { for (char* rsdp_str = (char*)rsdp_region->vaddr().offset(offset_in_page((u32)(ebda_segment << 4))).as_ptr(); rsdp_str < (char*)(rsdp_region->vaddr().offset(offset_in_page((u32)(ebda_segment << 4))).get() + 1024); rsdp_str += 16) {
@ -377,10 +377,10 @@ namespace ACPI {
p_rsdp_str += 16; p_rsdp_str += 16;
} }
return {}; return {};
} }
PhysicalAddress StaticParsing::search_rsdp_in_bios_area() PhysicalAddress StaticParsing::search_rsdp_in_bios_area()
{ {
auto rsdp_region = MM.allocate_kernel_region(PhysicalAddress(0xE0000), PAGE_ROUND_UP(0xFFFFF - 0xE0000), "ACPI Static Parser RSDP Finding #2", Region::Access::Read, false, true); auto rsdp_region = MM.allocate_kernel_region(PhysicalAddress(0xE0000), PAGE_ROUND_UP(0xFFFFF - 0xE0000), "ACPI Static Parser RSDP Finding #2", Region::Access::Read, false, true);
char* p_rsdp_str = (char*)(PhysicalAddress(0xE0000).as_ptr()); char* p_rsdp_str = (char*)(PhysicalAddress(0xE0000).as_ptr());
for (char* rsdp_str = (char*)rsdp_region->vaddr().offset(offset_in_page((u32)(0xE0000))).as_ptr(); rsdp_str < (char*)(rsdp_region->vaddr().offset(offset_in_page((u32)(0xE0000))).get() + (0xFFFFF - 0xE0000)); rsdp_str += 16) { for (char* rsdp_str = (char*)rsdp_region->vaddr().offset(offset_in_page((u32)(0xE0000))).as_ptr(); rsdp_str < (char*)(rsdp_region->vaddr().offset(offset_in_page((u32)(0xE0000))).get() + (0xFFFFF - 0xE0000)); rsdp_str += 16) {
@ -392,10 +392,10 @@ namespace ACPI {
p_rsdp_str += 16; p_rsdp_str += 16;
} }
return {}; return {};
} }
inline bool StaticParsing::validate_table(Structures::SDTHeader& v_header, size_t length) inline bool StaticParsing::validate_table(Structures::SDTHeader& v_header, size_t length)
{ {
u8 checksum = 0; u8 checksum = 0;
auto* sdt = (u8*)&v_header; auto* sdt = (u8*)&v_header;
for (size_t i = 0; i < length; i++) for (size_t i = 0; i < length; i++)
@ -403,10 +403,10 @@ namespace ACPI {
if (checksum == 0) if (checksum == 0)
return true; return true;
return false; return false;
} }
PhysicalAddress StaticParsing::search_rsdp() PhysicalAddress StaticParsing::search_rsdp()
{ {
PhysicalAddress rsdp; PhysicalAddress rsdp;
auto region = MM.allocate_kernel_region(PhysicalAddress(0), PAGE_SIZE, "ACPI RSDP Searching", Region::Access::Read); auto region = MM.allocate_kernel_region(PhysicalAddress(0), PAGE_SIZE, "ACPI RSDP Searching", Region::Access::Read);
u16 ebda_seg = (u16) * ((uint16_t*)((region->vaddr().get() & PAGE_MASK) + 0x40e)); u16 ebda_seg = (u16) * ((uint16_t*)((region->vaddr().get() & PAGE_MASK) + 0x40e));
@ -416,10 +416,10 @@ namespace ACPI {
if (!rsdp.is_null()) if (!rsdp.is_null())
return rsdp; return rsdp;
return search_rsdp_in_bios_area(); return search_rsdp_in_bios_area();
} }
PhysicalAddress StaticParsing::search_table(PhysicalAddress rsdp, const char* signature) PhysicalAddress StaticParsing::search_table(PhysicalAddress rsdp, const char* signature)
{ {
// FIXME: There's no validation of ACPI tables here. Use the checksum to validate the tables. // FIXME: There's no validation of ACPI tables here. Use the checksum to validate the tables.
// FIXME: Don't blindly use PAGE_SIZE here, but probe the actual length. // FIXME: Don't blindly use PAGE_SIZE here, but probe the actual length.
@ -435,10 +435,10 @@ namespace ACPI {
return search_table_in_rsdt(PhysicalAddress(rsdp_ptr->base.rsdt_ptr), signature); return search_table_in_rsdt(PhysicalAddress(rsdp_ptr->base.rsdt_ptr), signature);
} }
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
PhysicalAddress StaticParsing::search_table_in_xsdt(PhysicalAddress xsdt, const char* signature) PhysicalAddress StaticParsing::search_table_in_xsdt(PhysicalAddress xsdt, const char* signature)
{ {
// FIXME: There's no validation of ACPI tables here. Use the checksum to validate the tables. // FIXME: There's no validation of ACPI tables here. Use the checksum to validate the tables.
// FIXME: Don't blindly use PAGE_SIZE here, but probe the actual length. // FIXME: Don't blindly use PAGE_SIZE here, but probe the actual length.
@ -450,10 +450,10 @@ namespace ACPI {
return PhysicalAddress((FlatPtr)xsdt_ptr->table_ptrs[i]); return PhysicalAddress((FlatPtr)xsdt_ptr->table_ptrs[i]);
} }
return {}; return {};
} }
bool StaticParsing::match_table_signature(PhysicalAddress table_header, const char* signature) bool StaticParsing::match_table_signature(PhysicalAddress table_header, const char* signature)
{ {
// FIXME: There's no validation of ACPI tables here. Use the checksum to validate the tables. // FIXME: There's no validation of ACPI tables here. Use the checksum to validate the tables.
// FIXME: Don't blindly use PAGE_SIZE here, but probe the actual length. // FIXME: Don't blindly use PAGE_SIZE here, but probe the actual length.
@ -461,10 +461,10 @@ namespace ACPI {
auto main_sdt_region = MM.allocate_kernel_region(table_header.page_base(), PAGE_SIZE, "ACPI Static Parsing match_table_signature()", Region::Access::Read, false, true); auto main_sdt_region = MM.allocate_kernel_region(table_header.page_base(), PAGE_SIZE, "ACPI Static Parsing match_table_signature()", Region::Access::Read, false, true);
auto* table_ptr = (volatile Structures::RSDT*)main_sdt_region->vaddr().offset(table_header.offset_in_page()).as_ptr(); auto* table_ptr = (volatile Structures::RSDT*)main_sdt_region->vaddr().offset(table_header.offset_in_page()).as_ptr();
return !strncmp(const_cast<const char*>(table_ptr->h.sig), signature, 4); return !strncmp(const_cast<const char*>(table_ptr->h.sig), signature, 4);
} }
PhysicalAddress StaticParsing::search_table_in_rsdt(PhysicalAddress rsdt, const char* signature) PhysicalAddress StaticParsing::search_table_in_rsdt(PhysicalAddress rsdt, const char* signature)
{ {
// FIXME: There's no validation of ACPI tables here. Use the checksum to validate the tables. // FIXME: There's no validation of ACPI tables here. Use the checksum to validate the tables.
// FIXME: Don't blindly use PAGE_SIZE here, but probe the actual length. // FIXME: Don't blindly use PAGE_SIZE here, but probe the actual length.
ASSERT(strlen(signature) == 4); ASSERT(strlen(signature) == 4);
@ -477,6 +477,6 @@ namespace ACPI {
return PhysicalAddress((FlatPtr)rsdt_ptr->table_ptrs[i]); return PhysicalAddress((FlatPtr)rsdt_ptr->table_ptrs[i]);
} }
return {}; return {};
} }
} }
} }

View file

@ -32,8 +32,8 @@
namespace Kernel { namespace Kernel {
namespace ACPI { namespace ACPI {
class StaticParser : Parser { class StaticParser : Parser {
public: public:
static void initialize(PhysicalAddress rsdp); static void initialize(PhysicalAddress rsdp);
static void initialize_without_rsdp(); static void initialize_without_rsdp();
static bool is_initialized(); static bool is_initialized();
@ -48,11 +48,11 @@ namespace ACPI {
virtual const FADTFlags::HardwareFeatures& hardware_features() const override; virtual const FADTFlags::HardwareFeatures& hardware_features() const override;
virtual const FADTFlags::x86_Specific_Flags& x86_specific_flags() const override; virtual const FADTFlags::x86_Specific_Flags& x86_specific_flags() const override;
protected: protected:
StaticParser(); StaticParser();
explicit StaticParser(PhysicalAddress); explicit StaticParser(PhysicalAddress);
private: private:
void locate_static_data(); void locate_static_data();
void locate_main_system_description_table(); void locate_main_system_description_table();
void initialize_main_system_description_table(); void initialize_main_system_description_table();
@ -74,6 +74,6 @@ namespace ACPI {
bool m_xsdt_supported; bool m_xsdt_supported;
FADTFlags::HardwareFeatures m_hardware_flags; FADTFlags::HardwareFeatures m_hardware_flags;
FADTFlags::x86_Specific_Flags m_x86_specific_flags; FADTFlags::x86_Specific_Flags m_x86_specific_flags;
}; };
} }
} }

File diff suppressed because it is too large Load diff

View file

@ -35,8 +35,8 @@ namespace Kernel {
namespace ACPI { namespace ACPI {
namespace FADTFlags { namespace FADTFlags {
enum class FeatureFlags : u32 { enum class FeatureFlags : u32 {
WBINVD = 1 << 0, WBINVD = 1 << 0,
WBINVD_FLUSH = 1 << 1, WBINVD_FLUSH = 1 << 1,
PROC_C1 = 1 << 2, PROC_C1 = 1 << 2,
@ -59,19 +59,19 @@ namespace ACPI {
FORCE_APIC_PHYSICAL_DESTINATION_MODE = 1 << 19, FORCE_APIC_PHYSICAL_DESTINATION_MODE = 1 << 19,
HW_REDUCED_ACPI = 1 << 20, HW_REDUCED_ACPI = 1 << 20,
LOW_POWER_S0_IDLE_CAPABLE = 1 << 21 LOW_POWER_S0_IDLE_CAPABLE = 1 << 21
}; };
enum class IA_PC_Flags : u8 { enum class IA_PC_Flags : u8 {
Legacy_Devices = 1 << 0, Legacy_Devices = 1 << 0,
PS2_8042 = 1 << 1, PS2_8042 = 1 << 1,
VGA_Not_Present = 1 << 2, VGA_Not_Present = 1 << 2,
MSI_Not_Supported = 1 << 3, MSI_Not_Supported = 1 << 3,
PCIe_ASPM_Controls = 1 << 4, PCIe_ASPM_Controls = 1 << 4,
CMOS_RTC_Not_Present = 1 << 5 CMOS_RTC_Not_Present = 1 << 5
}; };
struct [[gnu::packed]] HardwareFeatures struct [[gnu::packed]] HardwareFeatures
{ {
bool wbinvd : 1; bool wbinvd : 1;
bool wbinvd_flush : 1; bool wbinvd_flush : 1;
bool processor_c1 : 1; bool processor_c1 : 1;
@ -94,19 +94,19 @@ namespace ACPI {
bool force_apic_physical_destination_mode : 1; bool force_apic_physical_destination_mode : 1;
bool hardware_reduced_acpi : 1; bool hardware_reduced_acpi : 1;
bool low_power_s0_idle_capable : 1; bool low_power_s0_idle_capable : 1;
}; };
struct [[gnu::packed]] x86_Specific_Flags struct [[gnu::packed]] x86_Specific_Flags
{ {
bool legacy_devices : 1; bool legacy_devices : 1;
bool keyboard_8042 : 1; bool keyboard_8042 : 1;
bool vga_not_present : 1; bool vga_not_present : 1;
bool msi_not_supported : 1; bool msi_not_supported : 1;
bool cmos_rtc_not_present : 1; bool cmos_rtc_not_present : 1;
}; };
}; };
namespace GenericAddressStructure { namespace GenericAddressStructure {
enum class AddressSpace { enum class AddressSpace {
SystemMemory = 0, SystemMemory = 0,
SystemIO = 1, SystemIO = 1,
PCIConfigurationSpace = 2, PCIConfigurationSpace = 2,
@ -114,44 +114,44 @@ namespace ACPI {
SMBus = 4, SMBus = 4,
PCC = 0xA, PCC = 0xA,
FunctionalFixedHardware = 0x7F FunctionalFixedHardware = 0x7F
}; };
enum class AccessSize { enum class AccessSize {
Undefined = 0, Undefined = 0,
Byte = 1, Byte = 1,
Word = 2, Word = 2,
DWord = 3, DWord = 3,
QWord = 4 QWord = 4
}; };
enum class BitWidth { enum class BitWidth {
Undefined = 0, Undefined = 0,
Byte = 8, Byte = 8,
Word = 16, Word = 16,
DWord = 32, DWord = 32,
QWord = 64 QWord = 64
}; };
} }
namespace Structures { namespace Structures {
struct [[gnu::packed]] RSDPDescriptor struct [[gnu::packed]] RSDPDescriptor
{ {
char sig[8]; char sig[8];
u8 checksum; u8 checksum;
char oem_id[6]; char oem_id[6];
u8 revision; u8 revision;
u32 rsdt_ptr; u32 rsdt_ptr;
}; };
struct [[gnu::packed]] RSDPDescriptor20 struct [[gnu::packed]] RSDPDescriptor20
{ {
RSDPDescriptor base; RSDPDescriptor base;
u32 length; u32 length;
u64 xsdt_ptr; u64 xsdt_ptr;
u8 ext_checksum; u8 ext_checksum;
u8 reserved[3]; u8 reserved[3];
}; };
struct [[gnu::packed]] SDTHeader struct [[gnu::packed]] SDTHeader
{ {
char sig[4]; char sig[4];
u32 length; u32 length;
u8 revision; u8 revision;
@ -161,31 +161,31 @@ namespace ACPI {
u32 oem_revision; u32 oem_revision;
u32 creator_id; u32 creator_id;
u32 creator_revision; u32 creator_revision;
}; };
struct [[gnu::packed]] RSDT struct [[gnu::packed]] RSDT
{ {
SDTHeader h; SDTHeader h;
u32 table_ptrs[]; u32 table_ptrs[];
}; };
struct [[gnu::packed]] XSDT struct [[gnu::packed]] XSDT
{ {
SDTHeader h; SDTHeader h;
u64 table_ptrs[]; u64 table_ptrs[];
}; };
struct [[gnu::packed]] GenericAddressStructure struct [[gnu::packed]] GenericAddressStructure
{ {
u8 address_space; u8 address_space;
u8 bit_width; u8 bit_width;
u8 bit_offset; u8 bit_offset;
u8 access_size; u8 access_size;
u64 address; u64 address;
}; };
struct [[gnu::packed]] HPET struct [[gnu::packed]] HPET
{ {
SDTHeader h; SDTHeader h;
u8 hardware_revision_id; u8 hardware_revision_id;
u8 attributes; u8 attributes;
@ -194,10 +194,10 @@ namespace ACPI {
u8 hpet_number; u8 hpet_number;
u16 mininum_clock_tick; u16 mininum_clock_tick;
u8 page_protection; u8 page_protection;
}; };
struct [[gnu::packed]] FADT struct [[gnu::packed]] FADT
{ {
SDTHeader h; SDTHeader h;
u32 firmware_ctrl; u32 firmware_ctrl;
u32 dsdt_ptr; u32 dsdt_ptr;
@ -254,8 +254,8 @@ namespace ACPI {
GenericAddressStructure sleep_control; GenericAddressStructure sleep_control;
GenericAddressStructure sleep_status; GenericAddressStructure sleep_status;
u64 hypervisor_vendor_identity; u64 hypervisor_vendor_identity;
}; };
enum class MADTEntryType { enum class MADTEntryType {
LocalAPIC = 0x0, LocalAPIC = 0x0,
IOAPIC = 0x1, IOAPIC = 0x1,
InterruptSourceOverride = 0x2, InterruptSourceOverride = 0x2,
@ -272,78 +272,78 @@ namespace ACPI {
GIC_MSI = 0xD, GIC_MSI = 0xD,
GIC_Redistrbutor = 0xE, GIC_Redistrbutor = 0xE,
GIC_Interrupt_Translation = 0xF GIC_Interrupt_Translation = 0xF
}; };
struct [[gnu::packed]] MADTEntryHeader struct [[gnu::packed]] MADTEntryHeader
{ {
u8 type; u8 type;
u8 length; u8 length;
}; };
namespace MADTEntries { namespace MADTEntries {
struct [[gnu::packed]] IOAPIC struct [[gnu::packed]] IOAPIC
{ {
MADTEntryHeader h; MADTEntryHeader h;
u8 ioapic_id; u8 ioapic_id;
u8 reserved; u8 reserved;
u32 ioapic_address; u32 ioapic_address;
u32 gsi_base; u32 gsi_base;
}; };
struct [[gnu::packed]] InterruptSourceOverride struct [[gnu::packed]] InterruptSourceOverride
{ {
MADTEntryHeader h; MADTEntryHeader h;
u8 bus; u8 bus;
u8 source; u8 source;
u32 global_system_interrupt; u32 global_system_interrupt;
u16 flags; u16 flags;
}; };
} }
struct [[gnu::packed]] MADT struct [[gnu::packed]] MADT
{ {
SDTHeader h; SDTHeader h;
u32 lapic_address; u32 lapic_address;
u32 flags; u32 flags;
MADTEntryHeader entries[]; MADTEntryHeader entries[];
}; };
struct [[gnu::packed]] AMLTable struct [[gnu::packed]] AMLTable
{ {
SDTHeader h; SDTHeader h;
char aml_code[]; char aml_code[];
}; };
struct [[gnu::packed]] PCI_MMIO_Descriptor struct [[gnu::packed]] PCI_MMIO_Descriptor
{ {
u64 base_addr; u64 base_addr;
u16 seg_group_number; u16 seg_group_number;
u8 start_pci_bus; u8 start_pci_bus;
u8 end_pci_bus; u8 end_pci_bus;
u32 reserved; u32 reserved;
}; };
struct [[gnu::packed]] MCFG struct [[gnu::packed]] MCFG
{ {
SDTHeader header; SDTHeader header;
u64 reserved; u64 reserved;
PCI_MMIO_Descriptor descriptors[]; PCI_MMIO_Descriptor descriptors[];
}; };
} }
class StaticParser; class StaticParser;
class DynamicParser; class DynamicParser;
class Parser; class Parser;
namespace StaticParsing { namespace StaticParsing {
PhysicalAddress search_rsdp_in_ebda(u16 ebda_segment); PhysicalAddress search_rsdp_in_ebda(u16 ebda_segment);
PhysicalAddress search_rsdp_in_bios_area(); PhysicalAddress search_rsdp_in_bios_area();
PhysicalAddress search_rsdp(); PhysicalAddress search_rsdp();
bool match_table_signature(PhysicalAddress table_header, const char*); bool match_table_signature(PhysicalAddress table_header, const char*);
PhysicalAddress search_table(PhysicalAddress rsdp, const char*); PhysicalAddress search_table(PhysicalAddress rsdp, const char*);
PhysicalAddress search_table_in_xsdt(PhysicalAddress xsdt, const char*); PhysicalAddress search_table_in_xsdt(PhysicalAddress xsdt, const char*);
PhysicalAddress search_table_in_rsdt(PhysicalAddress rsdt, const char*); PhysicalAddress search_table_in_rsdt(PhysicalAddress rsdt, const char*);
inline bool validate_table(Structures::SDTHeader&, size_t length); inline bool validate_table(Structures::SDTHeader&, size_t length);
}; };
} }
} }

View file

@ -34,23 +34,23 @@
namespace Kernel { namespace Kernel {
namespace MultiProcessor { namespace MultiProcessor {
struct [[gnu::packed]] FloatingPointer struct [[gnu::packed]] FloatingPointer
{ {
char sig[4]; char sig[4];
u32 physical_address_ptr; u32 physical_address_ptr;
u8 length; u8 length;
u8 specification_revision; u8 specification_revision;
u8 checksum; u8 checksum;
u8 feature_info[5]; u8 feature_info[5];
}; };
struct [[gnu::packed]] EntryHeader struct [[gnu::packed]] EntryHeader
{ {
u8 entry_type; u8 entry_type;
}; };
struct [[gnu::packed]] ConfigurationTableHeader struct [[gnu::packed]] ConfigurationTableHeader
{ {
char sig[4]; char sig[4];
u16 length; u16 length;
u8 specification_revision; u8 specification_revision;
@ -65,9 +65,9 @@ namespace MultiProcessor {
u8 ext_table_checksum; u8 ext_table_checksum;
u8 reserved; u8 reserved;
EntryHeader entries[]; EntryHeader entries[];
}; };
enum class ConfigurationTableEntryType { enum class ConfigurationTableEntryType {
Processor = 0, Processor = 0,
Bus = 1, Bus = 1,
IOAPIC = 2, IOAPIC = 2,
@ -76,9 +76,9 @@ namespace MultiProcessor {
SystemAddressSpaceMapping = 128, SystemAddressSpaceMapping = 128,
BusHierarchyDescriptor = 129, BusHierarchyDescriptor = 129,
CompatibilityBusAddressSpaceModifier = 130 CompatibilityBusAddressSpaceModifier = 130
}; };
enum class ConfigurationTableEntryLength { enum class ConfigurationTableEntryLength {
Processor = 20, Processor = 20,
Bus = 8, Bus = 8,
IOAPIC = 8, IOAPIC = 8,
@ -87,16 +87,16 @@ namespace MultiProcessor {
SystemAddressSpaceMapping = 20, SystemAddressSpaceMapping = 20,
BusHierarchyDescriptor = 8, BusHierarchyDescriptor = 8,
CompatibilityBusAddressSpaceModifier = 8 CompatibilityBusAddressSpaceModifier = 8
}; };
struct [[gnu::packed]] ExtEntryHeader struct [[gnu::packed]] ExtEntryHeader
{ {
u8 entry_type; u8 entry_type;
u8 entry_length; u8 entry_length;
}; };
struct [[gnu::packed]] ProcessorEntry struct [[gnu::packed]] ProcessorEntry
{ {
EntryHeader h; EntryHeader h;
u8 local_apic_id; u8 local_apic_id;
u8 local_apic_version; u8 local_apic_version;
@ -104,33 +104,33 @@ namespace MultiProcessor {
u32 cpu_signature; u32 cpu_signature;
u32 feature_flags; u32 feature_flags;
u8 reserved[8]; u8 reserved[8];
}; };
struct [[gnu::packed]] BusEntry struct [[gnu::packed]] BusEntry
{ {
EntryHeader h; EntryHeader h;
u8 bus_id; u8 bus_id;
char bus_type[6]; char bus_type[6];
}; };
struct [[gnu::packed]] IOAPICEntry struct [[gnu::packed]] IOAPICEntry
{ {
EntryHeader h; EntryHeader h;
u8 ioapic_id; u8 ioapic_id;
u8 ioapic_version; u8 ioapic_version;
u8 ioapic_flags; u8 ioapic_flags;
u32 ioapic_address; u32 ioapic_address;
}; };
enum class InterruptType { enum class InterruptType {
INT = 0, INT = 0,
NMI = 1, NMI = 1,
SMI = 2, SMI = 2,
ExtINT = 3, ExtINT = 3,
}; };
struct [[gnu::packed]] IOInterruptAssignmentEntry struct [[gnu::packed]] IOInterruptAssignmentEntry
{ {
EntryHeader h; EntryHeader h;
u8 interrupt_type; u8 interrupt_type;
u8 polarity; u8 polarity;
@ -139,10 +139,10 @@ namespace MultiProcessor {
u8 source_bus_irq; u8 source_bus_irq;
u8 destination_ioapic_id; u8 destination_ioapic_id;
u8 destination_ioapic_intin_pin; u8 destination_ioapic_intin_pin;
}; };
struct [[gnu::packed]] LocalInterruptAssignmentEntry struct [[gnu::packed]] LocalInterruptAssignmentEntry
{ {
EntryHeader h; EntryHeader h;
u8 interrupt_type; u8 interrupt_type;
u8 polarity; u8 polarity;
@ -151,39 +151,39 @@ namespace MultiProcessor {
u8 source_bus_irq; u8 source_bus_irq;
u8 destination_lapic_id; u8 destination_lapic_id;
u8 destination_lapic_lintin_pin; u8 destination_lapic_lintin_pin;
}; };
enum class SystemAddressType { enum class SystemAddressType {
IO = 0, IO = 0,
Memory = 1, Memory = 1,
Prefetch = 2, Prefetch = 2,
}; };
struct [[gnu::packed]] SystemAddressSpaceMappingEntry struct [[gnu::packed]] SystemAddressSpaceMappingEntry
{ {
ExtEntryHeader h; ExtEntryHeader h;
u8 bus_id; u8 bus_id;
u8 address_type; u8 address_type;
u64 address_base; u64 address_base;
u64 length; u64 length;
}; };
struct [[gnu::packed]] BusHierarchyDescriptorEntry struct [[gnu::packed]] BusHierarchyDescriptorEntry
{ {
ExtEntryHeader h; ExtEntryHeader h;
u8 bus_id; u8 bus_id;
u8 bus_info; u8 bus_info;
u8 parent_bus; u8 parent_bus;
u8 reserved[3]; u8 reserved[3];
}; };
struct [[gnu::packed]] CompatibilityBusAddressSpaceModifierEntry struct [[gnu::packed]] CompatibilityBusAddressSpaceModifierEntry
{ {
ExtEntryHeader h; ExtEntryHeader h;
u8 bus_id; u8 bus_id;
u8 address_modifier; u8 address_modifier;
u32 predefined_range_list; u32 predefined_range_list;
}; };
} }

View file

@ -329,7 +329,6 @@ Optional<KBuffer> procfs$pid_vm(InodeIdentifier identifier)
pagemap_builder.append('P'); pagemap_builder.append('P');
} }
region_object.add("pagemap", pagemap_builder.to_string()); region_object.add("pagemap", pagemap_builder.to_string());
} }
array.finish(); array.finish();
return builder.build(); return builder.build();

View file

@ -54,10 +54,10 @@ namespace Kernel {
namespace APIC { namespace APIC {
class ICRReg { class ICRReg {
u32 m_reg { 0 }; u32 m_reg { 0 };
public: public:
enum DeliveryMode { enum DeliveryMode {
Fixed = 0x0, Fixed = 0x0,
LowPriority = 0x1, LowPriority = 0x1,
@ -92,51 +92,51 @@ namespace APIC {
u32 low() const { return m_reg; } u32 low() const { return m_reg; }
u32 high() const { return 0; } u32 high() const { return 0; }
}; };
static volatile u8* g_apic_base = nullptr; static volatile u8* g_apic_base = nullptr;
static PhysicalAddress get_base() static PhysicalAddress get_base()
{ {
u32 lo, hi; u32 lo, hi;
MSR msr(APIC_BASE_MSR); MSR msr(APIC_BASE_MSR);
msr.get(lo, hi); msr.get(lo, hi);
return PhysicalAddress(lo & 0xfffff000); return PhysicalAddress(lo & 0xfffff000);
} }
static void set_base(const PhysicalAddress& base) static void set_base(const PhysicalAddress& base)
{ {
u32 hi = 0; u32 hi = 0;
u32 lo = base.get() | 0x800; u32 lo = base.get() | 0x800;
MSR msr(APIC_BASE_MSR); MSR msr(APIC_BASE_MSR);
msr.set(lo, hi); msr.set(lo, hi);
} }
static void write_register(u32 offset, u32 value) static void write_register(u32 offset, u32 value)
{ {
auto lapic_region = MM.allocate_kernel_region(PhysicalAddress(page_base_of((u32)g_apic_base)), PAGE_SIZE, "LAPIC Write Access", Region::Access::Read | Region::Access::Write, false, true); auto lapic_region = MM.allocate_kernel_region(PhysicalAddress(page_base_of((u32)g_apic_base)), PAGE_SIZE, "LAPIC Write Access", Region::Access::Read | Region::Access::Write, false, true);
auto* lapic = (volatile u32*)lapic_region->vaddr().offset(offset_in_page((u32)g_apic_base)).offset(offset).as_ptr(); auto* lapic = (volatile u32*)lapic_region->vaddr().offset(offset_in_page((u32)g_apic_base)).offset(offset).as_ptr();
*lapic = value; *lapic = value;
} }
static u32 read_register(u32 offset) static u32 read_register(u32 offset)
{ {
auto lapic_region = MM.allocate_kernel_region(PhysicalAddress(page_base_of((u32)g_apic_base)), PAGE_SIZE, "LAPIC Read Access", Region::Access::Read, false, true); auto lapic_region = MM.allocate_kernel_region(PhysicalAddress(page_base_of((u32)g_apic_base)), PAGE_SIZE, "LAPIC Read Access", Region::Access::Read, false, true);
auto* lapic = (volatile u32*)lapic_region->vaddr().offset(offset_in_page((u32)g_apic_base)).offset(offset).as_ptr(); auto* lapic = (volatile u32*)lapic_region->vaddr().offset(offset_in_page((u32)g_apic_base)).offset(offset).as_ptr();
return *lapic; return *lapic;
} }
static void write_icr(const ICRReg& icr) static void write_icr(const ICRReg& icr)
{ {
write_register(APIC_REG_ICR_HIGH, icr.high()); write_register(APIC_REG_ICR_HIGH, icr.high());
write_register(APIC_REG_ICR_LOW, icr.low()); write_register(APIC_REG_ICR_LOW, icr.low());
} }
#define APIC_LVT_MASKED (1 << 16) #define APIC_LVT_MASKED (1 << 16)
#define APIC_LVT_TRIGGER_LEVEL (1 << 14) #define APIC_LVT_TRIGGER_LEVEL (1 << 14)
#define APIC_LVT(iv, dm) ((iv & 0xff) | ((dm & 0x7) << 8)) #define APIC_LVT(iv, dm) ((iv & 0xff) | ((dm & 0x7) << 8))
asm( asm(
".globl apic_ap_start \n" ".globl apic_ap_start \n"
".type apic_ap_start, @function \n" ".type apic_ap_start, @function \n"
"apic_ap_start: \n" "apic_ap_start: \n"
@ -148,16 +148,16 @@ namespace APIC {
"apic_ap_start_size: \n" "apic_ap_start_size: \n"
".word end_apic_ap_start - begin_apic_ap_start \n"); ".word end_apic_ap_start - begin_apic_ap_start \n");
extern "C" void apic_ap_start(void); extern "C" void apic_ap_start(void);
extern "C" u16 apic_ap_start_size; extern "C" u16 apic_ap_start_size;
void eoi() void eoi()
{ {
write_register(APIC_REG_EOI, 0x0); write_register(APIC_REG_EOI, 0x0);
} }
bool init() bool init()
{ {
if (!MSR::have()) if (!MSR::have())
return false; return false;
@ -173,16 +173,16 @@ namespace APIC {
g_apic_base = apic_base.as_ptr(); g_apic_base = apic_base.as_ptr();
return true; return true;
} }
void enable_bsp() void enable_bsp()
{ {
// FIXME: Ensure this method can only be executed by the BSP. // FIXME: Ensure this method can only be executed by the BSP.
enable(0); enable(0);
} }
void enable(u32 cpu) void enable(u32 cpu)
{ {
klog() << "Enabling local APIC for cpu #" << cpu; klog() << "Enabling local APIC for cpu #" << cpu;
// dummy read, apparently to avoid a bug in old CPUs. // dummy read, apparently to avoid a bug in old CPUs.
@ -224,7 +224,7 @@ namespace APIC {
; // TODO: 200 microsecond delay ; // TODO: 200 microsecond delay
} }
} }
} }
} }

View file

@ -32,10 +32,10 @@ namespace Kernel {
namespace APIC { namespace APIC {
void enable_bsp(); void enable_bsp();
void eoi(); void eoi();
bool init(); bool init();
void enable(u32 cpu); void enable(u32 cpu);
} }

View file

@ -30,8 +30,8 @@
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Interrupts/IRQController.h>
#include <Kernel/Interrupts/GenericInterruptHandler.h> #include <Kernel/Interrupts/GenericInterruptHandler.h>
#include <Kernel/Interrupts/IRQController.h>
namespace Kernel { namespace Kernel {

View file

@ -26,8 +26,8 @@
#pragma once #pragma once
#include <AK/String.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/String.h>
class KParams { class KParams {
AK_MAKE_ETERNAL AK_MAKE_ETERNAL

View file

@ -29,9 +29,9 @@
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <Kernel/Interrupts/IRQHandler.h> #include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Net/NetworkAdapter.h> #include <Kernel/Net/NetworkAdapter.h>
#include <LibBareMetal/IO.h>
#include <Kernel/PCI/Access.h> #include <Kernel/PCI/Access.h>
#include <Kernel/PCI/Device.h> #include <Kernel/PCI/Device.h>
#include <LibBareMetal/IO.h>
namespace Kernel { namespace Kernel {

View file

@ -26,10 +26,10 @@
#pragma once #pragma once
#include <AK/String.h>
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/IPv4Address.h> #include <AK/IPv4Address.h>
#include <AK/NetworkOrdered.h> #include <AK/NetworkOrdered.h>
#include <AK/String.h>
#include <AK/Types.h> #include <AK/Types.h>
namespace Kernel { namespace Kernel {

View file

@ -30,8 +30,8 @@
#include <AK/Function.h> #include <AK/Function.h>
#include <AK/SinglyLinkedList.h> #include <AK/SinglyLinkedList.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <AK/Weakable.h>
#include <AK/WeakPtr.h> #include <AK/WeakPtr.h>
#include <AK/Weakable.h>
#include <Kernel/KBuffer.h> #include <Kernel/KBuffer.h>
#include <Kernel/Net/ARP.h> #include <Kernel/Net/ARP.h>
#include <Kernel/Net/ICMP.h> #include <Kernel/Net/ICMP.h>

View file

@ -30,8 +30,7 @@
namespace Kernel { namespace Kernel {
struct RoutingDecision struct RoutingDecision {
{
RefPtr<NetworkAdapter> adapter; RefPtr<NetworkAdapter> adapter;
MACAddress next_hop; MACAddress next_hop;

View file

@ -126,7 +126,6 @@ public:
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override final; virtual ssize_t write(FileDescription&, const u8*, ssize_t) override final;
virtual String absolute_path(const FileDescription&) const override = 0; virtual String absolute_path(const FileDescription&) const override = 0;
bool has_receive_timeout() const { return m_receive_timeout.tv_sec || m_receive_timeout.tv_usec; } bool has_receive_timeout() const { return m_receive_timeout.tv_sec || m_receive_timeout.tv_usec; }
const timeval& receive_timeout() const { return m_receive_timeout; } const timeval& receive_timeout() const { return m_receive_timeout; }

View file

@ -108,13 +108,13 @@ void PCI::Access::disable_bus_mastering(Address address)
namespace PCI { namespace PCI {
void enumerate_all(Function<void(Address, ID)> callback) void enumerate_all(Function<void(Address, ID)> callback)
{ {
PCI::Access::the().enumerate_all(callback); PCI::Access::the().enumerate_all(callback);
} }
void raw_access(Address address, u32 field, size_t access_size, u32 value) void raw_access(Address address, u32 field, size_t access_size, u32 value)
{ {
ASSERT(access_size != 0); ASSERT(access_size != 0);
if (access_size == 1) { if (access_size == 1) {
PCI::Access::the().write8_field(address, field, value); PCI::Access::the().write8_field(address, field, value);
@ -129,82 +129,82 @@ namespace PCI {
return; return;
} }
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
ID get_id(Address address) ID get_id(Address address)
{ {
return PCI::Access::the().get_id(address); return PCI::Access::the().get_id(address);
} }
void enable_interrupt_line(Address address) void enable_interrupt_line(Address address)
{ {
PCI::Access::the().enable_interrupt_line(address); PCI::Access::the().enable_interrupt_line(address);
} }
void disable_interrupt_line(Address address) void disable_interrupt_line(Address address)
{ {
PCI::Access::the().disable_interrupt_line(address); PCI::Access::the().disable_interrupt_line(address);
} }
u8 get_interrupt_line(Address address) u8 get_interrupt_line(Address address)
{ {
return PCI::Access::the().get_interrupt_line(address); return PCI::Access::the().get_interrupt_line(address);
} }
u32 get_BAR0(Address address) u32 get_BAR0(Address address)
{ {
return PCI::Access::the().get_BAR0(address); return PCI::Access::the().get_BAR0(address);
} }
u32 get_BAR1(Address address) u32 get_BAR1(Address address)
{ {
return PCI::Access::the().get_BAR1(address); return PCI::Access::the().get_BAR1(address);
} }
u32 get_BAR2(Address address) u32 get_BAR2(Address address)
{ {
return PCI::Access::the().get_BAR2(address); return PCI::Access::the().get_BAR2(address);
} }
u32 get_BAR3(Address address) u32 get_BAR3(Address address)
{ {
return PCI::Access::the().get_BAR3(address); return PCI::Access::the().get_BAR3(address);
} }
u32 get_BAR4(Address address) u32 get_BAR4(Address address)
{ {
return PCI::Access::the().get_BAR4(address); return PCI::Access::the().get_BAR4(address);
} }
u32 get_BAR5(Address address) u32 get_BAR5(Address address)
{ {
return PCI::Access::the().get_BAR5(address); return PCI::Access::the().get_BAR5(address);
} }
u8 get_revision_id(Address address) u8 get_revision_id(Address address)
{ {
return PCI::Access::the().get_revision_id(address); return PCI::Access::the().get_revision_id(address);
} }
u8 get_subclass(Address address) u8 get_subclass(Address address)
{ {
return PCI::Access::the().get_subclass(address); return PCI::Access::the().get_subclass(address);
} }
u8 get_class(Address address) u8 get_class(Address address)
{ {
return PCI::Access::the().get_class(address); return PCI::Access::the().get_class(address);
} }
u16 get_subsystem_id(Address address) u16 get_subsystem_id(Address address)
{ {
return PCI::Access::the().get_subsystem_id(address); return PCI::Access::the().get_subsystem_id(address);
} }
u16 get_subsystem_vendor_id(Address address) u16 get_subsystem_vendor_id(Address address)
{ {
return PCI::Access::the().get_subsystem_vendor_id(address); return PCI::Access::the().get_subsystem_vendor_id(address);
} }
void enable_bus_mastering(Address address) void enable_bus_mastering(Address address)
{ {
PCI::Access::the().enable_bus_mastering(address); PCI::Access::the().enable_bus_mastering(address);
} }
void disable_bus_mastering(Address address) void disable_bus_mastering(Address address)
{ {
PCI::Access::the().disable_bus_mastering(address); PCI::Access::the().disable_bus_mastering(address);
} }
size_t get_BAR_Space_Size(Address address, u8 bar_number) size_t get_BAR_Space_Size(Address address, u8 bar_number)
{ {
return PCI::Access::the().get_BAR_Space_Size(address, bar_number); return PCI::Access::the().get_BAR_Space_Size(address, bar_number);
} }
} }
} }

View file

@ -68,7 +68,7 @@ namespace Kernel {
//#define PCI_DEBUG 1 //#define PCI_DEBUG 1
namespace PCI { namespace PCI {
struct ID { struct ID {
u16 vendor_id { 0 }; u16 vendor_id { 0 };
u16 device_id { 0 }; u16 device_id { 0 };
@ -82,10 +82,10 @@ namespace PCI {
{ {
return vendor_id != other.vendor_id || device_id != other.device_id; return vendor_id != other.vendor_id || device_id != other.device_id;
} }
}; };
struct Address { struct Address {
public: public:
Address() {} Address() {}
Address(u16 seg) Address(u16 seg)
: m_seg(seg) : m_seg(seg)
@ -123,19 +123,19 @@ namespace PCI {
return 0x80000000u | (m_bus << 16u) | (m_slot << 11u) | (m_function << 8u) | (field & 0xfc); return 0x80000000u | (m_bus << 16u) | (m_slot << 11u) | (m_function << 8u) | (field & 0xfc);
} }
protected: protected:
u32 m_seg { 0 }; u32 m_seg { 0 };
u8 m_bus { 0 }; u8 m_bus { 0 };
u8 m_slot { 0 }; u8 m_slot { 0 };
u8 m_function { 0 }; u8 m_function { 0 };
}; };
inline const LogStream& operator<<(const LogStream& stream, const Address value) inline const LogStream& operator<<(const LogStream& stream, const Address value)
{ {
return stream << "PCI [" << String::format("%w", value.seg()) << ":" << String::format("%b", value.bus()) << ":" << String::format("%b", value.slot()) << "." << String::format("%b", value.function()) << "]"; return stream << "PCI [" << String::format("%w", value.seg()) << ":" << String::format("%b", value.bus()) << ":" << String::format("%b", value.slot()) << "." << String::format("%b", value.function()) << "]";
} }
struct ChangeableAddress : public Address { struct ChangeableAddress : public Address {
ChangeableAddress() ChangeableAddress()
: Address(0) : Address(0)
{ {
@ -167,35 +167,35 @@ namespace PCI {
set_function(address.function()); set_function(address.function());
return *this; return *this;
} }
}; };
ID get_id(PCI::Address); ID get_id(PCI::Address);
void enumerate_all(Function<void(Address, ID)> callback); void enumerate_all(Function<void(Address, ID)> callback);
void enable_interrupt_line(Address); void enable_interrupt_line(Address);
void disable_interrupt_line(Address); void disable_interrupt_line(Address);
u8 get_interrupt_line(Address); u8 get_interrupt_line(Address);
void raw_access(Address, u32, size_t, u32); void raw_access(Address, u32, size_t, u32);
u32 get_BAR0(Address); u32 get_BAR0(Address);
u32 get_BAR1(Address); u32 get_BAR1(Address);
u32 get_BAR2(Address); u32 get_BAR2(Address);
u32 get_BAR3(Address); u32 get_BAR3(Address);
u32 get_BAR4(Address); u32 get_BAR4(Address);
u32 get_BAR5(Address); u32 get_BAR5(Address);
u8 get_revision_id(Address); u8 get_revision_id(Address);
u8 get_subclass(Address); u8 get_subclass(Address);
u8 get_class(Address); u8 get_class(Address);
u16 get_subsystem_id(Address); u16 get_subsystem_id(Address);
u16 get_subsystem_vendor_id(Address); u16 get_subsystem_vendor_id(Address);
size_t get_BAR_Space_Size(Address, u8); size_t get_BAR_Space_Size(Address, u8);
void enable_bus_mastering(Address); void enable_bus_mastering(Address);
void disable_bus_mastering(Address); void disable_bus_mastering(Address);
class Initializer; class Initializer;
class Access; class Access;
class MMIOAccess; class MMIOAccess;
class IOAccess; class IOAccess;
class MMIOSegment; class MMIOSegment;
class Device; class Device;
} }

View file

@ -25,8 +25,8 @@
*/ */
#include <AK/JsonArraySerializer.h> #include <AK/JsonArraySerializer.h>
#include <AK/JsonObjectSerializer.h>
#include <AK/JsonObject.h> #include <AK/JsonObject.h>
#include <AK/JsonObjectSerializer.h>
#include <Kernel/KBufferBuilder.h> #include <Kernel/KBufferBuilder.h>
#include <Kernel/PerformanceEventBuffer.h> #include <Kernel/PerformanceEventBuffer.h>

View file

@ -65,26 +65,26 @@ asm(
namespace Syscall { namespace Syscall {
static int handle(RegisterState&, u32 function, u32 arg1, u32 arg2, u32 arg3); static int handle(RegisterState&, u32 function, u32 arg1, u32 arg2, u32 arg3);
void initialize() void initialize()
{ {
register_user_callable_interrupt_handler(0x82, syscall_asm_entry); register_user_callable_interrupt_handler(0x82, syscall_asm_entry);
klog() << "Syscall: int 0x82 handler installed"; klog() << "Syscall: int 0x82 handler installed";
} }
#pragma GCC diagnostic ignored "-Wcast-function-type" #pragma GCC diagnostic ignored "-Wcast-function-type"
typedef int (Process::*Handler)(u32, u32, u32); typedef int (Process::*Handler)(u32, u32, u32);
#define __ENUMERATE_REMOVED_SYSCALL(x) nullptr, #define __ENUMERATE_REMOVED_SYSCALL(x) nullptr,
#define __ENUMERATE_SYSCALL(x) reinterpret_cast<Handler>(&Process::sys$##x), #define __ENUMERATE_SYSCALL(x) reinterpret_cast<Handler>(&Process::sys$##x),
static Handler s_syscall_table[] = { static Handler s_syscall_table[] = {
ENUMERATE_SYSCALLS ENUMERATE_SYSCALLS
}; };
#undef __ENUMERATE_SYSCALL #undef __ENUMERATE_SYSCALL
#undef __ENUMERATE_REMOVED_SYSCALL #undef __ENUMERATE_REMOVED_SYSCALL
int handle(RegisterState& regs, u32 function, u32 arg1, u32 arg2, u32 arg3) int handle(RegisterState& regs, u32 function, u32 arg1, u32 arg2, u32 arg3)
{ {
ASSERT_INTERRUPTS_ENABLED(); ASSERT_INTERRUPTS_ENABLED();
auto& process = *Process::current; auto& process = *Process::current;
Thread::current->did_syscall(); Thread::current->did_syscall();
@ -118,7 +118,7 @@ namespace Syscall {
return -ENOSYS; return -ENOSYS;
} }
return (process.*(s_syscall_table[function]))(arg1, arg2, arg3); return (process.*(s_syscall_table[function]))(arg1, arg2, arg3);
} }
} }

View file

@ -184,7 +184,7 @@ namespace Kernel {
namespace Syscall { namespace Syscall {
enum Function { enum Function {
#undef __ENUMERATE_SYSCALL #undef __ENUMERATE_SYSCALL
#undef __ENUMERATE_REMOVED_SYSCALL #undef __ENUMERATE_REMOVED_SYSCALL
#define __ENUMERATE_REMOVED_SYSCALL(x) SC_##x, #define __ENUMERATE_REMOVED_SYSCALL(x) SC_##x,
@ -193,10 +193,10 @@ namespace Syscall {
#undef __ENUMERATE_SYSCALL #undef __ENUMERATE_SYSCALL
#undef __ENUMERATE_REMOVED_SYSCALL #undef __ENUMERATE_REMOVED_SYSCALL
__Count __Count
}; };
inline constexpr const char* to_string(Function function) inline constexpr const char* to_string(Function function)
{ {
switch (function) { switch (function) {
#undef __ENUMERATE_SYSCALL #undef __ENUMERATE_SYSCALL
#undef __ENUMERATE_REMOVED_SYSCALL #undef __ENUMERATE_REMOVED_SYSCALL
@ -213,32 +213,32 @@ namespace Syscall {
break; break;
} }
return "Unknown"; return "Unknown";
} }
#ifdef __serenity__ #ifdef __serenity__
struct StringArgument { struct StringArgument {
const char* characters { nullptr }; const char* characters { nullptr };
size_t length { 0 }; size_t length { 0 };
}; };
template<typename DataType, typename SizeType> template<typename DataType, typename SizeType>
struct MutableBufferArgument { struct MutableBufferArgument {
DataType* data { nullptr }; DataType* data { nullptr };
SizeType size { 0 }; SizeType size { 0 };
}; };
template<typename DataType, typename SizeType> template<typename DataType, typename SizeType>
struct ImmutableBufferArgument { struct ImmutableBufferArgument {
const DataType* data { nullptr }; const DataType* data { nullptr };
SizeType size { 0 }; SizeType size { 0 };
}; };
struct StringListArgument { struct StringListArgument {
StringArgument* strings { nullptr }; StringArgument* strings { nullptr };
size_t length { 0 }; size_t length { 0 };
}; };
struct SC_mmap_params { struct SC_mmap_params {
uint32_t addr; uint32_t addr;
uint32_t size; uint32_t size;
uint32_t alignment; uint32_t alignment;
@ -247,89 +247,89 @@ namespace Syscall {
int32_t fd; int32_t fd;
int32_t offset; // FIXME: 64-bit off_t? int32_t offset; // FIXME: 64-bit off_t?
StringArgument name; StringArgument name;
}; };
struct SC_open_params { struct SC_open_params {
int dirfd; int dirfd;
StringArgument path; StringArgument path;
int options; int options;
u16 mode; u16 mode;
}; };
struct SC_select_params { struct SC_select_params {
int nfds; int nfds;
fd_set* readfds; fd_set* readfds;
fd_set* writefds; fd_set* writefds;
fd_set* exceptfds; fd_set* exceptfds;
struct timeval* timeout; struct timeval* timeout;
}; };
struct SC_clock_nanosleep_params { struct SC_clock_nanosleep_params {
int clock_id; int clock_id;
int flags; int flags;
const struct timespec* requested_sleep; const struct timespec* requested_sleep;
struct timespec* remaining_sleep; struct timespec* remaining_sleep;
}; };
struct SC_sendto_params { struct SC_sendto_params {
int sockfd; int sockfd;
ImmutableBufferArgument<void, size_t> data; ImmutableBufferArgument<void, size_t> data;
int flags; int flags;
const sockaddr* addr; const sockaddr* addr;
socklen_t addr_length; socklen_t addr_length;
}; };
struct SC_recvfrom_params { struct SC_recvfrom_params {
int sockfd; int sockfd;
MutableBufferArgument<void, size_t> buffer; MutableBufferArgument<void, size_t> buffer;
int flags; int flags;
sockaddr* addr; sockaddr* addr;
socklen_t* addr_length; socklen_t* addr_length;
}; };
struct SC_getsockopt_params { struct SC_getsockopt_params {
int sockfd; int sockfd;
int level; int level;
int option; int option;
void* value; void* value;
socklen_t* value_size; socklen_t* value_size;
}; };
struct SC_setsockopt_params { struct SC_setsockopt_params {
int sockfd; int sockfd;
int level; int level;
int option; int option;
const void* value; const void* value;
socklen_t value_size; socklen_t value_size;
}; };
struct SC_getsockname_params { struct SC_getsockname_params {
int sockfd; int sockfd;
sockaddr* addr; sockaddr* addr;
socklen_t* addrlen; socklen_t* addrlen;
}; };
struct SC_getpeername_params { struct SC_getpeername_params {
int sockfd; int sockfd;
sockaddr* addr; sockaddr* addr;
socklen_t* addrlen; socklen_t* addrlen;
}; };
struct SC_futex_params { struct SC_futex_params {
i32* userspace_address; i32* userspace_address;
int futex_op; int futex_op;
i32 val; i32 val;
const timespec* timeout; const timespec* timeout;
}; };
struct SC_setkeymap_params { struct SC_setkeymap_params {
const char* map; const char* map;
const char* shift_map; const char* shift_map;
const char* alt_map; const char* alt_map;
const char* altgr_map; const char* altgr_map;
}; };
struct SC_create_thread_params { struct SC_create_thread_params {
unsigned int m_detach_state = 0; // JOINABLE or DETACHED unsigned int m_detach_state = 0; // JOINABLE or DETACHED
int m_schedule_priority = 30; // THREAD_PRIORITY_NORMAL int m_schedule_priority = 30; // THREAD_PRIORITY_NORMAL
// FIXME: Implment guard pages in create_thread (unreadable pages at "overflow" end of stack) // FIXME: Implment guard pages in create_thread (unreadable pages at "overflow" end of stack)
@ -341,132 +341,132 @@ namespace Syscall {
unsigned int m_reported_guard_page_size = 0; // The lie we tell callers unsigned int m_reported_guard_page_size = 0; // The lie we tell callers
unsigned int m_stack_size = 4 * MB; // Default PTHREAD_STACK_MIN unsigned int m_stack_size = 4 * MB; // Default PTHREAD_STACK_MIN
void* m_stack_location = nullptr; // nullptr means any, o.w. process virtual address void* m_stack_location = nullptr; // nullptr means any, o.w. process virtual address
}; };
struct SC_realpath_params { struct SC_realpath_params {
StringArgument path; StringArgument path;
MutableBufferArgument<char, size_t> buffer; MutableBufferArgument<char, size_t> buffer;
}; };
struct SC_set_mmap_name_params { struct SC_set_mmap_name_params {
void* addr; void* addr;
size_t size; size_t size;
StringArgument name; StringArgument name;
}; };
struct SC_execve_params { struct SC_execve_params {
StringArgument path; StringArgument path;
StringListArgument arguments; StringListArgument arguments;
StringListArgument environment; StringListArgument environment;
}; };
struct SC_readlink_params { struct SC_readlink_params {
StringArgument path; StringArgument path;
MutableBufferArgument<char, size_t> buffer; MutableBufferArgument<char, size_t> buffer;
}; };
struct SC_link_params { struct SC_link_params {
StringArgument old_path; StringArgument old_path;
StringArgument new_path; StringArgument new_path;
}; };
struct SC_chown_params { struct SC_chown_params {
StringArgument path; StringArgument path;
u32 uid; u32 uid;
u32 gid; u32 gid;
}; };
struct SC_mknod_params { struct SC_mknod_params {
StringArgument path; StringArgument path;
u16 mode; u16 mode;
u32 dev; u32 dev;
}; };
struct SC_symlink_params { struct SC_symlink_params {
StringArgument target; StringArgument target;
StringArgument linkpath; StringArgument linkpath;
}; };
struct SC_rename_params { struct SC_rename_params {
StringArgument old_path; StringArgument old_path;
StringArgument new_path; StringArgument new_path;
}; };
struct SC_mount_params { struct SC_mount_params {
StringArgument source; StringArgument source;
StringArgument target; StringArgument target;
StringArgument fs_type; StringArgument fs_type;
int flags; int flags;
}; };
struct SC_pledge_params { struct SC_pledge_params {
StringArgument promises; StringArgument promises;
StringArgument execpromises; StringArgument execpromises;
}; };
struct SC_unveil_params { struct SC_unveil_params {
StringArgument path; StringArgument path;
StringArgument permissions; StringArgument permissions;
}; };
struct SC_waitid_params { struct SC_waitid_params {
int idtype; int idtype;
int id; int id;
struct siginfo* infop; struct siginfo* infop;
int options; int options;
}; };
struct SC_stat_params { struct SC_stat_params {
StringArgument path; StringArgument path;
struct stat* statbuf; struct stat* statbuf;
bool follow_symlinks; bool follow_symlinks;
}; };
void initialize(); void initialize();
int sync(); int sync();
inline u32 invoke(Function function) inline u32 invoke(Function function)
{ {
u32 result; u32 result;
asm volatile("int $0x82" asm volatile("int $0x82"
: "=a"(result) : "=a"(result)
: "a"(function) : "a"(function)
: "memory"); : "memory");
return result; return result;
} }
template<typename T1> template<typename T1>
inline u32 invoke(Function function, T1 arg1) inline u32 invoke(Function function, T1 arg1)
{ {
u32 result; u32 result;
asm volatile("int $0x82" asm volatile("int $0x82"
: "=a"(result) : "=a"(result)
: "a"(function), "d"((u32)arg1) : "a"(function), "d"((u32)arg1)
: "memory"); : "memory");
return result; return result;
} }
template<typename T1, typename T2> template<typename T1, typename T2>
inline u32 invoke(Function function, T1 arg1, T2 arg2) inline u32 invoke(Function function, T1 arg1, T2 arg2)
{ {
u32 result; u32 result;
asm volatile("int $0x82" asm volatile("int $0x82"
: "=a"(result) : "=a"(result)
: "a"(function), "d"((u32)arg1), "c"((u32)arg2) : "a"(function), "d"((u32)arg1), "c"((u32)arg2)
: "memory"); : "memory");
return result; return result;
} }
template<typename T1, typename T2, typename T3> template<typename T1, typename T2, typename T3>
inline u32 invoke(Function function, T1 arg1, T2 arg2, T3 arg3) inline u32 invoke(Function function, T1 arg1, T2 arg2, T3 arg3)
{ {
u32 result; u32 result;
asm volatile("int $0x82" asm volatile("int $0x82"
: "=a"(result) : "=a"(result)
: "a"(function), "d"((u32)arg1), "c"((u32)arg2), "b"((u32)arg3) : "a"(function), "d"((u32)arg1), "c"((u32)arg2), "b"((u32)arg3)
: "memory"); : "memory");
return result; return result;
} }
#endif #endif
} }

View file

@ -24,9 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <Kernel/Heap/kmalloc.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <Kernel/VM/PhysicalPage.h> #include <Kernel/VM/PhysicalPage.h>
#include <Kernel/Heap/kmalloc.h>
namespace Kernel { namespace Kernel {