From 43215b4ced04ba5bbca9020d0faf435a65be352f Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Fri, 26 May 2023 08:20:12 +0200 Subject: [PATCH] early-access version 3614 --- README.md | 2 +- src/common/time_zone.cpp | 3 +-- src/core/hle/service/time/time_zone_manager.cpp | 3 +++ .../frontend/maxwell/translate/impl/integer_funnel_shift.cpp | 2 +- src/yuzu_cmd/yuzu.cpp | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d5c77c887..e28f1d89a 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3612. +This is the source code for early-access 3614. ## Legal Notice diff --git a/src/common/time_zone.cpp b/src/common/time_zone.cpp index 068141327..016725e20 100755 --- a/src/common/time_zone.cpp +++ b/src/common/time_zone.cpp @@ -100,8 +100,7 @@ std::string FindSystemTimeZone() { } const auto offset = offsets[i]; - const int difference = - static_cast(std::abs(std::abs(offset) - std::abs(system_offset))); + const int difference = static_cast(std::abs(offset - system_offset)); if (difference < min) { min = difference; min_index = i; diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/core/hle/service/time/time_zone_manager.cpp index 3256c3876..6dd5fd7af 100755 --- a/src/core/hle/service/time/time_zone_manager.cpp +++ b/src/core/hle/service/time/time_zone_manager.cpp @@ -142,6 +142,9 @@ static constexpr bool GetInteger(const char* name, int& offset, int& value, int if (!IsDigit(temp)) { return {}; } + if (temp == '0') { + return {}; + } do { value = value * 10 + (temp - '0'); if (value > max) { diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_funnel_shift.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_funnel_shift.cpp index f2975d25b..4927fc753 100755 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_funnel_shift.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_funnel_shift.cpp @@ -30,7 +30,7 @@ void SHF(TranslatorVisitor& v, u64 insn, const IR::U32& shift, const IR::U32& hi union { u64 insn; BitField<0, 8, IR::Reg> dest_reg; - BitField<0, 8, IR::Reg> lo_bits_reg; + BitField<8, 8, IR::Reg> lo_bits_reg; BitField<37, 2, MaxShift> max_shift; BitField<47, 1, u64> cc; BitField<48, 2, u64> x_mode; diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index c2eb668d3..04c2fd0ef 100755 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -283,7 +283,7 @@ int main(int argc, char** argv) { break; case 'u': selected_user = atoi(optarg); - return 0; + break; case 'v': PrintVersion(); return 0;