rename XBYAK_NOEXCEPTION to XBYAK_NO_EXCEPTION

This commit is contained in:
MITSUNARI Shigeo 2020-07-21 14:07:08 +09:00
parent 7cdf227f25
commit 9cd796a9f1
5 changed files with 6 additions and 6 deletions

View file

@ -22,7 +22,7 @@ class ErrorSample : public CodeGenerator {
public: public:
void gen() void gen()
{ {
#ifndef XBYAK_NOEXCEPTION #ifndef XBYAK_NO_EXCEPTION
CYBOZU_TEST_EXCEPTION(mov(ptr[eax],1), std::exception); CYBOZU_TEST_EXCEPTION(mov(ptr[eax],1), std::exception);
CYBOZU_TEST_EXCEPTION(test(ptr[eax],1), std::exception); CYBOZU_TEST_EXCEPTION(test(ptr[eax],1), std::exception);
CYBOZU_TEST_EXCEPTION(adc(ptr[eax],1), std::exception); CYBOZU_TEST_EXCEPTION(adc(ptr[eax],1), std::exception);

View file

@ -1,4 +1,4 @@
#define XBYAK_NOEXCEPTION #define XBYAK_NO_EXCEPTION
#include <xbyak/xbyak.h> #include <xbyak/xbyak.h>
using namespace Xbyak; using namespace Xbyak;

View file

@ -19,7 +19,7 @@ if /i "%1"=="Y" (
set FILTER=normalize_prefix set FILTER=normalize_prefix
) else if /i "%1"=="noexcept" ( ) else if /i "%1"=="noexcept" (
set EXE=nasm.exe set EXE=nasm.exe
set OPT2=-DXBYAK32 -DXBYAK_NOEXCEPTION set OPT2=-DXBYAK32 -DXBYAK_NO_EXCEPTION
set OPT3=win32 set OPT3=win32
) else ( ) else (
set EXE=nasm.exe set EXE=nasm.exe
@ -43,4 +43,4 @@ if /i "%Y%"=="1" (
make_nm jit > nm.cpp make_nm jit > nm.cpp
cl -I../ -DXBYAK_TEST nm_frame.cpp %OPT% %OPT2% cl -I../ -DXBYAK_TEST nm_frame.cpp %OPT% %OPT2%
nm_frame |%FILTER% > x.lst nm_frame |%FILTER% > x.lst
diff -wb x.lst ok.lst && echo "ok" diff -wb x.lst ok.lst && echo "ok"

View file

@ -28,7 +28,7 @@ else if ($1 == "avx512") then
else if ($1 == "noexcept") then else if ($1 == "noexcept") then
echo "nasm(32bit) without exception" echo "nasm(32bit) without exception"
set EXE=nasm set EXE=nasm
set OPT2="-DXBYAK32 -DXBYAK_NOEXCEPTION" set OPT2="-DXBYAK32 -DXBYAK_NO_EXCEPTION"
set OPT3=win32 set OPT3=win32
else else
echo "nasm(32bit)" echo "nasm(32bit)"

View file

@ -255,7 +255,7 @@ inline const char *ConvertErrorToString(int err)
return err <= ERR_INTERNAL ? errTbl[err] : "unknown err"; return err <= ERR_INTERNAL ? errTbl[err] : "unknown err";
} }
#ifdef XBYAK_NOEXCEPTION #ifdef XBYAK_NO_EXCEPTION
namespace local { namespace local {
static XBYAK_TLS int l_err = 0; static XBYAK_TLS int l_err = 0;