Skip to content

Updates to C++ ABI support #1823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 1, 2024
Merged

Updates to C++ ABI support #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3296426
Add support for AArch64 C++ ABI.
tritao Feb 1, 2024
89234b2
Update iOS64 ABI name to the more accurate AppleARM64.
tritao Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/AST/ASTContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ public enum CppAbi
Itanium,
Microsoft,
ARM,
AArch64,
iOS,
iOS64,
AppleARM64,
WebAssembly
}

Expand Down
2 changes: 1 addition & 1 deletion src/CppParser/Bindings/CLI/Decl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ namespace CppSharp
Microsoft = 1,
ARM = 2,
iOS = 3,
iOS64 = 4,
AppleARM64 = 4,
WebAssembly = 5
};

Expand Down
7 changes: 4 additions & 3 deletions src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6401,9 +6401,10 @@ public enum CppAbi
Itanium = 0,
Microsoft = 1,
ARM = 2,
iOS = 3,
iOS64 = 4,
WebAssembly = 5
AArch64 = 3,
iOS = 4,
AppleARM64 = 5,
WebAssembly = 6
}

public enum RecordArgABI
Expand Down
7 changes: 4 additions & 3 deletions src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6401,9 +6401,10 @@ public enum CppAbi
Itanium = 0,
Microsoft = 1,
ARM = 2,
iOS = 3,
iOS64 = 4,
WebAssembly = 5
AArch64 = 3,
iOS = 4,
AppleARM64 = 5,
WebAssembly = 6
}

public enum RecordArgABI
Expand Down
7 changes: 4 additions & 3 deletions src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6401,9 +6401,10 @@ public enum CppAbi
Itanium = 0,
Microsoft = 1,
ARM = 2,
iOS = 3,
iOS64 = 4,
WebAssembly = 5
AArch64 = 3,
iOS = 4,
AppleARM64 = 5,
WebAssembly = 6
}

public enum RecordArgABI
Expand Down
7 changes: 4 additions & 3 deletions src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6401,9 +6401,10 @@ public enum CppAbi
Itanium = 0,
Microsoft = 1,
ARM = 2,
iOS = 3,
iOS64 = 4,
WebAssembly = 5
AArch64 = 3,
iOS = 4,
AppleARM64 = 5,
WebAssembly = 6
}

public enum RecordArgABI
Expand Down
7 changes: 4 additions & 3 deletions src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6401,9 +6401,10 @@ public enum CppAbi
Itanium = 0,
Microsoft = 1,
ARM = 2,
iOS = 3,
iOS64 = 4,
WebAssembly = 5
AArch64 = 3,
iOS = 4,
AppleARM64 = 5,
WebAssembly = 6
}

public enum RecordArgABI
Expand Down
7 changes: 4 additions & 3 deletions src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6401,9 +6401,10 @@ public enum CppAbi
Itanium = 0,
Microsoft = 1,
ARM = 2,
iOS = 3,
iOS64 = 4,
WebAssembly = 5
AArch64 = 3,
iOS = 4,
AppleARM64 = 5,
WebAssembly = 6
}

public enum RecordArgABI
Expand Down
3 changes: 2 additions & 1 deletion src/CppParser/Decl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,9 @@ namespace CppSharp
Itanium,
Microsoft,
ARM,
AArch64,
iOS,
iOS64,
AppleARM64,
WebAssembly
};

Expand Down
8 changes: 6 additions & 2 deletions src/CppParser/Parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,12 @@ static CppAbi GetClassLayoutAbi(clang::TargetCXXABI::Kind abi)
return CppAbi::Itanium;
case clang::TargetCXXABI::GenericARM:
return CppAbi::ARM;
case clang::TargetCXXABI::GenericAArch64:
return CppAbi::AArch64;
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:
Expand Down Expand Up @@ -231,9 +233,11 @@ ConvertToClangTargetCXXABI(CppSharp::CppParser::AST::CppAbi abi)
return TargetCXXABI::Microsoft;
case CppSharp::CppParser::AST::CppAbi::ARM:
return TargetCXXABI::GenericARM;
case CppSharp::CppParser::AST::CppAbi::AArch64:
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;
}

Expand Down
1 change: 1 addition & 0 deletions src/Generator/AST/VTables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public static List<VTableComponent> GatherVTableMethodEntries(Class @class)
case CppAbi.Microsoft:
return GatherVTableMethodsMS(@class);
case CppAbi.Itanium:
default:
return GatherVTableMethodsItanium(@class);
}

Expand Down
6 changes: 4 additions & 2 deletions src/Parser/ASTConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1719,10 +1719,12 @@ AST.CppAbi VisitCppAbi(CppAbi abi)
return AST.CppAbi.Microsoft;
case CppAbi.ARM:
return AST.CppAbi.ARM;
case CppAbi.AArch64:
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:
Expand Down