ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Workaround MSVC bug 

It fails to parse Args... in fmt::get_type_info<>()
This commit is contained in:
Nekotekina 2018-08-24 15:09:05 +03:00
parent 6bbec61856
commit bb19feca96
3 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utilities/Log.h
View File

@ -73,7 +73,9 @@ namespace logs
{
if (UNLIKELY(sev <= enabled))
{
message{this, sev}.broadcast(fmt, fmt::get_type_info<fmt_unveil_t<Args>...>(), fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
static constexpr fmt_type_info type_list[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};
const u64 arg_array[sizeof...(Args) + 1]{fmt_unveil<Args>::get(args)...};
message{this, sev}.broadcast(fmt, type_list, arg_array);
}
}

17
Utilities/StrFmt.h
View File

@ -244,10 +244,6 @@ struct fmt_type_info
}
};
// Argument array type (each element generated via fmt_unveil<>)
template <typename... Args>
using fmt_args_t = const u64(&&)[sizeof...(Args) + 1];
namespace fmt
{
// Base-57 format helper
@ -274,11 +270,14 @@ namespace fmt
SAFE_BUFFERS FORCE_INLINE const fmt_type_info* get_type_info()
{
// Constantly initialized null-terminated list of type-specific information
static constexpr fmt_type_info result[sizeof...(Args) + 1]{fmt_type_info::make<Args>()...};
static constexpr fmt_type_info result[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};
return result;
}
template <typename... Args>
constexpr const fmt_type_info type_info_v[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};
// Internal formatting function
void raw_append(std::string& out, const char*, const fmt_type_info*, const u64*) noexcept;
@ -286,7 +285,9 @@ namespace fmt
template <typename... Args>
SAFE_BUFFERS FORCE_INLINE void append(std::string& out, const char* fmt, const Args&... args)
{
raw_append(out, fmt, fmt::get_type_info<fmt_unveil_t<Args>...>(), fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
static constexpr fmt_type_info type_list[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};
const u64 arg_array[sizeof...(Args) + 1]{fmt_unveil<Args>::get(args)...};
raw_append(out, fmt, type_list, arg_array);
}
// Formatting function
@ -306,6 +307,8 @@ namespace fmt
template <typename T = std::runtime_error, typename... Args>
[[noreturn]] SAFE_BUFFERS FORCE_INLINE void throw_exception(const char* fmt, const Args&... args)
{
raw_throw_exception<T>(fmt, fmt::get_type_info<fmt_unveil_t<Args>...>(), fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
static constexpr fmt_type_info type_list[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};
const u64 arg_array[sizeof...(Args) + 1]{fmt_unveil<Args>::get(args)...};
raw_throw_exception<T>(fmt, type_list, arg_array);
}
}

42
rpcs3/Crypto/lz.cpp
View File

@ -6,7 +6,7 @@
void decode_range(unsigned int *range, unsigned int *code, unsigned char **src)
{
if (!((*range) >> 24))
if (!((*range) >> 24))
{
(*range) <<= 8;
*code = ((*code) << 8) + (*src)++[5];
@ -16,7 +16,7 @@ void decode_range(unsigned int *range, unsigned int *code, unsigned char **src)
int decode_bit(unsigned int *range, unsigned int *code, int *index, unsigned char **src, unsigned char *c)
{
decode_range(range, code, src);
unsigned int val = ((*range) >> 8) * (*c);
*c -= ((*c) >> 3);
@ -41,10 +41,10 @@ int decode_number(unsigned char *ptr, int index, int *bit_flag, unsigned int *ra
{
int i = 1;
if (index >= 3)
if (index >= 3)
{
decode_bit(range, code, &i, src, ptr + 0x18);
if (index >= 4)
if (index >= 4)
{
decode_bit(range, code, &i, src, ptr + 0x18);
if (index >= 5)
@ -54,8 +54,8 @@ int decode_number(unsigned char *ptr, int index, int *bit_flag, unsigned int *ra
{
i <<= 1;
(*range) >>= 1;
if (*code < *range)
i++;
if (*code < *range)
i++;
else
(*code) -= *range;
}
@ -65,14 +65,14 @@ int decode_number(unsigned char *ptr, int index, int *bit_flag, unsigned int *ra
*bit_flag = decode_bit(range, code, &i, src, ptr);
if (index >= 1)
if (index >= 1)
{
decode_bit(range, code, &i, src, ptr + 0x8);
if (index >= 2)
if (index >= 2)
{
decode_bit(range, code, &i, src, ptr + 0x10);
}
}
}
return i;
}
@ -82,10 +82,10 @@ int decode_word(unsigned char *ptr, int index, int *bit_flag, unsigned int *rang
int i = 1;
index /= 8;
if (index >= 3)
if (index >= 3)
{
decode_bit(range, code, &i, src, ptr + 4);
if (index >= 4)
if (index >= 4)
{
decode_bit(range, code, &i, src, ptr + 4);
if (index >= 5)
@ -95,8 +95,8 @@ int decode_word(unsigned char *ptr, int index, int *bit_flag, unsigned int *rang
{
i <<= 1;
(*range) >>= 1;
if (*code < *range)
i++;
if (*code < *range)
i++;
else
(*code) -= *range;
}
@ -106,14 +106,14 @@ int decode_word(unsigned char *ptr, int index, int *bit_flag, unsigned int *rang
*bit_flag = decode_bit(range, code, &i, src, ptr);
if (index >= 1)
if (index >= 1)
{
decode_bit(range, code, &i, src, ptr + 1);
if (index >= 2)
if (index >= 2)
{
decode_bit(range, code, &i, src, ptr + 2);
}
}
}
return i;
}
@ -185,7 +185,7 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
// Identify the data length bit field.
do
{
tmp_sect1 += 8;
tmp_sect1 += 8;
bit_flag = decode_bit(&range, &code, 0, &in, tmp_sect1);
index += bit_flag;
} while ((bit_flag != 0) && (index < 6));
@ -195,7 +195,7 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
tmp_sect2 = tmp + index + 0x7F1;
// If the data length was found, parse it as a number.
if ((index >= 0) || (bit_flag != 0))
if ((index >= 0) || (bit_flag != 0))
{
// Locate next section.
int sect = (index << 5) | (((((int)(start - out)) << index) & 3) << 3) | (offset & 7);
@ -203,9 +203,9 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
// Decode the data length (8 bit fields).
data_length = decode_number(tmp_sect1, index, &bit_flag, &range, &code, &in);
if (data_length == 0xFF) return (start - out); // End of stream.
if (data_length == 0xFF) return (start - out); // End of stream.
}
else
else
{
// Assume one byte of advance.
data_length = 1;
@ -229,7 +229,7 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
} while (diff < 0);
// If the data offset was found, parse it as a number.
if ((diff > 0) || (bit_flag != 0))
if ((diff > 0) || (bit_flag != 0))
{
// Adjust diff if needed.
if (bit_flag == 0) diff -= 8;