yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #532 from lioncash/warn 

core: Fix some warnings on OSX
This commit is contained in:
bunnei 2015-02-03 12:40:16 -05:00
parent 7f730ed158 676daef3c7
commit d64c836369
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View File

@ -3553,7 +3553,6 @@ static tdstate decode_thumb_instr(arm_processor *cpu, uint32_t inst, addr_t addr
case 26: case 26:
case 27: case 27:
if (((tinstr & 0x0F00) != 0x0E00) && ((tinstr & 0x0F00) != 0x0F00)){ if (((tinstr & 0x0F00) != 0x0E00) && ((tinstr & 0x0F00) != 0x0F00)){
u32 cond = (tinstr & 0x0F00) >> 8;
inst_index = table_length - 4; inst_index = table_length - 4;
*ptr_inst_base = arm_instruction_trans[inst_index](tinstr, inst_index); *ptr_inst_base = arm_instruction_trans[inst_index](tinstr, inst_index);
} else { } else {
@ -3693,6 +3692,9 @@ static bool InAPrivilegedMode(arm_core_t *core) {
} }
unsigned InterpreterMainLoop(ARMul_State* state) { unsigned InterpreterMainLoop(ARMul_State* state) {
#undef RM
#undef RS
#define CRn inst_cream->crn #define CRn inst_cream->crn
#define OPCODE_2 inst_cream->opcode_2 #define OPCODE_2 inst_cream->opcode_2
#define CRm inst_cream->crm #define CRm inst_cream->crm
@ -4999,7 +5001,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
} }
uint32_t byte_mask = (BIT(inst, 16) ? 0xff : 0) | (BIT(inst, 17) ? 0xff00 : 0) uint32_t byte_mask = (BIT(inst, 16) ? 0xff : 0) | (BIT(inst, 17) ? 0xff00 : 0)
| (BIT(inst, 18) ? 0xff0000 : 0) | (BIT(inst, 19) ? 0xff000000 : 0); | (BIT(inst, 18) ? 0xff0000 : 0) | (BIT(inst, 19) ? 0xff000000 : 0);
uint32_t mask; uint32_t mask = 0;
if (!inst_cream->R) { if (!inst_cream->R) {
if (InAPrivilegedMode(cpu)) { if (InAPrivilegedMode(cpu)) {
if ((operand & StateMask) != 0) { if ((operand & StateMask) != 0) {

1
src/core/hle/kernel/kernel.cpp
View File

@ -97,7 +97,6 @@ ResultCode HandleTable::Close(Handle handle) {
return ERR_INVALID_HANDLE; return ERR_INVALID_HANDLE;
size_t slot = GetSlot(handle); size_t slot = GetSlot(handle);
u16 generation = GetGeneration(handle);
objects[slot] = nullptr; objects[slot] = nullptr;

2
src/core/hw/gpu.cpp
View File

@ -202,8 +202,6 @@ template void Write<u8>(u32 addr, const u8 data);
/// Update hardware /// Update hardware
static void VBlankCallback(u64 userdata, int cycles_late) { static void VBlankCallback(u64 userdata, int cycles_late) {
auto& framebuffer_top = g_regs.framebuffer_config[0];
frame_count++; frame_count++;
last_skip_frame = g_skip_frame; last_skip_frame = g_skip_frame;
g_skip_frame = (frame_count & Settings::values.frame_skip) != 0; g_skip_frame = (frame_count & Settings::values.frame_skip) != 0;

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

@ -38,7 +38,7 @@ enum class ResultStatus {
ErrorMemoryAllocationFailed, ErrorMemoryAllocationFailed,
}; };
static u32 MakeMagic(char a, char b, char c, char d) { static inline 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;
} }