mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 10:23:23 +02:00
Merge pull request #4456 from FearlessTobi/port-1767
Port yuzu-emu/yuzu#1734 and yuzu-emu/yuzu#1767: Minor changes to "kernel"
This commit is contained in:
commit
210e558bea
@ -65,7 +65,7 @@ ResultCode SoftwareKeyboard::StartImpl(Service::APT::AppletStartupParameter cons
|
|||||||
boost::static_pointer_cast<Kernel::SharedMemory, Kernel::Object>(parameter.object);
|
boost::static_pointer_cast<Kernel::SharedMemory, Kernel::Object>(parameter.object);
|
||||||
|
|
||||||
// TODO(Subv): Verify if this is the correct behavior
|
// TODO(Subv): Verify if this is the correct behavior
|
||||||
memset(text_memory->GetPointer(), 0, text_memory->size);
|
memset(text_memory->GetPointer(), 0, text_memory->GetSize());
|
||||||
|
|
||||||
DrawScreenKeyboard();
|
DrawScreenKeyboard();
|
||||||
|
|
||||||
|
@ -11,12 +11,23 @@
|
|||||||
#include "core/hle/kernel/thread.h"
|
#include "core/hle/kernel/thread.h"
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
|
namespace {
|
||||||
|
constexpr u16 GetSlot(Handle handle) {
|
||||||
|
return handle >> 15;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr u16 GetGeneration(Handle handle) {
|
||||||
|
return handle & 0x7FFF;
|
||||||
|
}
|
||||||
|
} // Anonymous namespace
|
||||||
|
|
||||||
HandleTable::HandleTable(KernelSystem& kernel) : kernel(kernel) {
|
HandleTable::HandleTable(KernelSystem& kernel) : kernel(kernel) {
|
||||||
next_generation = 1;
|
next_generation = 1;
|
||||||
Clear();
|
Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HandleTable::~HandleTable() = default;
|
||||||
|
|
||||||
ResultVal<Handle> HandleTable::Create(SharedPtr<Object> obj) {
|
ResultVal<Handle> HandleTable::Create(SharedPtr<Object> obj) {
|
||||||
DEBUG_ASSERT(obj != nullptr);
|
DEBUG_ASSERT(obj != nullptr);
|
||||||
|
|
||||||
|
@ -43,6 +43,7 @@ enum KernelHandle : Handle {
|
|||||||
class HandleTable final : NonCopyable {
|
class HandleTable final : NonCopyable {
|
||||||
public:
|
public:
|
||||||
explicit HandleTable(KernelSystem& kernel);
|
explicit HandleTable(KernelSystem& kernel);
|
||||||
|
~HandleTable();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allocates a handle for the given object.
|
* Allocates a handle for the given object.
|
||||||
@ -95,13 +96,6 @@ private:
|
|||||||
*/
|
*/
|
||||||
static const std::size_t MAX_COUNT = 4096;
|
static const std::size_t MAX_COUNT = 4096;
|
||||||
|
|
||||||
static u16 GetSlot(Handle handle) {
|
|
||||||
return handle >> 15;
|
|
||||||
}
|
|
||||||
static u16 GetGeneration(Handle handle) {
|
|
||||||
return handle & 0x7FFF;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Stores the Object referenced by the handle or null if the slot is empty.
|
/// Stores the Object referenced by the handle or null if the slot is empty.
|
||||||
std::array<SharedPtr<Object>, MAX_COUNT> objects;
|
std::array<SharedPtr<Object>, MAX_COUNT> objects;
|
||||||
|
|
||||||
|
@ -95,11 +95,11 @@ SharedPtr<SharedMemory> KernelSystem::CreateSharedMemoryForApplet(
|
|||||||
return shared_memory;
|
return shared_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermission permissions,
|
ResultCode SharedMemory::Map(Process& target_process, VAddr address, MemoryPermission permissions,
|
||||||
MemoryPermission other_permissions) {
|
MemoryPermission other_permissions) {
|
||||||
|
|
||||||
MemoryPermission own_other_permissions =
|
MemoryPermission own_other_permissions =
|
||||||
target_process == owner_process ? this->permissions : this->other_permissions;
|
&target_process == owner_process ? this->permissions : this->other_permissions;
|
||||||
|
|
||||||
// Automatically allocated memory blocks can only be mapped with other_permissions = DontCare
|
// Automatically allocated memory blocks can only be mapped with other_permissions = DontCare
|
||||||
if (base_address == 0 && other_permissions != MemoryPermission::DontCare) {
|
if (base_address == 0 && other_permissions != MemoryPermission::DontCare) {
|
||||||
@ -155,7 +155,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi
|
|||||||
target_address = linear_heap_phys_offset + Memory::LINEAR_HEAP_VADDR;
|
target_address = linear_heap_phys_offset + Memory::LINEAR_HEAP_VADDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto vma = target_process->vm_manager.FindVMA(target_address);
|
auto vma = target_process.vm_manager.FindVMA(target_address);
|
||||||
if (vma->second.type != VMAType::Free ||
|
if (vma->second.type != VMAType::Free ||
|
||||||
vma->second.base + vma->second.size < target_address + size) {
|
vma->second.base + vma->second.size < target_address + size) {
|
||||||
LOG_ERROR(Kernel,
|
LOG_ERROR(Kernel,
|
||||||
@ -167,20 +167,20 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi
|
|||||||
// Map the memory block into the target process
|
// Map the memory block into the target process
|
||||||
VAddr interval_target = target_address;
|
VAddr interval_target = target_address;
|
||||||
for (const auto& interval : backing_blocks) {
|
for (const auto& interval : backing_blocks) {
|
||||||
auto vma = target_process->vm_manager.MapBackingMemory(
|
auto vma = target_process.vm_manager.MapBackingMemory(interval_target, interval.first,
|
||||||
interval_target, interval.first, interval.second, MemoryState::Shared);
|
interval.second, MemoryState::Shared);
|
||||||
ASSERT(vma.Succeeded());
|
ASSERT(vma.Succeeded());
|
||||||
target_process->vm_manager.Reprotect(vma.Unwrap(), ConvertPermissions(permissions));
|
target_process.vm_manager.Reprotect(vma.Unwrap(), ConvertPermissions(permissions));
|
||||||
interval_target += interval.second;
|
interval_target += interval.second;
|
||||||
}
|
}
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode SharedMemory::Unmap(Process* target_process, VAddr address) {
|
ResultCode SharedMemory::Unmap(Process& target_process, VAddr address) {
|
||||||
// TODO(Subv): Verify what happens if the application tries to unmap an address that is not
|
// TODO(Subv): Verify what happens if the application tries to unmap an address that is not
|
||||||
// mapped to a SharedMemory.
|
// mapped to a SharedMemory.
|
||||||
return target_process->vm_manager.UnmapRange(address, size);
|
return target_process.vm_manager.UnmapRange(address, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
VMAPermission SharedMemory::ConvertPermissions(MemoryPermission permission) {
|
VMAPermission SharedMemory::ConvertPermissions(MemoryPermission permission) {
|
||||||
@ -196,4 +196,11 @@ u8* SharedMemory::GetPointer(u32 offset) {
|
|||||||
return backing_blocks[0].first + offset;
|
return backing_blocks[0].first + offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const u8* SharedMemory::GetPointer(u32 offset) const {
|
||||||
|
if (backing_blocks.size() != 1) {
|
||||||
|
LOG_WARNING(Kernel, "Unsafe GetPointer on discontinuous SharedMemory");
|
||||||
|
}
|
||||||
|
return backing_blocks[0].first + offset;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Kernel
|
} // namespace Kernel
|
||||||
|
@ -20,12 +20,25 @@ public:
|
|||||||
std::string GetName() const override {
|
std::string GetName() const override {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
void SetName(std::string name) {
|
||||||
|
this->name = name;
|
||||||
|
}
|
||||||
|
|
||||||
static const HandleType HANDLE_TYPE = HandleType::SharedMemory;
|
static const HandleType HANDLE_TYPE = HandleType::SharedMemory;
|
||||||
HandleType GetHandleType() const override {
|
HandleType GetHandleType() const override {
|
||||||
return HANDLE_TYPE;
|
return HANDLE_TYPE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Gets the size of the underlying memory block in bytes.
|
||||||
|
u64 GetSize() const {
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Gets the linear heap physical offset
|
||||||
|
u64 GetLinearHeapPhysicalOffset() const {
|
||||||
|
return linear_heap_phys_offset;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Converts the specified MemoryPermission into the equivalent VMAPermission.
|
* Converts the specified MemoryPermission into the equivalent VMAPermission.
|
||||||
* @param permission The MemoryPermission to convert.
|
* @param permission The MemoryPermission to convert.
|
||||||
@ -39,48 +52,55 @@ public:
|
|||||||
* @param permissions Memory block map permissions (specified by SVC field)
|
* @param permissions Memory block map permissions (specified by SVC field)
|
||||||
* @param other_permissions Memory block map other permissions (specified by SVC field)
|
* @param other_permissions Memory block map other permissions (specified by SVC field)
|
||||||
*/
|
*/
|
||||||
ResultCode Map(Process* target_process, VAddr address, MemoryPermission permissions,
|
ResultCode Map(Process& target_process, VAddr address, MemoryPermission permissions,
|
||||||
MemoryPermission other_permissions);
|
MemoryPermission other_permissions);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unmaps a shared memory block from the specified address in system memory
|
* Unmaps a shared memory block from the specified address in system memory
|
||||||
* @param target_process Process from which to umap the memory block.
|
* @param target_process Process from which to unmap the memory block.
|
||||||
* @param address Address in system memory where the shared memory block is mapped
|
* @param address Address in system memory where the shared memory block is mapped
|
||||||
* @return Result code of the unmap operation
|
* @return Result code of the unmap operation
|
||||||
*/
|
*/
|
||||||
ResultCode Unmap(Process* target_process, VAddr address);
|
ResultCode Unmap(Process& target_process, VAddr address);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets a pointer to the shared memory block
|
* Gets a pointer to the shared memory block
|
||||||
* @param offset Offset from the start of the shared memory block to get pointer
|
* @param offset Offset from the start of the shared memory block to get pointer
|
||||||
* @return Pointer to the shared memory block from the specified offset
|
* @return A pointer to the shared memory block from the specified offset
|
||||||
*/
|
*/
|
||||||
u8* GetPointer(u32 offset = 0);
|
u8* GetPointer(u32 offset = 0);
|
||||||
|
|
||||||
/// Process that created this shared memory block.
|
/**
|
||||||
Process* owner_process;
|
* Gets a constant pointer to the shared memory block
|
||||||
/// Address of shared memory block in the owner process if specified.
|
* @param offset Offset from the start of the shared memory block to get pointer
|
||||||
VAddr base_address;
|
* @return A constant pointer to the shared memory block from the specified offset
|
||||||
/// Offset in FCRAM of the shared memory block in the linear heap if no address was specified
|
*/
|
||||||
/// during creation.
|
const u8* GetPointer(u32 offset = 0) const;
|
||||||
PAddr linear_heap_phys_offset;
|
|
||||||
/// Backing memory for this shared memory block.
|
|
||||||
std::vector<std::pair<u8*, u32>> backing_blocks;
|
|
||||||
/// Size of the memory block. Page-aligned.
|
|
||||||
u32 size;
|
|
||||||
/// Permission restrictions applied to the process which created the block.
|
|
||||||
MemoryPermission permissions;
|
|
||||||
/// Permission restrictions applied to other processes mapping the block.
|
|
||||||
MemoryPermission other_permissions;
|
|
||||||
/// Name of shared memory object.
|
|
||||||
std::string name;
|
|
||||||
|
|
||||||
MemoryRegionInfo::IntervalSet holding_memory;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
explicit SharedMemory(KernelSystem& kernel);
|
explicit SharedMemory(KernelSystem& kernel);
|
||||||
~SharedMemory() override;
|
~SharedMemory() override;
|
||||||
|
|
||||||
|
/// Offset in FCRAM of the shared memory block in the linear heap if no address was specified
|
||||||
|
/// during creation.
|
||||||
|
PAddr linear_heap_phys_offset = 0;
|
||||||
|
/// Backing memory for this shared memory block.
|
||||||
|
std::vector<std::pair<u8*, u32>> backing_blocks;
|
||||||
|
/// Size of the memory block. Page-aligned.
|
||||||
|
u32 size = 0;
|
||||||
|
/// Permission restrictions applied to the process which created the block.
|
||||||
|
MemoryPermission permissions{};
|
||||||
|
/// Permission restrictions applied to other processes mapping the block.
|
||||||
|
MemoryPermission other_permissions{};
|
||||||
|
/// Process that created this shared memory block.
|
||||||
|
SharedPtr<Process> owner_process;
|
||||||
|
/// Address of shared memory block in the owner process if specified.
|
||||||
|
VAddr base_address = 0;
|
||||||
|
/// Name of shared memory object.
|
||||||
|
std::string name;
|
||||||
|
|
||||||
|
MemoryRegionInfo::IntervalSet holding_memory;
|
||||||
|
|
||||||
friend class KernelSystem;
|
friend class KernelSystem;
|
||||||
KernelSystem& kernel;
|
KernelSystem& kernel;
|
||||||
};
|
};
|
||||||
|
@ -322,7 +322,7 @@ ResultCode SVC::MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 oth
|
|||||||
case MemoryPermission::WriteExecute:
|
case MemoryPermission::WriteExecute:
|
||||||
case MemoryPermission::ReadWriteExecute:
|
case MemoryPermission::ReadWriteExecute:
|
||||||
case MemoryPermission::DontCare:
|
case MemoryPermission::DontCare:
|
||||||
return shared_memory->Map(kernel.GetCurrentProcess().get(), addr, permissions_type,
|
return shared_memory->Map(*kernel.GetCurrentProcess(), addr, permissions_type,
|
||||||
static_cast<MemoryPermission>(other_permissions));
|
static_cast<MemoryPermission>(other_permissions));
|
||||||
default:
|
default:
|
||||||
LOG_ERROR(Kernel_SVC, "unknown permissions=0x{:08X}", permissions);
|
LOG_ERROR(Kernel_SVC, "unknown permissions=0x{:08X}", permissions);
|
||||||
@ -341,7 +341,7 @@ ResultCode SVC::UnmapMemoryBlock(Handle handle, u32 addr) {
|
|||||||
if (shared_memory == nullptr)
|
if (shared_memory == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
return shared_memory->Unmap(current_process.get(), addr);
|
return shared_memory->Unmap(*current_process, addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Connect to an OS service given the port name, returns the handle to the port to out
|
/// Connect to an OS service given the port name, returns the handle to the port to out
|
||||||
|
@ -217,7 +217,7 @@ void Module::Interface::GetSharedFont(Kernel::HLERequestContext& ctx) {
|
|||||||
// shared font, different linear heap region would have required shared font to relocate
|
// shared font, different linear heap region would have required shared font to relocate
|
||||||
// according to two different addresses at the same time, which is impossible.
|
// according to two different addresses at the same time, which is impossible.
|
||||||
VAddr target_address =
|
VAddr target_address =
|
||||||
apt->shared_font_mem->linear_heap_phys_offset + Memory::LINEAR_HEAP_VADDR;
|
apt->shared_font_mem->GetLinearHeapPhysicalOffset() + Memory::LINEAR_HEAP_VADDR;
|
||||||
if (!apt->shared_font_relocated) {
|
if (!apt->shared_font_relocated) {
|
||||||
BCFNT::RelocateSharedFont(apt->shared_font_mem, target_address);
|
BCFNT::RelocateSharedFont(apt->shared_font_mem, target_address);
|
||||||
apt->shared_font_relocated = true;
|
apt->shared_font_relocated = true;
|
||||||
|
@ -50,7 +50,7 @@ void HTTP_C::Initialize(Kernel::HLERequestContext& ctx) {
|
|||||||
u32 pid = rp.PopPID();
|
u32 pid = rp.PopPID();
|
||||||
shared_memory = rp.PopObject<Kernel::SharedMemory>();
|
shared_memory = rp.PopObject<Kernel::SharedMemory>();
|
||||||
if (shared_memory) {
|
if (shared_memory) {
|
||||||
shared_memory->name = "HTTP_C:shared_memory";
|
shared_memory->SetName("HTTP_C:shared_memory");
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_WARNING(Service_HTTP, "(STUBBED) called, shared memory size: {} pid: {}", shmem_size, pid);
|
LOG_WARNING(Service_HTTP, "(STUBBED) called, shared memory size: {} pid: {}", shmem_size, pid);
|
||||||
|
@ -240,7 +240,7 @@ void IR_USER::InitializeIrNopShared(Kernel::HLERequestContext& ctx) {
|
|||||||
|
|
||||||
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
|
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
|
||||||
|
|
||||||
shared_memory->name = "IR_USER: shared memory";
|
shared_memory->SetName("IR_USER: shared memory");
|
||||||
|
|
||||||
receive_buffer = std::make_unique<BufferManager>(shared_memory, 0x10, 0x20,
|
receive_buffer = std::make_unique<BufferManager>(shared_memory, 0x10, 0x20,
|
||||||
recv_buff_packet_count, recv_buff_size);
|
recv_buff_packet_count, recv_buff_size);
|
||||||
|
@ -40,7 +40,7 @@ struct MIC_U::Impl {
|
|||||||
shared_memory = rp.PopObject<Kernel::SharedMemory>();
|
shared_memory = rp.PopObject<Kernel::SharedMemory>();
|
||||||
|
|
||||||
if (shared_memory) {
|
if (shared_memory) {
|
||||||
shared_memory->name = "MIC_U:shared_memory";
|
shared_memory->SetName("MIC_U:shared_memory");
|
||||||
}
|
}
|
||||||
|
|
||||||
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
|
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
|
||||||
|
@ -724,7 +724,7 @@ void NWM_UDS::InitializeWithVersion(Kernel::HLERequestContext& ctx) {
|
|||||||
|
|
||||||
initialized = true;
|
initialized = true;
|
||||||
|
|
||||||
ASSERT_MSG(recv_buffer_memory->size == sharedmem_size, "Invalid shared memory size.");
|
ASSERT_MSG(recv_buffer_memory->GetSize() == sharedmem_size, "Invalid shared memory size.");
|
||||||
|
|
||||||
if (auto room_member = Network::GetRoomMember().lock()) {
|
if (auto room_member = Network::GetRoomMember().lock()) {
|
||||||
wifi_packet_received = room_member->BindOnWifiPacketReceived(OnWifiPacketReceived);
|
wifi_packet_received = room_member->BindOnWifiPacketReceived(OnWifiPacketReceived);
|
||||||
|
Loading…
Reference in New Issue
Block a user