mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 04:17:35 +00:00
Kernel: Rename vmo => vmobject everywhere
This commit is contained in:
parent
8ea4217c01
commit
b6ee8a2c8d
15 changed files with 47 additions and 47 deletions
|
@ -8,9 +8,9 @@ NonnullRefPtr<InodeVMObject> InodeVMObject::create_with_inode(Inode& inode)
|
|||
InterruptDisabler disabler;
|
||||
if (inode.vmobject())
|
||||
return *inode.vmobject();
|
||||
auto vmo = adopt(*new InodeVMObject(inode));
|
||||
vmo->inode().set_vmo(*vmo);
|
||||
return vmo;
|
||||
auto vmobject = adopt(*new InodeVMObject(inode));
|
||||
vmobject->inode().set_vmobject(*vmobject);
|
||||
return vmobject;
|
||||
}
|
||||
|
||||
NonnullRefPtr<VMObject> InodeVMObject::clone()
|
||||
|
|
|
@ -587,16 +587,16 @@ bool MemoryManager::validate_user_write(const Process& process, VirtualAddress v
|
|||
return region && region->is_writable();
|
||||
}
|
||||
|
||||
void MemoryManager::register_vmo(VMObject& vmo)
|
||||
void MemoryManager::register_vmobject(VMObject& vmobject)
|
||||
{
|
||||
InterruptDisabler disabler;
|
||||
m_vmobjects.append(&vmo);
|
||||
m_vmobjects.append(&vmobject);
|
||||
}
|
||||
|
||||
void MemoryManager::unregister_vmo(VMObject& vmo)
|
||||
void MemoryManager::unregister_vmobject(VMObject& vmobject)
|
||||
{
|
||||
InterruptDisabler disabler;
|
||||
m_vmobjects.remove(&vmo);
|
||||
m_vmobjects.remove(&vmobject);
|
||||
}
|
||||
|
||||
void MemoryManager::register_region(Region& region)
|
||||
|
|
|
@ -87,8 +87,8 @@ private:
|
|||
MemoryManager(u32 physical_address_for_kernel_page_tables);
|
||||
~MemoryManager();
|
||||
|
||||
void register_vmo(VMObject&);
|
||||
void unregister_vmo(VMObject&);
|
||||
void register_vmobject(VMObject&);
|
||||
void unregister_vmobject(VMObject&);
|
||||
void register_region(Region&);
|
||||
void unregister_region(Region&);
|
||||
|
||||
|
|
|
@ -27,10 +27,10 @@ Region::Region(const Range& range, NonnullRefPtr<Inode> inode, const String& nam
|
|||
MM.register_region(*this);
|
||||
}
|
||||
|
||||
Region::Region(const Range& range, NonnullRefPtr<VMObject> vmo, size_t offset_in_vmo, const String& name, u8 access)
|
||||
Region::Region(const Range& range, NonnullRefPtr<VMObject> vmobject, size_t offset_in_vmobject, const String& name, u8 access)
|
||||
: m_range(range)
|
||||
, m_offset_in_vmo(offset_in_vmo)
|
||||
, m_vmobject(move(vmo))
|
||||
, m_offset_in_vmobject(offset_in_vmobject)
|
||||
, m_vmobject(move(vmobject))
|
||||
, m_name(name)
|
||||
, m_access(access)
|
||||
{
|
||||
|
@ -65,7 +65,7 @@ NonnullOwnPtr<Region> Region::clone()
|
|||
vaddr().get());
|
||||
#endif
|
||||
// Create a new region backed by the same VMObject.
|
||||
return Region::create_user_accessible(m_range, m_vmobject, m_offset_in_vmo, m_name, m_access);
|
||||
return Region::create_user_accessible(m_range, m_vmobject, m_offset_in_vmobject, m_name, m_access);
|
||||
}
|
||||
|
||||
#ifdef MM_DEBUG
|
||||
|
@ -78,7 +78,7 @@ NonnullOwnPtr<Region> Region::clone()
|
|||
// Set up a COW region. The parent (this) region becomes COW as well!
|
||||
ensure_cow_map().fill(true);
|
||||
remap();
|
||||
auto clone_region = Region::create_user_accessible(m_range, m_vmobject->clone(), m_offset_in_vmo, m_name, m_access);
|
||||
auto clone_region = Region::create_user_accessible(m_range, m_vmobject->clone(), m_offset_in_vmobject, m_name, m_access);
|
||||
clone_region->ensure_cow_map();
|
||||
if (m_stack) {
|
||||
ASSERT(is_readable());
|
||||
|
|
|
@ -80,7 +80,7 @@ public:
|
|||
|
||||
size_t first_page_index() const
|
||||
{
|
||||
return m_offset_in_vmo / PAGE_SIZE;
|
||||
return m_offset_in_vmobject / PAGE_SIZE;
|
||||
}
|
||||
|
||||
size_t last_page_index() const
|
||||
|
@ -95,7 +95,7 @@ public:
|
|||
|
||||
size_t offset_in_vmobject() const
|
||||
{
|
||||
return m_offset_in_vmo;
|
||||
return m_offset_in_vmobject;
|
||||
}
|
||||
|
||||
bool commit();
|
||||
|
@ -141,7 +141,7 @@ public:
|
|||
|
||||
// NOTE: These are public so we can make<> them.
|
||||
Region(const Range&, const String&, u8 access);
|
||||
Region(const Range&, NonnullRefPtr<VMObject>, size_t offset_in_vmo, const String&, u8 access);
|
||||
Region(const Range&, NonnullRefPtr<VMObject>, size_t offset_in_vmobject, const String&, u8 access);
|
||||
Region(const Range&, NonnullRefPtr<Inode>, const String&, u8 access);
|
||||
|
||||
private:
|
||||
|
@ -153,7 +153,7 @@ private:
|
|||
|
||||
RefPtr<PageDirectory> m_page_directory;
|
||||
Range m_range;
|
||||
size_t m_offset_in_vmo { 0 };
|
||||
size_t m_offset_in_vmobject { 0 };
|
||||
NonnullRefPtr<VMObject> m_vmobject;
|
||||
String m_name;
|
||||
u8 m_access { 0 };
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
VMObject::VMObject(const VMObject& other)
|
||||
: m_physical_pages(other.m_physical_pages)
|
||||
{
|
||||
MM.register_vmo(*this);
|
||||
MM.register_vmobject(*this);
|
||||
}
|
||||
|
||||
VMObject::VMObject(size_t size)
|
||||
: m_physical_pages(ceil_div(size, PAGE_SIZE))
|
||||
{
|
||||
MM.register_vmo(*this);
|
||||
MM.register_vmobject(*this);
|
||||
}
|
||||
|
||||
VMObject::~VMObject()
|
||||
{
|
||||
MM.unregister_vmo(*this);
|
||||
MM.unregister_vmobject(*this);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue