N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1562 from lioncash/constexpr

Browse source 
core: Mark some helper functions as constexpr
This commit is contained in:
bunnei 2016-03-21 10:44:37 -04:00
commit 8986aa181d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/hle/kernel/session.h
View file

@ -16,23 +16,23 @@
namespace IPC { namespace IPC {
inline u32 MakeHeader(u16 command_id, unsigned int regular_params, unsigned int translate_params) { constexpr u32 MakeHeader(u16 command_id, unsigned int regular_params, unsigned int translate_params) {
return ((u32)command_id << 16) | (((u32)regular_params & 0x3F) << 6) | (((u32)translate_params & 0x3F) << 0); return ((u32)command_id << 16) | (((u32)regular_params & 0x3F) << 6) | (((u32)translate_params & 0x3F) << 0);
} }
inline u32 MoveHandleDesc(unsigned int num_handles = 1) { constexpr u32 MoveHandleDesc(unsigned int num_handles = 1) {
return 0x0 | ((num_handles - 1) << 26); return 0x0 | ((num_handles - 1) << 26);
} }
inline u32 CopyHandleDesc(unsigned int num_handles = 1) { constexpr u32 CopyHandleDesc(unsigned int num_handles = 1) {
return 0x10 | ((num_handles - 1) << 26); return 0x10 | ((num_handles - 1) << 26);
} }
inline u32 CallingPidDesc() { constexpr u32 CallingPidDesc() {
return 0x20; return 0x20;
} }
inline u32 StaticBufferDesc(u32 size, unsigned int buffer_id) { constexpr u32 StaticBufferDesc(u32 size, unsigned int buffer_id) {
return 0x2 | (size << 14) | ((buffer_id & 0xF) << 10); return 0x2 | (size << 14) | ((buffer_id & 0xF) << 10);
} }
@ -42,7 +42,7 @@ enum MappedBufferPermissions {
RW = R | W, RW = R | W,
}; };
inline u32 MappedBufferDesc(u32 size, MappedBufferPermissions perms) { constexpr u32 MappedBufferDesc(u32 size, MappedBufferPermissions perms) {
return 0x8 | (size << 4) | (u32)perms; return 0x8 | (size << 4) | (u32)perms;
} }

2
src/core/loader/loader.h
View file

@ -74,7 +74,7 @@ enum class ResultStatus {
ErrorEncrypted, ErrorEncrypted,
}; };
static inline u32 MakeMagic(char a, char b, char c, char d) { constexpr u32 MakeMagic(char a, char b, char c, char d) {
return a | b << 8 | c << 16 | d << 24; return a | b << 8 | c << 16 | d << 24;
} }