suyu/dynarmic
26
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

tests/{a32,a64}_unicorn: Avoid use of deprecated fmt API

Browse source
This commit is contained in:
Merry 2022-07-26 11:42:15 +01:00
parent 64e6546827
commit b002419993
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/unicorn_emu/a32_unicorn.cpp
View file

@ -12,12 +12,12 @@
#include "../A32/testenv.h" #include "../A32/testenv.h"
#define CHECKED(expr) \ #define CHECKED(expr) \
do { \ do { \
if (auto cerr_ = (expr)) { \ if (auto cerr_ = (expr)) { \
ASSERT_MSG(false, "Call " #expr " failed with error: {} ({})\n", cerr_, \ ASSERT_MSG(false, "Call " #expr " failed with error: {} ({})\n", static_cast<size_t>(cerr_), \
uc_strerror(cerr_)); \ uc_strerror(cerr_)); \
} \ } \
} while (0) } while (0)
constexpr u32 BEGIN_ADDRESS = 0; constexpr u32 BEGIN_ADDRESS = 0;
@ -52,7 +52,7 @@ void A32Unicorn<TestEnvironment>::Run() {
return; return;
} }
if (auto cerr_ = uc_emu_start(uc, pc, END_ADDRESS, 0, 1)) { if (auto cerr_ = uc_emu_start(uc, pc, END_ADDRESS, 0, 1)) {
fmt::print("uc_emu_start failed @ {:08x} (code = {:08x}) with error {} ({})", pc, *testenv.MemoryReadCode(pc), cerr_, uc_strerror(cerr_)); fmt::print("uc_emu_start failed @ {:08x} (code = {:08x}) with error {} ({})", pc, *testenv.MemoryReadCode(pc), static_cast<size_t>(cerr_), uc_strerror(cerr_));
throw "A32Unicorn::Run() failure"; throw "A32Unicorn::Run() failure";
} }
testenv.ticks_left--; testenv.ticks_left--;

12
tests/unicorn_emu/a64_unicorn.cpp
View file

@ -7,12 +7,12 @@
#include <mcl/assert.hpp> #include <mcl/assert.hpp>
#define CHECKED(expr) \ #define CHECKED(expr) \
do { \ do { \
if (auto cerr_ = (expr)) { \ if (auto cerr_ = (expr)) { \
ASSERT_MSG(false, "Call " #expr " failed with error: {} ({})\n", cerr_, \ ASSERT_MSG(false, "Call " #expr " failed with error: {} ({})\n", static_cast<size_t>(cerr_), \
uc_strerror(cerr_)); \ uc_strerror(cerr_)); \
} \ } \
} while (0) } while (0)
constexpr u64 BEGIN_ADDRESS = 0; constexpr u64 BEGIN_ADDRESS = 0;