From efdc78ee2279ddf929fe0e37b6da445a7a1e4463 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Wed, 17 Jul 2019 17:52:01 -0700 Subject: [PATCH 1/2] Fix typo in xenia-build --- xenia-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xenia-build b/xenia-build index 0b44ba890..58215d3bc 100755 --- a/xenia-build +++ b/xenia-build @@ -1280,7 +1280,7 @@ class TidyCommand(Command): super(TidyCommand, self).__init__( subparsers, name='tidy', - help_short='Runs the clang-tiday checker on all code.', + help_short='Runs the clang-tidy checker on all code.', *args, **kwargs) self.parser.add_argument( '--fix', action='store_true', From e14639c6c0565612d39b389a3140337abc3b34d2 Mon Sep 17 00:00:00 2001 From: gibbed Date: Thu, 18 Jul 2019 12:32:37 -0500 Subject: [PATCH 2/2] [CPU] Fix lzx_decompress misuse of xe::bit_count. Fixes #1402. --- src/xenia/cpu/lzx.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/xenia/cpu/lzx.cc b/src/xenia/cpu/lzx.cc index d9ebe9978..cc2546d52 100644 --- a/src/xenia/cpu/lzx.cc +++ b/src/xenia/cpu/lzx.cc @@ -96,10 +96,13 @@ void mspack_memory_sys_destroy(struct mspack_system* sys) { free(sys); } int lzx_decompress(const void* lzx_data, size_t lzx_len, void* dest, size_t dest_len, uint32_t window_size, void* window_data, size_t window_data_len) { - uint32_t window_bits = xe::bit_count(window_size); - int result_code = 1; + uint32_t window_bits; + if (!xe::bit_scan_forward(window_size, &window_bits)) { + return result_code; + } + mspack_system* sys = mspack_memory_sys_create(); mspack_memory_file* lzxsrc = mspack_memory_open(sys, (void*)lzx_data, lzx_len);