mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-22 03:13:23 +02:00
Dyncom: Use size_t instead of int to store the instruction offsets in the instruction cache.
Fixes a few warnings.
This commit is contained in:
parent
d3fb1d6c38
commit
9d0841b48b
@ -838,7 +838,7 @@ static unsigned int InterpreterTranslateInstruction(const ARMul_State* cpu, cons
|
|||||||
return inst_size;
|
return inst_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int InterpreterTranslateBlock(ARMul_State* cpu, int& bb_start, u32 addr) {
|
static int InterpreterTranslateBlock(ARMul_State* cpu, std::size_t& bb_start, u32 addr) {
|
||||||
MICROPROFILE_SCOPE(DynCom_Decode);
|
MICROPROFILE_SCOPE(DynCom_Decode);
|
||||||
|
|
||||||
// Decode instruction, get index
|
// Decode instruction, get index
|
||||||
@ -871,7 +871,7 @@ static int InterpreterTranslateBlock(ARMul_State* cpu, int& bb_start, u32 addr)
|
|||||||
return KEEP_GOING;
|
return KEEP_GOING;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int InterpreterTranslateSingle(ARMul_State* cpu, int& bb_start, u32 addr) {
|
static int InterpreterTranslateSingle(ARMul_State* cpu, std::size_t& bb_start, u32 addr) {
|
||||||
MICROPROFILE_SCOPE(DynCom_Decode);
|
MICROPROFILE_SCOPE(DynCom_Decode);
|
||||||
|
|
||||||
ARM_INST_PTR inst_base = nullptr;
|
ARM_INST_PTR inst_base = nullptr;
|
||||||
@ -1620,7 +1620,7 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
|
|||||||
unsigned int addr;
|
unsigned int addr;
|
||||||
unsigned int num_instrs = 0;
|
unsigned int num_instrs = 0;
|
||||||
|
|
||||||
int ptr;
|
std::size_t ptr;
|
||||||
|
|
||||||
LOAD_NZCVT;
|
LOAD_NZCVT;
|
||||||
DISPATCH : {
|
DISPATCH : {
|
||||||
|
@ -230,7 +230,7 @@ public:
|
|||||||
|
|
||||||
// TODO(bunnei): Move this cache to a better place - it should be per codeset (likely per
|
// TODO(bunnei): Move this cache to a better place - it should be per codeset (likely per
|
||||||
// process for our purposes), not per ARMul_State (which tracks CPU core state).
|
// process for our purposes), not per ARMul_State (which tracks CPU core state).
|
||||||
std::unordered_map<u32, int> instruction_cache;
|
std::unordered_map<u32, std::size_t> instruction_cache;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ResetMPCoreCP15Registers();
|
void ResetMPCoreCP15Registers();
|
||||||
|
Loading…
Reference in New Issue
Block a user