mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-09-02 02:58:46 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 929deab537 | |||
| 11086e19ce | |||
| 760afd1bf5 | |||
| dd66bdb22c | |||
| 4db1ce2cf2 | |||
| bdccb1dc65 | |||
| 1899bb0e7d | |||
| 8444677ed9 | |||
| 38bdbf4c4f |
@@ -25,14 +25,13 @@
|
|||||||
#include "common/container/unordered_map.h"
|
#include "common/container/unordered_map.h"
|
||||||
#include "common/container/unordered_set.h"
|
#include "common/container/unordered_set.h"
|
||||||
#include <boost/unordered_map.hpp>
|
#include <boost/unordered_map.hpp>
|
||||||
|
#define XBYAK_NO_EXCEPTION 1
|
||||||
#define XBYAK_STD_UNORDERED_SET ::Common::unordered_set
|
#define XBYAK_STD_UNORDERED_SET ::Common::unordered_set
|
||||||
#define XBYAK_STD_UNORDERED_MAP ::Common::unordered_map
|
#define XBYAK_STD_UNORDERED_MAP ::Common::unordered_map
|
||||||
#define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap
|
#define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap
|
||||||
#include <xbyak/xbyak.h>
|
#include <xbyak/xbyak.h>
|
||||||
#include <xbyak/xbyak_util.h>
|
#include <xbyak/xbyak_util.h>
|
||||||
|
|
||||||
#include <xbyak/xbyak.h>
|
|
||||||
|
|
||||||
namespace Common::X64 {
|
namespace Common::X64 {
|
||||||
|
|
||||||
constexpr size_t RegToIndex(const Xbyak::Reg& reg) {
|
constexpr size_t RegToIndex(const Xbyak::Reg& reg) {
|
||||||
|
|||||||
@@ -95,7 +95,6 @@ else()
|
|||||||
-pedantic
|
-pedantic
|
||||||
-Wno-missing-braces
|
-Wno-missing-braces
|
||||||
-fno-rtti
|
-fno-rtti
|
||||||
#-fno-exceptions
|
|
||||||
)
|
)
|
||||||
if (CXX_GCC)
|
if (CXX_GCC)
|
||||||
# GCC produces bogus -Warray-bounds warnings from xbyak headers for code paths that are not
|
# GCC produces bogus -Warray-bounds warnings from xbyak headers for code paths that are not
|
||||||
@@ -113,6 +112,11 @@ else()
|
|||||||
# Clang mistakenly blames CMake for using unused arguments during compilation
|
# Clang mistakenly blames CMake for using unused arguments during compilation
|
||||||
list(APPEND DYNARMIC_CXX_FLAGS -Wno-unused-command-line-argument)
|
list(APPEND DYNARMIC_CXX_FLAGS -Wno-unused-command-line-argument)
|
||||||
endif()
|
endif()
|
||||||
|
# TODO: oaknut exceptions
|
||||||
|
# TODO: fix chromeOS
|
||||||
|
if ("x86_64" IN_LIST ARCHITECTURE AND NOT ANDROID)
|
||||||
|
list(APPEND DYNARMIC_CXX_FLAGS -fno-exceptions)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT Boost_FOUND)
|
if (NOT Boost_FOUND)
|
||||||
|
|||||||
@@ -465,13 +465,8 @@ size_t BlockOfCode::GetTotalCodeSize() const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void* BlockOfCode::AllocateFromCodeSpace(size_t alloc_size) {
|
void* BlockOfCode::AllocateFromCodeSpace(size_t alloc_size) {
|
||||||
if (size_ + alloc_size >= maxSize_) {
|
ASSERT(size_ + alloc_size < maxSize_);
|
||||||
using Xbyak::Error;
|
|
||||||
XBYAK_THROW(Xbyak::ERR_CODE_IS_TOO_BIG);
|
|
||||||
}
|
|
||||||
|
|
||||||
EnsureMemoryCommitted(alloc_size);
|
EnsureMemoryCommitted(alloc_size);
|
||||||
|
|
||||||
void* ret = getCurr<void*>();
|
void* ret = getCurr<void*>();
|
||||||
size_ += alloc_size;
|
size_ += alloc_size;
|
||||||
memset(ret, 0, alloc_size);
|
memset(ret, 0, alloc_size);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
#include "common/container/unordered_map.h"
|
#include "common/container/unordered_map.h"
|
||||||
#include "common/container/unordered_set.h"
|
#include "common/container/unordered_set.h"
|
||||||
#include <boost/unordered_map.hpp>
|
#include <boost/unordered_map.hpp>
|
||||||
|
#define XBYAK_NO_EXCEPTION 1
|
||||||
#define XBYAK_STD_UNORDERED_SET ::Common::unordered_set
|
#define XBYAK_STD_UNORDERED_SET ::Common::unordered_set
|
||||||
#define XBYAK_STD_UNORDERED_MAP ::Common::unordered_map
|
#define XBYAK_STD_UNORDERED_MAP ::Common::unordered_map
|
||||||
#define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap
|
#define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap
|
||||||
|
|||||||
Reference in New Issue
Block a user