From 01a9ccdf0d97369f1e3773e1408c86eaaa75eda0 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Thu, 1 Feb 2024 11:22:45 +0000 Subject: [PATCH] Update iOS64 ABI name to the more accurate AppleARM64. --- src/AST/ASTContext.cs | 2 +- src/CppParser/Bindings/CLI/Decl.h | 2 +- .../CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs | 2 +- .../Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs | 2 +- .../CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs | 2 +- .../CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs | 2 +- .../Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs | 2 +- .../CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs | 2 +- src/CppParser/Decl.h | 2 +- src/CppParser/Parser.cpp | 4 ++-- src/Parser/ASTConverter.cs | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/AST/ASTContext.cs b/src/AST/ASTContext.cs index a9cb6831d..e52107e0d 100644 --- a/src/AST/ASTContext.cs +++ b/src/AST/ASTContext.cs @@ -12,7 +12,7 @@ public enum CppAbi ARM, AArch64, iOS, - iOS64, + AppleARM64, WebAssembly } diff --git a/src/CppParser/Bindings/CLI/Decl.h b/src/CppParser/Bindings/CLI/Decl.h index 107a2aefc..58233c2c1 100644 --- a/src/CppParser/Bindings/CLI/Decl.h +++ b/src/CppParser/Bindings/CLI/Decl.h @@ -256,7 +256,7 @@ namespace CppSharp Microsoft = 1, ARM = 2, iOS = 3, - iOS64 = 4, + AppleARM64 = 4, WebAssembly = 5 }; diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs index f11b94cdc..c12579c6c 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs @@ -6403,7 +6403,7 @@ public enum CppAbi ARM = 2, AArch64 = 3, iOS = 4, - iOS64 = 5, + AppleARM64 = 5, WebAssembly = 6 } diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs index 951d7a1f5..929151367 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs @@ -6403,7 +6403,7 @@ public enum CppAbi ARM = 2, AArch64 = 3, iOS = 4, - iOS64 = 5, + AppleARM64 = 5, WebAssembly = 6 } diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs index 6c8c1e3e4..2c6915daa 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs @@ -6403,7 +6403,7 @@ public enum CppAbi ARM = 2, AArch64 = 3, iOS = 4, - iOS64 = 5, + AppleARM64 = 5, WebAssembly = 6 } diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs index a962c0034..93855910f 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs @@ -6403,7 +6403,7 @@ public enum CppAbi ARM = 2, AArch64 = 3, iOS = 4, - iOS64 = 5, + AppleARM64 = 5, WebAssembly = 6 } diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs index 832b9e9ef..f9e378173 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs @@ -6403,7 +6403,7 @@ public enum CppAbi ARM = 2, AArch64 = 3, iOS = 4, - iOS64 = 5, + AppleARM64 = 5, WebAssembly = 6 } diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs index c626a8ec5..6d9deb3a1 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs @@ -6402,7 +6402,7 @@ public enum CppAbi Microsoft = 1, ARM = 2, iOS = 3, - iOS64 = 4, + AppleARM64 = 4, WebAssembly = 5 } diff --git a/src/CppParser/Decl.h b/src/CppParser/Decl.h index 2a26940a7..99c972eb0 100644 --- a/src/CppParser/Decl.h +++ b/src/CppParser/Decl.h @@ -473,7 +473,7 @@ namespace CppSharp ARM, AArch64, iOS, - iOS64, + AppleARM64, WebAssembly }; diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp index 02b83ebb8..1edc0850c 100644 --- a/src/CppParser/Parser.cpp +++ b/src/CppParser/Parser.cpp @@ -105,7 +105,7 @@ static CppAbi GetClassLayoutAbi(clang::TargetCXXABI::Kind abi) case clang::TargetCXXABI::iOS: return CppAbi::iOS; case clang::TargetCXXABI::AppleARM64: - return CppAbi::iOS64; + return CppAbi::AppleARM64; case clang::TargetCXXABI::WebAssembly: return CppAbi::WebAssembly; default: @@ -237,7 +237,7 @@ ConvertToClangTargetCXXABI(CppSharp::CppParser::AST::CppAbi abi) return TargetCXXABI::GenericARM; case CppSharp::CppParser::AST::CppAbi::iOS: return TargetCXXABI::iOS; - case CppSharp::CppParser::AST::CppAbi::iOS64: + case CppSharp::CppParser::AST::CppAbi::AppleARM64: return TargetCXXABI::AppleARM64; } diff --git a/src/Parser/ASTConverter.cs b/src/Parser/ASTConverter.cs index f74799ef1..81332f027 100644 --- a/src/Parser/ASTConverter.cs +++ b/src/Parser/ASTConverter.cs @@ -1723,8 +1723,8 @@ AST.CppAbi VisitCppAbi(CppAbi abi) return AST.CppAbi.AArch64; case CppAbi.iOS: return AST.CppAbi.iOS; - case CppAbi.iOS64: - return AST.CppAbi.iOS64; + case CppAbi.AppleARM64: + return AST.CppAbi.AppleARM64; case CppAbi.WebAssembly: return AST.CppAbi.WebAssembly; default: