summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-09 23:16:46 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-09 23:16:46 +0200
commitb700b5569605d9d73bf5ee5f3ede020ac242f7f1 (patch)
treeef59beed796898ff36e3da1e2c3395e1f841053d
parentMerge pull request #734 from yuriks/memmap (diff)
downloadyuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.tar
yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.tar.gz
yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.tar.bz2
yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.tar.lz
yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.tar.xz
yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.tar.zst
yuzu-b700b5569605d9d73bf5ee5f3ede020ac242f7f1.zip
-rw-r--r--src/common/common_funcs.h2
-rw-r--r--src/core/hle/kernel/process.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index fde0f3a59..91b74c6bc 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -15,8 +15,6 @@
#define b32(x) (b16(x) | (b16(x) >>16) )
#define ROUND_UP_POW2(x) (b32(x - 1) + 1)
-#define BIT(x) (1U << (x))
-
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
/// Textually concatenates two tokens. The double-expansion is required by the C preprocessor.
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index a444e22e5..26a9c2360 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -62,8 +62,8 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
AddressMapping mapping;
mapping.address = descriptor << 12;
mapping.size = (end_desc << 12) - mapping.address;
- mapping.writable = descriptor & BIT(20);
- mapping.unk_flag = end_desc & BIT(20);
+ mapping.writable = descriptor & (1 << 20);
+ mapping.unk_flag = end_desc & (1 << 20);
address_mappings.push_back(mapping);
} else if ((type & 0xFFF) == 0xFFE) { // 0x000F