summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/process.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-05-18 08:08:49 -0400
committerGravatar bunnei2015-05-18 08:08:49 -0400
commitf0365f28c2ca0d33dcb5f1f4be1d328cbb9dfdd6 (patch)
treef124508f5115244765f6320223c40088f60e1c26 /src/core/hle/kernel/process.cpp
parentMerge pull request #785 from archshift/break (diff)
parentpica: Add the ULL specifier in IsDefaultAttribute (diff)
downloadyuzu-f0365f28c2ca0d33dcb5f1f4be1d328cbb9dfdd6.tar.gz
yuzu-f0365f28c2ca0d33dcb5f1f4be1d328cbb9dfdd6.tar.xz
yuzu-f0365f28c2ca0d33dcb5f1f4be1d328cbb9dfdd6.zip
Merge pull request #772 from lioncash/warn
core/video_core: Fix a few warnings when compiling on MSVC.
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
-rw-r--r--src/core/hle/kernel/process.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index b5c87e883..b0e75ba59 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -28,7 +28,7 @@ SharedPtr<Process> Process::Create(std::string name, u64 program_id) {
28} 28}
29 29
30void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { 30void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
31 for (int i = 0; i < len; ++i) { 31 for (size_t i = 0; i < len; ++i) {
32 u32 descriptor = kernel_caps[i]; 32 u32 descriptor = kernel_caps[i];
33 u32 type = descriptor >> 20; 33 u32 type = descriptor >> 20;
34 34
@@ -65,8 +65,8 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
65 AddressMapping mapping; 65 AddressMapping mapping;
66 mapping.address = descriptor << 12; 66 mapping.address = descriptor << 12;
67 mapping.size = (end_desc << 12) - mapping.address; 67 mapping.size = (end_desc << 12) - mapping.address;
68 mapping.writable = descriptor & (1 << 20); 68 mapping.writable = (descriptor & (1 << 20)) != 0;
69 mapping.unk_flag = end_desc & (1 << 20); 69 mapping.unk_flag = (end_desc & (1 << 20)) != 0;
70 70
71 address_mappings.push_back(mapping); 71 address_mappings.push_back(mapping);
72 } else if ((type & 0xFFF) == 0xFFE) { // 0x000F 72 } else if ((type & 0xFFF) == 0xFFE) { // 0x000F