Skip to content

[stdlib][SR-2239][5.0] Implement AAPCS64 variable argument list support. #21885

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.

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 1 commit into from
Jan 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions lib/ClangImporter/ImportDecl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,21 @@ getSwiftStdlibType(const clang::TypedefNameDecl *D,
break;

case MappedCTypeKind::VaList:
if (ClangTypeSize != ClangCtx.getTypeSize(ClangCtx.VoidPtrTy))
return std::make_pair(Type(), "");
switch (ClangCtx.getTargetInfo().getBuiltinVaListKind()) {
case clang::TargetInfo::CharPtrBuiltinVaList:
case clang::TargetInfo::VoidPtrBuiltinVaList:
case clang::TargetInfo::PowerABIBuiltinVaList:
case clang::TargetInfo::AAPCSABIBuiltinVaList:
assert(ClangCtx.getTypeSize(ClangCtx.VoidPtrTy) == ClangTypeSize &&
"expected va_list type to be sizeof(void *)");
break;
case clang::TargetInfo::AArch64ABIBuiltinVaList:
break;
case clang::TargetInfo::PNaClABIBuiltinVaList:
case clang::TargetInfo::SystemZBuiltinVaList:
case clang::TargetInfo::X86_64ABIBuiltinVaList:
return std::make_pair(Type(), "");
}
break;

case MappedCTypeKind::ObjCBool:
Expand Down
35 changes: 35 additions & 0 deletions stdlib/public/core/CTypes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,39 @@ extension UInt {
}

/// A wrapper around a C `va_list` pointer.
#if arch(arm64) && !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Windows))
@_fixed_layout
public struct CVaListPointer {
@usableFromInline // unsafe-performance
internal var _value: (__stack: UnsafeMutablePointer<Int>?,
__gr_top: UnsafeMutablePointer<Int>?,
__vr_top: UnsafeMutablePointer<Int>?,
__gr_off: Int32,
__vr_off: Int32)

@inlinable // unsafe-performance
public // @testable
init(__stack: UnsafeMutablePointer<Int>?,
__gr_top: UnsafeMutablePointer<Int>?,
__vr_top: UnsafeMutablePointer<Int>?,
__gr_off: Int32,
__vr_off: Int32) {
_value = (__stack, __gr_top, __vr_top, __gr_off, __vr_off)
}
}

extension CVaListPointer : CustomDebugStringConvertible {
public var debugDescription: String {
return "(\(_value.__stack.debugDescription), " +
"\(_value.__gr_top.debugDescription), " +
"\(_value.__vr_top.debugDescription), " +
"\(_value.__gr_off), " +
"\(_value.__vr_off))"
}
}

#else

@_fixed_layout
public struct CVaListPointer {
@usableFromInline // unsafe-performance
Expand All @@ -238,6 +271,8 @@ extension CVaListPointer : CustomDebugStringConvertible {
}
}

#endif

@inlinable
internal func _memcpy(
dest destination: UnsafeMutableRawPointer,
Expand Down
66 changes: 54 additions & 12 deletions stdlib/public/core/VarArgs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,23 @@ internal let _registerSaveWords = _countGPRegisters + _countFPRegisters * _fpReg
internal let _countGPRegisters = 16
@usableFromInline
internal let _registerSaveWords = _countGPRegisters

#elseif arch(arm64) && !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Windows))
// ARM Procedure Call Standard for aarch64. (IHI0055B)
// The va_list type may refer to any parameter in a parameter list may be in one
// of three memory locations depending on its type and position in the argument
// list :
// 1. GP register save area x0 - x7
// 2. 128-bit FP/SIMD register save area q0 - q7
// 3. Stack argument area
@usableFromInline
internal let _countGPRegisters = 8
@usableFromInline
internal let _countFPRegisters = 8
@usableFromInline
internal let _fpRegisterWords = 16 / MemoryLayout<Int>.size
@usableFromInline
internal let _registerSaveWords = _countGPRegisters + (_countFPRegisters * _fpRegisterWords)
#endif

#if arch(s390x)
Expand Down Expand Up @@ -391,7 +408,7 @@ extension Float80 : CVarArg, _CVarArgAligned {
public var _cVarArgEncoding: [Int] {
return _encodeBitsAsWords(self)
}

/// Returns the required alignment in bytes of
/// the value returned by `_cVarArgEncoding`.
@inlinable // FIXME(sil-serialize-all)
Expand All @@ -402,7 +419,7 @@ extension Float80 : CVarArg, _CVarArgAligned {
}
#endif

#if arch(x86_64) || arch(s390x)
#if arch(x86_64) || arch(s390x) || (arch(arm64) && !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Windows)))

/// An object that can manage the lifetime of storage backing a
/// `CVaListPointer`.
Expand All @@ -412,6 +429,7 @@ extension Float80 : CVarArg, _CVarArgAligned {
@_fixed_layout
@usableFromInline // c-abi
final internal class __VaListBuilder {
#if arch(x86_64) || arch(s390x)
@_fixed_layout // c-abi
@usableFromInline
internal struct Header {
Expand All @@ -428,15 +446,19 @@ final internal class __VaListBuilder {
@usableFromInline // c-abi
internal var reg_save_area: UnsafeMutablePointer<Int>?
}
#endif

@usableFromInline // c-abi
internal var gpRegistersUsed = 0
@usableFromInline // c-abi
internal var fpRegistersUsed = 0

#if arch(x86_64) || arch(s390x)
@usableFromInline // c-abi
final // Property must be final since it is used by Builtin.addressof.
internal var header = Header()
#endif

@usableFromInline // c-abi
internal var storage: ContiguousArray<Int>

Expand All @@ -453,12 +475,16 @@ final internal class __VaListBuilder {
internal func append(_ arg: CVarArg) {
var encoded = arg._cVarArgEncoding

#if arch(x86_64)
#if arch(x86_64) || arch(arm64)
let isDouble = arg is _CVarArgPassedAsDouble

if isDouble && fpRegistersUsed < _countFPRegisters {
var startIndex = _countGPRegisters
+ (fpRegistersUsed * _fpRegisterWords)
#if arch(arm64)
var startIndex = fpRegistersUsed * _fpRegisterWords
#else
var startIndex = _countGPRegisters
+ (fpRegistersUsed * _fpRegisterWords)
#endif
for w in encoded {
storage[startIndex] = w
startIndex += 1
Expand All @@ -468,7 +494,12 @@ final internal class __VaListBuilder {
else if encoded.count == 1
&& !isDouble
&& gpRegistersUsed < _countGPRegisters {
storage[gpRegistersUsed] = encoded[0]
#if arch(arm64)
let startIndex = ( _fpRegisterWords * _countFPRegisters) + gpRegistersUsed
#else
let startIndex = gpRegistersUsed
#endif
storage[startIndex] = encoded[0]
gpRegistersUsed += 1
}
else {
Expand All @@ -493,12 +524,23 @@ final internal class __VaListBuilder {

@inlinable // c-abi
internal func va_list() -> CVaListPointer {
header.reg_save_area = storage._baseAddress
header.overflow_arg_area
= storage._baseAddress + _registerSaveWords
return CVaListPointer(
_fromUnsafeMutablePointer: UnsafeMutableRawPointer(
Builtin.addressof(&self.header)))
#if arch(x86_64) || arch(s390x)
header.reg_save_area = storage._baseAddress
header.overflow_arg_area
= storage._baseAddress + _registerSaveWords
return CVaListPointer(
_fromUnsafeMutablePointer: UnsafeMutableRawPointer(
Builtin.addressof(&self.header)))
#elseif arch(arm64)
let vr_top = storage._baseAddress + (_fpRegisterWords * _countFPRegisters)
let gr_top = vr_top + _countGPRegisters

return CVaListPointer(__stack: gr_top,
__gr_top: gr_top,
__vr_top: vr_top,
__gr_off: -64,
__vr_off: -128)
#endif
}
}

Expand Down