Merge pull request #6294 from german77/kernelCleanup
kernel: Delete unused files
This commit is contained in:
commit
bb7d4ec3d3
|
@ -1,55 +0,0 @@
|
||||||
// Copyright 2019 yuzu emulator team
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#include "core/hle/kernel/k_page_table.h"
|
|
||||||
#include "core/hle/kernel/k_resource_limit.h"
|
|
||||||
#include "core/hle/kernel/kernel.h"
|
|
||||||
#include "core/hle/kernel/process.h"
|
|
||||||
#include "core/hle/kernel/transfer_memory.h"
|
|
||||||
#include "core/hle/result.h"
|
|
||||||
#include "core/memory.h"
|
|
||||||
|
|
||||||
namespace Kernel {
|
|
||||||
|
|
||||||
TransferMemory::TransferMemory(KernelCore& kernel, Core::Memory::Memory& memory)
|
|
||||||
: Object{kernel}, memory{memory} {}
|
|
||||||
|
|
||||||
TransferMemory::~TransferMemory() {
|
|
||||||
// Release memory region when transfer memory is destroyed
|
|
||||||
Reset();
|
|
||||||
owner_process->GetResourceLimit()->Release(LimitableResource::TransferMemory, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
std::shared_ptr<TransferMemory> TransferMemory::Create(KernelCore& kernel,
|
|
||||||
Core::Memory::Memory& memory,
|
|
||||||
VAddr base_address, std::size_t size,
|
|
||||||
KMemoryPermission permissions) {
|
|
||||||
std::shared_ptr<TransferMemory> transfer_memory{
|
|
||||||
std::make_shared<TransferMemory>(kernel, memory)};
|
|
||||||
|
|
||||||
transfer_memory->base_address = base_address;
|
|
||||||
transfer_memory->size = size;
|
|
||||||
transfer_memory->owner_permissions = permissions;
|
|
||||||
transfer_memory->owner_process = kernel.CurrentProcess();
|
|
||||||
|
|
||||||
return transfer_memory;
|
|
||||||
}
|
|
||||||
|
|
||||||
u8* TransferMemory::GetPointer() {
|
|
||||||
return memory.GetPointer(base_address);
|
|
||||||
}
|
|
||||||
|
|
||||||
const u8* TransferMemory::GetPointer() const {
|
|
||||||
return memory.GetPointer(base_address);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode TransferMemory::Reserve() {
|
|
||||||
return owner_process->PageTable().ReserveTransferMemory(base_address, size, owner_permissions);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode TransferMemory::Reset() {
|
|
||||||
return owner_process->PageTable().ResetTransferMemory(base_address, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Kernel
|
|
|
@ -1,96 +0,0 @@
|
||||||
// Copyright 2019 yuzu emulator team
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
#include "core/hle/kernel/k_memory_block.h"
|
|
||||||
#include "core/hle/kernel/object.h"
|
|
||||||
#include "core/hle/kernel/physical_memory.h"
|
|
||||||
|
|
||||||
union ResultCode;
|
|
||||||
|
|
||||||
namespace Core::Memory {
|
|
||||||
class Memory;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace Kernel {
|
|
||||||
|
|
||||||
class KernelCore;
|
|
||||||
class Process;
|
|
||||||
|
|
||||||
/// Defines the interface for transfer memory objects.
|
|
||||||
///
|
|
||||||
/// Transfer memory is typically used for the purpose of
|
|
||||||
/// transferring memory between separate process instances,
|
|
||||||
/// thus the name.
|
|
||||||
///
|
|
||||||
class TransferMemory final : public Object {
|
|
||||||
public:
|
|
||||||
explicit TransferMemory(KernelCore& kernel, Core::Memory::Memory& memory);
|
|
||||||
~TransferMemory() override;
|
|
||||||
|
|
||||||
static constexpr HandleType HANDLE_TYPE = HandleType::TransferMemory;
|
|
||||||
|
|
||||||
static std::shared_ptr<TransferMemory> Create(KernelCore& kernel, Core::Memory::Memory& memory,
|
|
||||||
VAddr base_address, std::size_t size,
|
|
||||||
KMemoryPermission permissions);
|
|
||||||
|
|
||||||
TransferMemory(const TransferMemory&) = delete;
|
|
||||||
TransferMemory& operator=(const TransferMemory&) = delete;
|
|
||||||
|
|
||||||
TransferMemory(TransferMemory&&) = delete;
|
|
||||||
TransferMemory& operator=(TransferMemory&&) = delete;
|
|
||||||
|
|
||||||
std::string GetTypeName() const override {
|
|
||||||
return "TransferMemory";
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string GetName() const override {
|
|
||||||
return GetTypeName();
|
|
||||||
}
|
|
||||||
|
|
||||||
HandleType GetHandleType() const override {
|
|
||||||
return HANDLE_TYPE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Gets a pointer to the backing block of this instance.
|
|
||||||
u8* GetPointer();
|
|
||||||
|
|
||||||
/// Gets a pointer to the backing block of this instance.
|
|
||||||
const u8* GetPointer() const;
|
|
||||||
|
|
||||||
/// Gets the size of the memory backing this instance in bytes.
|
|
||||||
constexpr std::size_t GetSize() const {
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Reserves the region to be used for the transfer memory, called after the transfer memory is
|
|
||||||
/// created.
|
|
||||||
ResultCode Reserve();
|
|
||||||
|
|
||||||
/// Resets the region previously used for the transfer memory, called after the transfer memory
|
|
||||||
/// is closed.
|
|
||||||
ResultCode Reset();
|
|
||||||
|
|
||||||
void Finalize() override {}
|
|
||||||
|
|
||||||
private:
|
|
||||||
/// The base address for the memory managed by this instance.
|
|
||||||
VAddr base_address{};
|
|
||||||
|
|
||||||
/// Size of the memory, in bytes, that this instance manages.
|
|
||||||
std::size_t size{};
|
|
||||||
|
|
||||||
/// The memory permissions that are applied to this instance.
|
|
||||||
KMemoryPermission owner_permissions{};
|
|
||||||
|
|
||||||
/// The process that this transfer memory instance was created under.
|
|
||||||
Process* owner_process{};
|
|
||||||
|
|
||||||
Core::Memory::Memory& memory;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace Kernel
|
|
Reference in New Issue