core: clean up warnings

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

View file

@ -99,7 +99,7 @@ static void AddTicks(u64 ticks) {
}
static u64 GetTicksRemaining() {
int ticks = CoreTiming::GetDowncount();
s64 ticks = CoreTiming::GetDowncount();
return static_cast<u64>(ticks <= 0 ? 0 : ticks);
}

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);

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;
};

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"

View file

@ -221,7 +221,7 @@ public:
u32 TFlag; // Thumb state
unsigned long long NumInstrs; // The number of instructions executed
unsigned NumInstrsToExecute;
u64 NumInstrsToExecute;
unsigned NresetSig; // Reset the processor
unsigned NfiqSig;