Update iOS64 ABI name to the more accurate AppleARM64.

mono · Feb 1, 2024 · b5ab95e · b5ab95e
1 parent d1307a5
commit b5ab95e
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6403,7 +6403,7 @@ public enum CppAbi
                 ARM = 2,
                 AArch64 = 3,
                 iOS = 4,
-                iOS64 = 5,
+                AppleARM64 = 5,
                 WebAssembly = 6
             }
 

diff --git 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
@@ -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
@@ -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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ public enum CppAbi @@
             ARM,
             AArch64,
             iOS,
-            iOS64,
+            AppleARM64,
             WebAssembly
         }
@@ Expand Down @@