From 331a8e2dbf6e8d0fe61c5635469652a0d23df50c Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 18 Nov 2021 20:52:01 -0800 Subject: [PATCH 1/4] fix organization --- source/ztd/vargs/mingw/x64.hpp | 6 +++--- source/ztd/vargs/va_next.va_start.cpp | 2 +- source/ztd/vargs/windows/x64.hpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/ztd/vargs/mingw/x64.hpp b/source/ztd/vargs/mingw/x64.hpp index e34b34b..ec35186 100644 --- a/source/ztd/vargs/mingw/x64.hpp +++ b/source/ztd/vargs/mingw/x64.hpp @@ -27,8 +27,8 @@ // // ============================================================================> -#ifndef ZTD_VARGS_SOURCE_WINDOWS_GCC_X64_HPP -#define ZTD_VARGS_SOURCE_WINDOWS_GCC_X64_HPP +#ifndef ZTD_VARGS_SOURCE_MINGW_X64_HPP +#define ZTD_VARGS_SOURCE_MINGW_X64_HPP #include @@ -45,4 +45,4 @@ extern "C" void* __ztdc_va_next(ztdc_va_list* __p_vl, size_t __size, size_t __al __ztdc_vargs_detail_broad_type __broad_type) noexcept { } -#endif // ZTD_VARGS_SOURCE_WINDOWS_GCC_X64_HPP +#endif // ZTD_VARGS_SOURCE_MINGW_X64_HPP diff --git a/source/ztd/vargs/va_next.va_start.cpp b/source/ztd/vargs/va_next.va_start.cpp index 4967092..fbea054 100644 --- a/source/ztd/vargs/va_next.va_start.cpp +++ b/source/ztd/vargs/va_next.va_start.cpp @@ -40,7 +40,7 @@ #else #if defined(_M_AMD64) #define ZTD_VARGS_SOURCE_FOUND_PLATFORM_ABI_I_ ZTD_ON - #include "windows/vc++/x64.hpp" + #include "windows/x64.hpp" // #elif defined(_M_IX86) // #elif defined(_M_ARM) // #elif defined(_M_ARM64) diff --git a/source/ztd/vargs/windows/x64.hpp b/source/ztd/vargs/windows/x64.hpp index d80d017..faac4b9 100644 --- a/source/ztd/vargs/windows/x64.hpp +++ b/source/ztd/vargs/windows/x64.hpp @@ -27,8 +27,8 @@ // // ============================================================================> -#ifndef ZTD_VARGS_SOURCE_WINDOWS_VCXX_X64_HPP -#define ZTD_VARGS_SOURCE_WINDOWS_VCXX_X64_HPP +#ifndef ZTD_VARGS_SOURCE_WINDOWS_X64_HPP +#define ZTD_VARGS_SOURCE_WINDOWS_X64_HPP #include @@ -141,4 +141,4 @@ extern "C" void* __ztdc_va_next(ztdc_va_list* __p_vl, size_t __size, size_t __al return __target; } -#endif // ZTD_VARGS_SOURCE_WINDOWS_VCXX_X64_HPP +#endif // ZTD_VARGS_SOURCE_WINDOWS_X64_HPP From 412fd2f99f6939f56fbba55141c102680a1a1a8e Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 18 Nov 2021 20:57:19 -0800 Subject: [PATCH 2/4] cmake fixes --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a09801..de5a23e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ file(GLOB_RECURSE ztd.vargs.sources CONFIGURE_DEPENDS source/*.c source/*.cpp) -set(ztd.vargs.sources.prefix "${CMAKE_CURRENT_SOURCE_DIR}/source/ztd/vargs" +set(ztd.vargs.sources.prefix "${CMAKE_CURRENT_SOURCE_DIR}/source/ztd/vargs") if(WIN32) # CMAKE_SYSTEM_PROCESSOR will be the result of %PROCESSOR_ARCHITEW6432%, # and thus will be one of {AMD64, IA64, ARM64, x86, ARM} From 9d785ff3a8f27ae46d326e8a675f33f24ab84cef Mon Sep 17 00:00:00 2001 From: ThePhD Date: Fri, 19 Nov 2021 01:14:08 -0500 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=91=B7=E2=80=8D=E2=99=80=EF=B8=8F=20G?= =?UTF-8?q?ather=20all=20arch-specific=20ASM=20sources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit — Enable the right ASM for the given architecture! --- CMakeLists.txt | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de5a23e..b86a79b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ project(ztd.vargs VERSION 0.0.0 DESCRIPTION [[Code to access Variable Arguments ("var args") without the cruft of an inital first parameter.]] HOMEPAGE_URL "https://ztdvargs.readthedocs.io/en/latest/" - LANGUAGES C CXX ASM_MASM ASM) + LANGUAGES C CXX) if(ZTD_VARGS_READTHEDOCS) # ReadTheDocs seems unable to handle the include at the project level: something must be going wrong? @@ -137,19 +137,28 @@ if(WIN32) if(MSVC) message(STATUS "[ztd.vargs] Using VC++ ${arch_name} assembly files") - set(ztd.vargs.sources.asm - "${ztd.vargs.sources.prefix}/windows/${arch_name}.asm") + enable_language(ASM_MASM) + file(GLOB_RECURSE ztd.vargs.sources.asm + LIST_DIRECTORIES FALSE + CONFIGURE_DEPENDS + "${ztd.vargs.sources.prefix}/windows/${arch_name}*.asm") elseif (GCC OR MINGW) message(STATUS "[ztd.vargs] Using mingw ${arch_name} assembly files") - set(ztd.vargs.sources.asm - "${ztd.vargs.sources.prefix}/mingw/${arch_name}.asm") - endif() - - if(NOT EXISTS "${ztd.vargs.sources.asm}") - set(ztd.vargs.sources.asm "") + enable_language(ASM) + file(GLOB_RECURSE ztd.vargs.sources.asm + LIST_DIRECTORIES FALSE + CONFIGURE_DEPENDS + "${ztd.vargs.sources.prefix}/mingw/${arch_name}*.s") endif() + foreach (asm.file ${ztd.vargs.sources.asm}) + if(NOT EXISTS "${asm.file}") + list(REMOVE_ITEM ztd.vargs.sources.asm ${asm.file}) + endif() + endforeach() endif() +message(STATUS "[ztd.vargs] ${ztd.vargs.sources.asm}") + add_library(ztd.vargs ${ztd.vargs.sources} ${ztd.vargs.sources.asm}) add_library(ztd::vargs ALIAS ztd.vargs) target_include_directories(ztd.vargs From 62b1bf8ee9e366e96e6892f4781396e3769ae55d Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Sun, 21 Nov 2021 14:54:02 -0800 Subject: [PATCH 4/4] minor changes --- CMakeLists.txt | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b86a79b..e19ea85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,30 +135,23 @@ if(WIN32) set(arch_name "arm") endif() - if(MSVC) - message(STATUS "[ztd.vargs] Using VC++ ${arch_name} assembly files") - enable_language(ASM_MASM) - file(GLOB_RECURSE ztd.vargs.sources.asm - LIST_DIRECTORIES FALSE - CONFIGURE_DEPENDS - "${ztd.vargs.sources.prefix}/windows/${arch_name}*.asm") - elseif (GCC OR MINGW) + if(MINGW) message(STATUS "[ztd.vargs] Using mingw ${arch_name} assembly files") enable_language(ASM) file(GLOB_RECURSE ztd.vargs.sources.asm LIST_DIRECTORIES FALSE CONFIGURE_DEPENDS "${ztd.vargs.sources.prefix}/mingw/${arch_name}*.s") + else() + message(STATUS "[ztd.vargs] Using VC++ ${arch_name} assembly files") + enable_language(ASM_MASM) + file(GLOB_RECURSE ztd.vargs.sources.asm + LIST_DIRECTORIES FALSE + CONFIGURE_DEPENDS + "${ztd.vargs.sources.prefix}/windows/${arch_name}*.asm") endif() - foreach (asm.file ${ztd.vargs.sources.asm}) - if(NOT EXISTS "${asm.file}") - list(REMOVE_ITEM ztd.vargs.sources.asm ${asm.file}) - endif() - endforeach() endif() -message(STATUS "[ztd.vargs] ${ztd.vargs.sources.asm}") - add_library(ztd.vargs ${ztd.vargs.sources} ${ztd.vargs.sources.asm}) add_library(ztd::vargs ALIAS ztd.vargs) target_include_directories(ztd.vargs