Process: Use BitField to store process flags
This commit is contained in:
parent
7eb413155f
commit
2f5904611d
|
@ -18,6 +18,9 @@ SharedPtr<Process> Process::Create(std::string name, u64 program_id) {
|
|||
process->name = std::move(name);
|
||||
process->program_id = program_id;
|
||||
|
||||
process->flags.raw = 0;
|
||||
process->flags.memory_region = MemoryRegion::APPLICATION;
|
||||
|
||||
return process;
|
||||
}
|
||||
|
||||
|
@ -46,16 +49,7 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
|
|||
handle_table_size = descriptor & 0x3FF;
|
||||
} else if ((type & 0xFF8) == 0xFF0) { // 0x007F
|
||||
// Misc. flags
|
||||
bool allow_debug = descriptor & BIT(0);
|
||||
bool force_debug = descriptor & BIT(1);
|
||||
bool allow_nonalphanum = descriptor & BIT(2);
|
||||
shared_page_writable = descriptor & BIT(3);
|
||||
privileged_priority = descriptor & BIT(4);
|
||||
bool allow_main_args = descriptor & BIT(5);
|
||||
bool shared_device_mem = descriptor & BIT(6);
|
||||
bool runnable_on_sleep = descriptor & BIT(7);
|
||||
loaded_high = descriptor & BIT(12);
|
||||
memory_region = MemoryRegion((descriptor >> 8) & 0xF);
|
||||
flags.raw = descriptor & 0xFFFF;
|
||||
} else if ((type & 0xFFE) == 0xFF8) { // 0x001F
|
||||
// Mapped memory range
|
||||
if (i+1 >= len || ((kernel_caps[i+1] >> 20) & 0xFFE) != 0xFF8) {
|
||||
|
|
|
@ -8,6 +8,9 @@
|
|||
|
||||
#include <boost/container/static_vector.hpp>
|
||||
|
||||
#include "common/bit_field.h"
|
||||
#include "common/common_types.h"
|
||||
|
||||
#include "core/hle/kernel/kernel.h"
|
||||
#include "core/hle/result.h"
|
||||
|
||||
|
@ -21,12 +24,27 @@ struct StaticAddressMapping {
|
|||
bool unk_flag;
|
||||
};
|
||||
|
||||
enum class MemoryRegion {
|
||||
enum class MemoryRegion : u16 {
|
||||
APPLICATION = 1,
|
||||
SYSTEM = 2,
|
||||
BASE = 3,
|
||||
};
|
||||
|
||||
union ProcessFlags {
|
||||
u16 raw;
|
||||
|
||||
BitField< 0, 1, u16> allow_debug; ///< Allows other processes to attach to and debug this process.
|
||||
BitField< 1, 1, u16> force_debug; ///< Allows this process to attach to processes even if they don't have allow_debug set.
|
||||
BitField< 2, 1, u16> allow_nonalphanum;
|
||||
BitField< 3, 1, u16> shared_page_writable; ///< Shared page is mapped with write permissions.
|
||||
BitField< 4, 1, u16> privileged_priority; ///< Can use priority levels higher than 24.
|
||||
BitField< 5, 1, u16> allow_main_args;
|
||||
BitField< 6, 1, u16> shared_device_mem;
|
||||
BitField< 7, 1, u16> runnable_on_sleep;
|
||||
BitField< 8, 4, MemoryRegion> memory_region; ///< Default region for memory allocations for this process
|
||||
BitField<12, 1, u16> loaded_high; ///< Application loaded high (not at 0x00100000).
|
||||
};
|
||||
|
||||
class Process final : public Object {
|
||||
public:
|
||||
static SharedPtr<Process> Create(std::string name, u64 program_id);
|
||||
|
@ -43,11 +61,7 @@ public:
|
|||
std::bitset<0x80> svc_access_mask;
|
||||
unsigned int handle_table_size = 0x200;
|
||||
boost::container::static_vector<StaticAddressMapping, 8> static_address_mappings; // TODO: Determine a good upper limit
|
||||
|
||||
bool loaded_high = false; // Application loaded high (not at 0x00100000)
|
||||
bool shared_page_writable = false;
|
||||
bool privileged_priority = false; // Can use priority levels higher than 24
|
||||
MemoryRegion memory_region = MemoryRegion::APPLICATION;
|
||||
ProcessFlags flags;
|
||||
|
||||
void ParseKernelCaps(const u32* kernel_caps, size_t len);
|
||||
void Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size);
|
||||
|
|
Reference in New Issue