diff options
| author |  Subv | 2017-08-19 11:28:22 -0500 |
|---|---|---|
| committer | Subv | 2017-08-21 08:20:36 -0500 |
| commit | d3fb1d6c3882e45dee66fe7e5cf7613268e1b7bb (patch) | |
| tree | 206bedf1a2815c9689f0d2fafb03227b223401c7 | |
| parent | Merge pull request #2872 from wwylele/sw-geo-factor (diff) | |
| download | yuzu-d3fb1d6c3882e45dee66fe7e5cf7613268e1b7bb.tar.gz yuzu-d3fb1d6c3882e45dee66fe7e5cf7613268e1b7bb.tar.xz yuzu-d3fb1d6c3882e45dee66fe7e5cf7613268e1b7bb.zip | |
Dyncom: Fixed a conversion warning when decoding thumb instructions.
Diffstat (limited to '')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index f4fbb8d04..f829b9229 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |||
| @@ -759,7 +759,7 @@ static ThumbDecodeStatus DecodeThumbInstruction(u32 inst, u32 addr, u32* arm_ins | |||
| 759 | ThumbDecodeStatus ret = TranslateThumbInstruction(addr, inst, arm_inst, inst_size); | 759 | ThumbDecodeStatus ret = TranslateThumbInstruction(addr, inst, arm_inst, inst_size); |
| 760 | if (ret == ThumbDecodeStatus::BRANCH) { | 760 | if (ret == ThumbDecodeStatus::BRANCH) { |
| 761 | int inst_index; | 761 | int inst_index; |
| 762 | int table_length = arm_instruction_trans_len; | 762 | int table_length = static_cast<int>(arm_instruction_trans_len); |
| 763 | u32 tinstr = GetThumbInstruction(inst, addr); | 763 | u32 tinstr = GetThumbInstruction(inst, addr); |
| 764 | 764 | ||
| 765 | switch ((tinstr & 0xF800) >> 11) { | 765 | switch ((tinstr & 0xF800) >> 11) { |