Mirrors/asmjit
1
0
Fork 0
mirror of https://github.com/asmjit/asmjit.git synced 2025-12-17 04:24:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

[Bug] Fixed build having ASMJIT_NO_TEXT enabled (AArch64)

Browse Source
This commit is contained in:
kobalicek
2023-03-24 23:34:19 +01:00
parent f1ea8a46c3
commit 51b10b19b6
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build.yml vendored
View File

@@ -43,11 +43,12 @@ jobs:
- { title: "no-deprecated" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_DEPRECATED=1" } - { title: "no-deprecated" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_DEPRECATED=1" }
- { title: "no-intrinsics" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_INTRINSICS=1" } - { title: "no-intrinsics" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_INTRINSICS=1" }
- { title: "no-logging" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_LOGGING=1" } - { title: "no-logging" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_LOGGING=1" }
- { title: "no-logging-text" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_LOGGING=1,ASMJIT_NO_TEXT=1" }
- { title: "no-builder" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_BUILDER=1" } - { title: "no-builder" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_BUILDER=1" }
- { title: "no-compiler" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_COMPILER=1" } - { title: "no-compiler" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_COMPILER=1" }
- { title: "no-jit" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_JIT=1" } - { title: "no-jit" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_JIT=1" }
- { title: "no-introspection", os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_INTROSPECTI1=1" } - { title: "no-introspection", os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_INTROSPECTION=1" }
- { title: "no-validation" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_VALIDATI1=1" } - { title: "no-validation" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_VALIDATION=1" }
- { title: "no-x86" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_X86=1" } - { title: "no-x86" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_X86=1" }
- { title: "no-aarch64" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_AARCH64=1" } - { title: "no-aarch64" , os: "ubuntu-latest" , cc: "clang" , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_AARCH64=1" }

2
src/asmjit/arm/a64compiler.h
View File

@@ -55,7 +55,7 @@ public:
_newRegFmt(&reg, type, s, std::forward<Args>(args)...); _newRegFmt(&reg, type, s, std::forward<Args>(args)...);
return reg; return reg;
#else #else
DebugUtils::unused(std::forward<Args>(args)...); DebugUtils::unused(s, std::forward<Args>(args)...);
RegT reg(Globals::NoInit); RegT reg(Globals::NoInit);
_newReg(&reg, type, nullptr); _newReg(&reg, type, nullptr);
return reg; return reg;

4
src/asmjit/arm/a64instdb.cpp
View File

@@ -1843,7 +1843,7 @@ const InstDB::CommonInfo InstDB::commonData[] = {
// ArmUtil - Id <-> Name // ArmUtil - Id <-> Name
// ===================== // =====================
#ifndef ASMJIT_DISABLE_TEXT #ifndef ASMJIT_NO_TEXT
// ${NameData:Begin} // ${NameData:Begin}
// ------------------- Automatically generated, do not edit ------------------- // ------------------- Automatically generated, do not edit -------------------
const uint32_t InstDB::_instNameIndexTable[] = { const uint32_t InstDB::_instNameIndexTable[] = {
@@ -2650,7 +2650,7 @@ const InstDB::InstNameIndex InstDB::instNameIndex[26] = {
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// ${NameData:End} // ${NameData:End}
#endif #endif // !ASMJIT_NO_TEXT
ASMJIT_END_SUB_NAMESPACE ASMJIT_END_SUB_NAMESPACE

2
src/asmjit/x86/x86instapi.cpp
View File

@@ -1686,6 +1686,7 @@ static Error queryFeaturesInline(CpuFeatures* out, Arch arch, BaseInst inst, Arg
return InstInternal::queryFeatures(arch, inst, opArray, sizeof...(args), out); return InstInternal::queryFeatures(arch, inst, opArray, sizeof...(args), out);
} }
#ifndef ASMJIT_NO_TEXT
UNIT(x86_inst_api_text) { UNIT(x86_inst_api_text) {
// All known instructions should be matched. // All known instructions should be matched.
INFO("Matching all X86 instructions"); INFO("Matching all X86 instructions");
@@ -1701,6 +1702,7 @@ UNIT(x86_inst_api_text) {
.message("Instructions do not match \"%s\" (#%u) != \"%s\" (#%u)", aName.data(), a, bName.data(), b); .message("Instructions do not match \"%s\" (#%u) != \"%s\" (#%u)", aName.data(), a, bName.data(), b);
} }
} }
#endif // !ASMJIT_NO_TEXT
UNIT(x86_inst_api_cpu_features) { UNIT(x86_inst_api_cpu_features) {
INFO("Verifying whether SSE2+ features are reported correctly for legacy instructions"); INFO("Verifying whether SSE2+ features are reported correctly for legacy instructions");