From 93eecca894396271ae48b33dc3d789f5da82b548 Mon Sep 17 00:00:00 2001 From: lizzie Date: Fri, 20 Feb 2026 19:28:36 +0100 Subject: [PATCH] [xbyak] fix unordered map that wasn't actually wanting to be unordered (#3589) It seems to be related to the fact multimap on xbyak doesn't properly work if it's unordered It also seems to NOT play nice at all with unstable iterators (like those found on ankerl) - either we use boost or just let xbyak use normal std Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3589 Reviewed-by: Maufeat Reviewed-by: crueter Co-authored-by: lizzie Co-committed-by: lizzie --- src/dynarmic/src/dynarmic/backend/x64/xbyak.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/dynarmic/src/dynarmic/backend/x64/xbyak.h b/src/dynarmic/src/dynarmic/backend/x64/xbyak.h index 3efc51f54f..ee74794fb4 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/xbyak.h +++ b/src/dynarmic/src/dynarmic/backend/x64/xbyak.h @@ -3,12 +3,13 @@ #pragma once -#define XBYAK_STD_UNORDERED_SET ankerl::unordered_dense::set -#define XBYAK_STD_UNORDERED_MAP ankerl::unordered_dense::map -#define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap +#include +#include -#include -#include +// TODO: Defining this crashes e v e r y t h i n g +// #define XBYAK_STD_UNORDERED_SET ankerl::unordered_dense::set +// #define XBYAK_STD_UNORDERED_MAP ankerl::unordered_dense::map +// #define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap #include #include