From 55a7c0e3f9790b8f9f2000bbcd15eabbf4419c5e Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 1 Sep 2026 21:19:47 +0000 Subject: [PATCH] fixup w.r.t new dynarm --- src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp | 5 ----- src/dynarmic/src/dynarmic/backend/x64/block_of_code.h | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp index 49fa8bf8be..384d6203a4 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp +++ b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp @@ -7,7 +7,6 @@ */ #include "dynarmic/backend/x64/block_of_code.h" -#include "xbyak/xbyak.h" #ifdef _WIN32 # define WIN32_LEAN_AND_MEAN @@ -447,12 +446,8 @@ size_t BlockOfCode::GetTotalCodeSize() const { void* BlockOfCode::AllocateFromCodeSpace(size_t alloc_size) { if (size_ + alloc_size >= maxSize_) { -#ifndef XBYAK_NO_EXCEPTION using Xbyak::Error; XBYAK_THROW(Xbyak::ERR_CODE_IS_TOO_BIG); -#else - std::abort(); -#endif } EnsureMemoryCommitted(alloc_size); diff --git a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.h b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.h index 146ddb3898..20012a070f 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/block_of_code.h +++ b/src/dynarmic/src/dynarmic/backend/x64/block_of_code.h @@ -39,8 +39,8 @@ struct RunCodeCallbacks { class BlockOfCode final : public Xbyak::CodeGenerator { public: - BlockOfCode(RunCodeCallbacks cb, JitStateInfo jsi, size_t total_code_size, std::function rcp) noexcept; - BlockOfCode(const BlockOfCode&) noexcept = delete; + BlockOfCode(RunCodeCallbacks cb, JitStateInfo jsi, size_t total_code_size, std::function rcp); + BlockOfCode(const BlockOfCode&) = delete; /// Call when external emitters have finished emitting their preludes. void PreludeComplete();