archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-04 05:51:19 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced ASSUME(false) with UNREACHABLE.

Browse source
This commit is contained in:
Tom Lally 2022-08-27 20:40:25 +01:00
parent f33540faa1
commit 73a8e6faac
8 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Cafe/HW/Latte/Core/LatteOverlay.cpp
View file

@ -518,7 +518,7 @@ void LatteOverlay_translateScreenPosition(ScreenPosition pos, const Vector2f& wi
direction = -1; direction = -1;
break; break;
default: default:
ASSUME(false); UNREACHABLE;
} }
} }

4
src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp
View file

@ -1463,7 +1463,7 @@ void OpenGLRenderer::shader_bind(RendererShader* shader)
prevGeometryShaderProgram = program; prevGeometryShaderProgram = program;
break; break;
default: default:
ASSUME(false); UNREACHABLE;
} }
catchOpenGLError(); catchOpenGLError();
@ -1494,7 +1494,7 @@ void OpenGLRenderer::shader_unbind(RendererShader::ShaderType shaderType)
prevGeometryShaderProgram = -1; prevGeometryShaderProgram = -1;
break; break;
default: default:
ASSUME(false); UNREACHABLE;
} }
} }

2
src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp
View file

@ -270,7 +270,7 @@ void RendererShaderGL::ShaderCacheLoading_begin(uint64 cacheTitleId)
usePrecompiled = false; usePrecompiled = false;
break; break;
default: default:
ASSUME(false); UNREACHABLE;
} }
forceLog_printf("Using precompiled shaders: %s", usePrecompiled ? "true" : "false"); forceLog_printf("Using precompiled shaders: %s", usePrecompiled ? "true" : "false");

2
src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
View file

@ -3412,7 +3412,7 @@ VkDescriptorSetInfo::~VkDescriptorSetInfo()
break; break;
} }
default: default:
ASSUME(false); UNREACHABLE;
} }
// update global stats // update global stats
performanceMonitor.vk.numDescriptorSamplerTextures.decrement(statsNumSamplerTextures); performanceMonitor.vk.numDescriptorSamplerTextures.decrement(statsNumSamplerTextures);

8
src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRendererCore.cpp
View file

@ -528,7 +528,7 @@ uint64 VulkanRenderer::GetDescriptorSetStateHash(LatteDecompilerShader* shader)
texUnitRegIndex += Latte::REGADDR::SQ_TEX_RESOURCE_WORD0_N_GS; texUnitRegIndex += Latte::REGADDR::SQ_TEX_RESOURCE_WORD0_N_GS;
break; break;
default: default:
ASSUME(false); UNREACHABLE;
} }
auto texture = m_state.boundTexture[hostTextureUnit]; auto texture = m_state.boundTexture[hostTextureUnit];
@ -590,7 +590,7 @@ VkDescriptorSetInfo* VulkanRenderer::draw_getOrCreateDescriptorSet(PipelineInfo*
break; break;
} }
default: default:
ASSUME(false); UNREACHABLE;
} }
// create new descriptor set // create new descriptor set
@ -646,7 +646,7 @@ VkDescriptorSetInfo* VulkanRenderer::draw_getOrCreateDescriptorSet(PipelineInfo*
texUnitRegIndex += Latte::REGADDR::SQ_TEX_RESOURCE_WORD0_N_GS; texUnitRegIndex += Latte::REGADDR::SQ_TEX_RESOURCE_WORD0_N_GS;
break; break;
default: default:
ASSUME(false); UNREACHABLE;
} }
auto textureView = m_state.boundTexture[hostTextureUnit]; auto textureView = m_state.boundTexture[hostTextureUnit];
@ -996,7 +996,7 @@ VkDescriptorSetInfo* VulkanRenderer::draw_getOrCreateDescriptorSet(PipelineInfo*
break; break;
} }
default: default:
ASSUME(false); UNREACHABLE;
} }
return dsInfo; return dsInfo;

2
src/Cafe/TitleList/MetaInfo.cpp
View file

@ -174,7 +174,7 @@ std::unique_ptr<uint8[]> MetaInfo::GetIcon(uint32& size) const
return nullptr; return nullptr;
} }
default: default:
ASSUME(false); UNREACHABLE;
} }
return nullptr; return nullptr;
} }

12
src/Common/precompiled.h
View file

@ -219,6 +219,15 @@ typedef union _LARGE_INTEGER {
inline T& operator^= (T& a, T b) { return reinterpret_cast<T&>( reinterpret_cast<std::underlying_type<T>::type&>(a) ^= static_cast<std::underlying_type<T>::type>(b) ); } inline T& operator^= (T& a, T b) { return reinterpret_cast<T&>( reinterpret_cast<std::underlying_type<T>::type&>(a) ^= static_cast<std::underlying_type<T>::type>(b) ); }
#endif #endif
#if defined(_MSC_VER)
#define UNREACHABLE __assume(false)
#elif defined(__GNUC__)
#define UNREACHABLE __builtin_unreachable();
#else
#warning "No implementation for UNREACHABLE"
#define UNREACHABLE
#endif
// MEMPTR // MEMPTR
#include "Common/MemPtr.h" #include "Common/MemPtr.h"
@ -230,7 +239,6 @@ typedef union _LARGE_INTEGER {
#define DLLIMPORT __declspec(dllimport) #define DLLIMPORT __declspec(dllimport)
#define DEBUG_BREAK __debugbreak() #define DEBUG_BREAK __debugbreak()
#define NOINLINE __declspec(noinline) #define NOINLINE __declspec(noinline)
#define ASSUME(X) __assume(X)
#define THREAD_LOCAL __declspec(thread) #define THREAD_LOCAL __declspec(thread)
#define POPCNT(X) __popcnt((X)) #define POPCNT(X) __popcnt((X))
#else #else
@ -240,8 +248,6 @@ typedef union _LARGE_INTEGER {
#include <csignal> #include <csignal>
#define DEBUG_BREAK raise(SIGTRAP) #define DEBUG_BREAK raise(SIGTRAP)
#define NOINLINE __attribute__((noinline)) #define NOINLINE __attribute__((noinline))
// fixme: random stack overflow solution. use it with caution
#define ASSUME(X) do { if (!(X)) __builtin_unreachable(); } while (0)
#define THREAD_LOCAL __thread #define THREAD_LOCAL __thread
#define POPCNT(X) __builtin_popcount((X)) #define POPCNT(X) __builtin_popcount((X))
#endif #endif

2
src/gui/components/wxTitleManagerList.cpp
View file

@ -941,7 +941,7 @@ wxString wxTitleManagerList::GetTitleEntryText(const TitleEntry& entry, ItemColu
//return wxStringFormat2("{}", entry.format); //return wxStringFormat2("{}", entry.format);
} }
default: default:
ASSUME(false); UNREACHABLE;
} }
return wxEmptyString; return wxEmptyString;