Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/44145 )
Change subject: arch-x86: Fix some style in the ACPI objects, and remove
CTRP.
......................................................................
arch-x86: Fix some style in the ACPI objects, and remove CTRP.
Change-Id: I4a40061b84b366785d1a509fa6d0c5597c98be90
---
M src/arch/x86/bios/acpi.cc
M src/arch/x86/bios/acpi.hh
2 files changed, 42 insertions(+), 49 deletions(-)
diff --git a/src/arch/x86/bios/acpi.cc b/src/arch/x86/bios/acpi.cc
index 882463d..2946392 100644
--- a/src/arch/x86/bios/acpi.cc
+++ b/src/arch/x86/bios/acpi.cc
@@ -102,7 +102,7 @@
}
Addr
-RSDP::write(PortProxy& physProxy, Allocator& alloc) const
+RSDP::write(PortProxy& phys_proxy, Allocator& alloc) const
{
std::vector<uint8_t> mem(sizeof(_data));
Addr addr = alloc.alloc(sizeof(_data), 16);
@@ -112,11 +112,11 @@
Mem* desc = (Mem*)mem.data();
if (rsdt) {
- desc->rsdtAddress = rsdt->write(physProxy, alloc);
+ desc->rsdtAddress = rsdt->write(phys_proxy, alloc);
DPRINTF(ACPI, "Allocated RSDT @ %llx\n", desc->rsdtAddress);
}
if (xsdt) {
- desc->xsdtAddress = xsdt->write(physProxy, alloc);
+ desc->xsdtAddress = xsdt->write(phys_proxy, alloc);
DPRINTF(ACPI, "Allocated XSDT @ %llx\n", desc->xsdtAddress);
}
@@ -126,16 +126,16 @@
desc->extendedChecksum = apic_checksum(mem.data(), _data.length);
// write the whole thing
- physProxy.writeBlob(addr, mem.data(), mem.size());
+ phys_proxy.writeBlob(addr, mem.data(), mem.size());
return addr;
}
-SysDescTable::Mem::Mem(const char* signature, uint8_t revision,
+SysDescTable::Mem::Mem(const char* _signature, uint8_t _revision,
const Params& p) :
- revision(revision)
+ revision(_revision)
{
- std::strncpy(this->signature, signature, sizeof(this->signature));
+ std::strncpy(signature, _signature, sizeof(signature));
std::strncpy(oemID, p.oem_id.c_str(), sizeof(oemID));
std::strncpy(oemTableID, p.oem_table_id.c_str(), sizeof(oemTableID));
oemRevision = p.oem_revision;
@@ -155,19 +155,19 @@
Addr
SysDescTable::prepare(std::vector<uint8_t>& mem,
- PortProxy& physProxy, Allocator& alloc) const
+ PortProxy& phys_proxy, Allocator& alloc) const
{
prepare_self(mem);
return alloc.alloc(mem.size());
}
Addr
-SysDescTable::write(PortProxy& physProxy, Allocator& alloc) const
+SysDescTable::write(PortProxy& phys_proxy, Allocator& alloc) const
{
std::vector<uint8_t> mem;
// prepare data
- Addr addr = prepare(mem, physProxy, alloc);
+ Addr addr = prepare(mem, phys_proxy, alloc);
// checksum calculation
Mem* header = (Mem*)mem.data();
@@ -175,7 +175,7 @@
header->checksum = apic_checksum(mem.data(), mem.size());
// write to physical memory
- physProxy.writeBlob(addr, mem.data(), mem.size());
+ phys_proxy.writeBlob(addr, mem.data(), mem.size());
return addr;
}
@@ -197,7 +197,7 @@
template<class T>
Addr
RXSDT<T>::prepare(std::vector<uint8_t>& mem,
- PortProxy& physProxy, Allocator& alloc) const
+ PortProxy& phys_proxy, Allocator& alloc) const
{
prepare_self(mem);
auto base_size = mem.size();
@@ -207,7 +207,7 @@
DPRINTF(ACPI, "RXSDT: writing %d entries @ %llx (ptr size: %d)\n",
entries.size(), addr, sizeof(Ptr));
for (unsigned i = 0; i < entries.size(); ++i) {
- Addr entry_addr = entries[i]->write(physProxy, alloc);
+ Addr entry_addr = entries[i]->write(phys_proxy, alloc);
fatal_if((entry_addr & mask(sizeof(Ptr) * 8)) != entry_addr,
"RXSDT: Entry address doesn't fit in pointer type.");
DPRINTF(ACPI, "RXSDT: wrote entry @ %llx\n", entry_addr);
diff --git a/src/arch/x86/bios/acpi.hh b/src/arch/x86/bios/acpi.hh
index d4223d9..bb1d905 100644
--- a/src/arch/x86/bios/acpi.hh
+++ b/src/arch/x86/bios/acpi.hh
@@ -109,7 +109,7 @@
uint32_t rsdtAddress = 0;
};
static_assert(std::is_trivially_copyable<MemR0>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
struct M5_ATTR_PACKED Mem : public MemR0
{
@@ -120,7 +120,7 @@
uint8_t _reserved[3] = {};
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy,");
Mem _data;
@@ -133,7 +133,7 @@
public:
RSDP(const Params &p);
- Addr write(PortProxy& physProxy, Allocator& alloc) const;
+ Addr write(PortProxy& phys_proxy, Allocator& alloc) const;
};
class SysDescTable : public SimObject
@@ -157,7 +157,7 @@
Mem(char const* signature, uint8_t revision, const Params& p);
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
virtual void prepare_self(std::vector<uint8_t>& mem) const;
virtual Addr prepare(std::vector<uint8_t>& mem,
@@ -168,7 +168,7 @@
public:
using SimObject::SimObject;
- Addr write(PortProxy& physProxy, Allocator& alloc) const;
+ Addr write(PortProxy& phys_proxy, Allocator& alloc) const;
};
template<class T>
@@ -180,14 +180,14 @@
std::vector<SysDescTable *> entries;
Addr prepare(std::vector<uint8_t>& mem,
- PortProxy& physProxy, Allocator& alloc) const override;
+ PortProxy& phys_proxy, Allocator& alloc) const override;
std::tuple<Mem const*, std::size_t> data() const override;
private:
SysDescTable::Mem _data;
static_assert(std::is_trivially_copyable<decltype(_data)>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
protected:
RXSDT(const Params& p, const char* _signature, uint8_t _revision);
@@ -218,25 +218,18 @@
protected:
typedef X86ACPIMadtRecordParams Params;
- struct M5_ATTR_PACKED Mem {
+ struct M5_ATTR_PACKED Mem
+ {
uint8_t type;
uint8_t length = 0;
- Mem(uint8_t type, uint8_t length) :
- type(type),
- length(length)
+ Mem(uint8_t _type, uint8_t _length) :
+ type(_type),
+ length(_length)
{}
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
-
- template<class Derived>
- struct M5_ATTR_PACKED MemTemplate : Mem
- {
- MemTemplate() :
- Mem(Derived::TYPE, sizeof(Derived))
- {}
- };
+ "Type not suitable for memcpy.");
virtual Mem const& data() const = 0;
@@ -251,16 +244,16 @@
{
protected:
typedef X86ACPIMadtLAPICParams Params;
- struct M5_ATTR_PACKED Mem : public Record::MemTemplate<Mem>
+ struct M5_ATTR_PACKED Mem : public Record::Mem
{
- static constexpr uint8_t TYPE = 0;
+ Mem() : Record::Mem(0, sizeof(Mem)) {}
uint8_t acpiProcessorId = 0;
uint8_t apicId = 0;
uint32_t flags = 0;
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
Record::Mem const& data() const override { return d; }
@@ -275,9 +268,9 @@
{
protected:
typedef X86ACPIMadtIOAPICParams Params;
- struct M5_ATTR_PACKED Mem : public Record::MemTemplate<Mem>
+ struct M5_ATTR_PACKED Mem : public Record::Mem
{
- static constexpr uint8_t TYPE = 1;
+ Mem() : Record::Mem(1, sizeof(Mem)) {}
uint8_t ioApicId = 0;
uint8_t _reserved = 0;
@@ -285,7 +278,7 @@
uint32_t intBase = 0;
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
Record::Mem const& data() const override { return d; }
@@ -300,9 +293,9 @@
{
protected:
typedef X86ACPIMadtIntSourceOverrideParams Params;
- struct M5_ATTR_PACKED Mem : public Record::MemTemplate<Mem>
+ struct M5_ATTR_PACKED Mem : public Record::Mem
{
- static constexpr uint8_t TYPE = 2;
+ Mem() : Record::Mem(2, sizeof(Mem)) {}
uint8_t busSource = 0;
uint8_t irqSource = 0;
@@ -310,7 +303,7 @@
uint16_t flags = 0;
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
Record::Mem const& data() const override { return d; }
@@ -325,16 +318,16 @@
{
protected:
typedef X86ACPIMadtNMIParams Params;
- struct M5_ATTR_PACKED Mem : public Record::MemTemplate<Mem>
+ struct M5_ATTR_PACKED Mem : public Record::Mem
{
- static constexpr uint8_t TYPE = 3;
+ Mem() : Record::Mem(3, sizeof(Mem)) {}
uint8_t acpiProcessorId = 0;
uint16_t flags = 0;
uint8_t lintNo = 0;
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
Record::Mem const& data() const override { return d; }
@@ -349,15 +342,15 @@
{
protected:
typedef X86ACPIMadtLAPICOverrideParams Params;
- struct M5_ATTR_PACKED Mem : public Record::MemTemplate<Mem>
+ struct M5_ATTR_PACKED Mem : public Record::Mem
{
- static constexpr uint8_t TYPE = 5;
+ Mem() : Record::Mem(5, sizeof(Mem)) {}
uint16_t _reserved = 0;
uint64_t localAPICAddress = 0;
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
Record::Mem const& data() const override { return d; }
@@ -381,7 +374,7 @@
using SysDescTable::Mem::Mem;
};
static_assert(std::is_trivially_copyable<Mem>::value,
- "type not suitable for memcpy");
+ "Type not suitable for memcpy.");
std::vector<Record *> records;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44145
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I4a40061b84b366785d1a509fa6d0c5597c98be90
Gerrit-Change-Number: 44145
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
