Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: clean up warnings

Browse source
This commit is contained in:
BreadFish64 2018-07-23 16:08:14 -05:00
parent ba6eee71f5
commit 74cd98ecad
35 changed files with 82 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/arm/dyncom/arm_dyncom.cpp
View file

@ -75,7 +75,7 @@ ARM_DynCom::ARM_DynCom(PrivilegeMode initial_mode) {
ARM_DynCom::~ARM_DynCom() {}
void ARM_DynCom::Run() {
ExecuteInstructions(std::max(CoreTiming::GetDowncount(), 0));
ExecuteInstructions(std::max<s64>(CoreTiming::GetDowncount(), 0));
}
void ARM_DynCom::Step() {
@ -143,7 +143,7 @@ void ARM_DynCom::SetCP15Register(CP15Register reg, u32 value) {
state->CP15[reg] = value;
}
void ARM_DynCom::ExecuteInstructions(int num_instructions) {
void ARM_DynCom::ExecuteInstructions(u64 num_instructions) {
state->NumInstrsToExecute = num_instructions;
unsigned ticks_executed = InterpreterMainLoop(state.get());
CoreTiming::AddTicks(ticks_executed);

2
src/core/arm/dyncom/arm_dyncom.h
View file

@ -42,7 +42,7 @@ public:
void PrepareReschedule() override;
private:
void ExecuteInstructions(int num_instructions);
void ExecuteInstructions(u64 num_instructions);
std::unique_ptr<ARMul_State> state;
};

4
src/core/arm/dyncom/arm_dyncom_trans.h
View file

@ -1,4 +1,8 @@
#pragma once
#ifdef _MSC_VER
// nonstandard extension used: zero-sized array in struct/union
#pragma warning(disable : 4200)
#endif
#include <cstddef>
#include "common/common_types.h"