citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #736 from yuriks/remove-BIT 

Common: Remove the BIT macro
This commit is contained in:
Lioncash 2015-05-09 20:16:42 -04:00
parent e35e72d0a5 b700b55696
commit 088f6ae2c6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/common_funcs.h
View File

@ -15,8 +15,6 @@
#define b32(x) (b16(x) | (b16(x) >>16) ) #define b32(x) (b16(x) | (b16(x) >>16) )
#define ROUND_UP_POW2(x) (b32(x - 1) + 1) #define ROUND_UP_POW2(x) (b32(x - 1) + 1)
#define BIT(x) (1U << (x))
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
/// Textually concatenates two tokens. The double-expansion is required by the C preprocessor. /// Textually concatenates two tokens. The double-expansion is required by the C preprocessor.

4
src/core/hle/kernel/process.cpp
View File

@ -62,8 +62,8 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
AddressMapping mapping; AddressMapping mapping;
mapping.address = descriptor << 12; mapping.address = descriptor << 12;
mapping.size = (end_desc << 12) - mapping.address; mapping.size = (end_desc << 12) - mapping.address;
mapping.writable = descriptor & BIT(20); mapping.writable = descriptor & (1 << 20);
mapping.unk_flag = end_desc & BIT(20); mapping.unk_flag = end_desc & (1 << 20);
address_mappings.push_back(mapping); address_mappings.push_back(mapping);
} else if ((type & 0xFFF) == 0xFFE) { // 0x000F } else if ((type & 0xFFF) == 0xFFE) { // 0x000F