fbc: name mangling for cva_list name mangling with arm32 and arm64 (aarch64) targets

- va_list on arm and aarch64 is actually in the std namespace requiring "St" to mangle "std::"

(cherry picked from commit 3fe5cd5)

Author: jayrm

changelog.txt

@@ -20,7 +20,8 @@ Version 1.07.2
 - sf.net #925: CSIGN/CUNSG preserve size when converting pointers on 64-bit and implict conversion of STEP value in FOR...NEXT statement
 - github #122: gfxlib2: linux GFX_NO_FRAME + GFX_OPENGL freezing at exit due to a dead lock between exit routines
 - use the multi-byte & wide character functions wctombs() & mbtowcs() when converting between string and wstring (Skyfish)
-- read objinfo for elf format files on arm32 and arm64 (aarch64) to allow automatic options and linking of libraries
+- fbc: read objinfo for elf format files on arm32 and arm64 (aarch64) to allow automatic options and linking of libraries
+- fbc: name mangling for cva_list name mangling with arm32 and arm64 (aarch64) targets
 
 
 Version 1.07.1

src/compiler/fb.bas

@@ -1519,7 +1519,7 @@ function fbGetBackendValistType _
 			end select
 
 		case FB_CPUFAMILY_ARM
-			typedef = FB_CVA_LIST_BUILTIN_POINTER
+			typedef = FB_CVA_LIST_BUILTIN_ARM
 
 		case FB_CPUFAMILY_AARCH64
 			typedef = FB_CVA_LIST_BUILTIN_AARCH64

src/compiler/fb.bi

@@ -489,6 +489,7 @@ enum FB_CVA_LIST_TYPEDEF
 	FB_CVA_LIST_BUILTIN_POINTER
 	FB_CVA_LIST_BUILTIN_C_STD
 	FB_CVA_LIST_BUILTIN_AARCH64
+	FB_CVA_LIST_BUILTIN_ARM
 end enum
 
 declare function fbGetBackendValistType () as FB_CVA_LIST_TYPEDEF

src/compiler/ir-hlc.bas

@@ -652,7 +652,7 @@ private function hGetUdtId( byval sym as FBSYMBOL ptr ) as string
 
 	'' gcc's __builtin_va_list needs an exact name
 	select case symbGetValistType( symbGetFullType( sym ), symbGetSubtype( sym ) )
-	case FB_CVA_LIST_BUILTIN_C_STD, FB_CVA_LIST_BUILTIN_AARCH64
+	case FB_CVA_LIST_BUILTIN_C_STD, FB_CVA_LIST_BUILTIN_AARCH64, FB_CVA_LIST_BUILTIN_ARM
 			function = *sym->id.alias
 			exit function
 	end select

src/compiler/parser-decl-symbtype.bas

@@ -459,7 +459,7 @@ private function cMangleModifier _
 					errReport( FB_ERRMSG_SYNTAXERROR )	
 				end select
 
-			case "__builtin_va_list"
+			case "__builtin_va_list", "__builtin_va_list[]"
 				select case dtype
 				case FB_DATATYPE_VOID
 					dtype = typeSetMangleDt( dtype, FB_DATATYPE_VA_LIST )
@@ -471,19 +471,7 @@ private function cMangleModifier _
 					'' now just back patch the original struct and
 					'' remember to document this on mangle modifier page.
 					'' subtype = symbCloneSymbol( subtype )
-					symbSetUdtIsValistStruct( subtype )
-				case else
-					errReport( FB_ERRMSG_SYNTAXERROR )	
-				end select
-
-			case "__builtin_va_list[]"
-				select case dtype
-				case FB_DATATYPE_STRUCT
-					dtype = typeSetMangleDt( dtype, FB_DATATYPE_VA_LIST )
-					'' TODO: don't clone, see note above.
-					''subtype = symbCloneSymbol( subtype )
-					symbSetUdtIsValistStruct( subtype )
-					symbSetUdtIsValistStructArray( subtype )
+					symbSetUdtValistType( subtype, fbGetBackendValistType() )
 				case else
 					errReport( FB_ERRMSG_SYNTAXERROR )	
 				end select

src/compiler/parser-proc.bas

@@ -447,15 +447,16 @@ sub cProcRetType _
 		case FB_DATATYPE_STRUCT
 			'' __builtin_va_list[] not allowed as a byval return type
 			if( subtype ) then
-				if( symbGetUdtIsValistStructArray( subtype ) ) then
+				select case symbGetUdtValistType( subtype )
+				case FB_CVA_LIST_BUILTIN_C_STD
 					if( ((pattrib and FB_PROCATTRIB_RETURNBYREF) = 0) and _
 						typeIsPtr( dtype ) = FALSE ) then
 						errReport( FB_ERRMSG_INVALIDDATATYPES )
 						'' error recovery: fake a type
 						dtype = typeAddrOf( dtype )
 						subtype = NULL
 					end if
-				end if
+				end select
 			end if
 
 		end select

src/compiler/symb-keyword.bas

@@ -485,8 +485,7 @@ sub symbKeywordTypeInit( )
 		'' subtype mangle modifier
 		'' don't clone struct, back patch the original only, see note in cMangleModifier()
 		'' TODO: s = symbCloneSymbol( s )
-		symbSetUdtIsValistStruct( s )
-		symbSetUdtIsValistStructArray( s )
+		symbSetUdtValistType( s, FB_CVA_LIST_BUILTIN_C_STD )
 
 		'' type cva_list as __va_list_tag alias "__builtin_va_list[]"
 		symbAddTypedef( pid, typeSetMangleDt( symbGetType( s ), FB_DATATYPE_VA_LIST ), s, symbGetLen( s ) )
@@ -524,7 +523,29 @@ sub symbKeywordTypeInit( )
 		'' subtype mangle modifier
 		'' don't clone struct, back patch the original only, see note in cMangleModifier()
 		'' TODO: s = symbCloneSymbol( s )
-		symbSetUdtIsValistStruct( s )
+		symbSetUdtValistType( s, FB_CVA_LIST_BUILTIN_AARCH64 )
+
+		'' type cva_list as __va_list alias "__builtin_va_list"
+		symbAddTypedef( pid, typeSetMangleDt( symbGetType( s ), FB_DATATYPE_VA_LIST ), s, symbGetLen( s ) )
+
+	case FB_CVA_LIST_BUILTIN_ARM
+		'' cva_list is from ARM definition:
+		''	typdef struct __va_list {
+		''		void *ap; 
+		''	} va_list;
+
+		s = symbStructBegin( NULL, NULL, NULL, "__va_list", "__va_list", FALSE, 0, FALSE, 0, 0 )
+
+		'' ap as any ptr
+		symbAddField( s, "ap", 0, dTB(), typeAddrOf( FB_DATATYPE_VOID ), NULL, 0, 0, 0 )
+
+		'' end type
+		symbStructEnd( s )
+
+		'' subtype mangle modifier
+		'' don't clone struct, back patch the original only, see note in cMangleModifier()
+		'' TODO: s = symbCloneSymbol( s )
+		symbSetUdtValistType( s, FB_CVA_LIST_BUILTIN_ARM )
 
 		'' type cva_list as __va_list alias "__builtin_va_list"
 		symbAddTypedef( pid, typeSetMangleDt( symbGetType( s ), FB_DATATYPE_VA_LIST ), s, symbGetLen( s ) )

src/compiler/symb-mangling.bas

@@ -509,20 +509,29 @@ sub symbMangleType _
 		if( typeGetDtOnly( dtype ) = FB_DATATYPE_STRUCT ) then
 			if( typeGetMangleDt( dtype ) = FB_DATATYPE_VA_LIST ) then
 
-				'' if the type was passed as byval ptr or byref
-				'' need to mangle in "A1_" to indicate the array type, but
-				'' not on aarch64, __va_list is a plain struct, it doesn't
-				'' need the array type specifier.
+				select case symbGetValistType( dtype, subtype )
+				case FB_CVA_LIST_BUILTIN_C_STD
+					'' if the type was passed as byval ptr or byref
+					'' need to mangle in "A1_" to indicate the array type, but
+					'' not on aarch64, __va_list is a plain struct, it doesn't
+					'' need the array type specifier.
 
-				if( symbIsValistStructArray( dtype, subtype ) ) then
 					if( (options and (FB_MANGLEOPT_HASREF or FB_MANGLEOPT_HASPTR)) <> 0 ) then
 						mangled += "A1_"
 					else
 						mangled += "P"
 					end if
-				end if
+					dtype = typeSetMangleDt( dtype, 0 )
+
+				case FB_CVA_LIST_BUILTIN_AARCH64, FB_CVA_LIST_BUILTIN_ARM
+					'' on arm and aarch targets, __builtin_va_list actually
+					'' maps to "std::__va_list" where "std::" has the mangling
+					'' identifier of "St"
+
+					mangled += "St"
+					dtype = typeSetMangleDt( dtype, 0 )
 
-				dtype = typeSetMangleDt( dtype, 0 )
+				end select
 			end if
 		end if
 	end if
@@ -532,7 +541,7 @@ sub symbMangleType _
 	''
 	assert( dtype = (typeGetDtOnly( dtype ) or (dtype and FB_DT_MANGLEMASK)) )
 
-	select case( dtype )
+	select case( typeGetDtOnly( dtype ) )
 	case FB_DATATYPE_STRUCT, FB_DATATYPE_ENUM
 		ns = symbGetNamespace( subtype )
 		if( ns = @symbGetGlobalNamespc( ) ) then

src/compiler/symb.bas

@@ -1613,8 +1613,7 @@ function symbGetValistType _
 	'' with a UDT subtype, or we might be looking at the UDT
 	'' itself.  Either way, we must look at the UDT itself to
 	'' determine if it is a struct or struct array type using
-	''   - symbGetUdtIsValistStruct()
-	''   - symbGetUdtIsValistStructArray()
+	''   - symbGetUdtValistType()
 
 	'' Determine the following:
 	''   1) va_list type?  (any target/va_list type)
@@ -1633,13 +1632,7 @@ function symbGetValistType _
 
 		case FB_DATATYPE_STRUCT
 			if( subtype ) then
-				if( symbGetUdtIsValistStruct( subtype ) ) then
-					if( symbGetUdtIsValistStructArray( subtype ) ) then
-						function = FB_CVA_LIST_BUILTIN_C_STD
-					else
-						function = FB_CVA_LIST_BUILTIN_AARCH64
-					end if
-				end if
+				function = symbGetUdtValistType( subtype )
 			end if
 
 		case else
@@ -1661,13 +1654,7 @@ function symbGetValistType _
 			end if
 
 		case FB_DATATYPE_STRUCT
-			if( symbGetUdtIsValistStruct( subtype ) ) then
-				if( symbGetUdtIsValistStructArray( subtype ) ) then
-					function = FB_CVA_LIST_BUILTIN_C_STD
-				else
-					function = FB_CVA_LIST_BUILTIN_AARCH64
-				end if
-			end if
+			function = symbGetUdtValistType( subtype )
 
 		end select
 

src/compiler/symb.bi

@@ -448,10 +448,9 @@ enum FB_UDTOPT
 	FB_UDTOPT_HASANONUNION          = &h2000
 	FB_UDTOPT_HASSTATICVAR          = &h4000
 	FB_UDTOPT_HASBITFIELD           = &h8000
-	FB_UDTOPT_ISVALISTSTRUCT        = &h10000
-	FB_UDTOPT_ISVALISTSTRUCTARRAY   = &h20000
-	FB_UDTOPT_ISWSTRING             = &h40000
-	FB_UDTOPT_ISZSTRING             = &h80000
+	FB_UDTOPT_ISWSTRING             = &h10000
+	FB_UDTOPT_ISZSTRING             = &h20000
+	FB_UDTOPT_VALISTTYPEMASK       = &hf00000
 end enum
 
 type FB_STRUCT_DBG
@@ -2272,11 +2271,8 @@ declare function symbCloneSimpleStruct( byval sym as FBSYMBOL ptr ) as FBSYMBOL
 #define symbSetUdtHasBitfield( s )   (s)->udt.options or= FB_UDTOPT_HASBITFIELD
 #define symbGetUdtHasBitfield( s ) (((s)->udt.options and FB_UDTOPT_HASBITFIELD) <> 0)
 
-#define symbSetUdtIsValistStruct( s )   (s)->udt.options or= FB_UDTOPT_ISVALISTSTRUCT
-#define symbGetUdtIsValistStruct( s ) (((s)->udt.options and FB_UDTOPT_ISVALISTSTRUCT) <> 0)
-
-#define symbSetUdtIsValistStructArray( s )   (s)->udt.options or= FB_UDTOPT_ISVALISTSTRUCTARRAY
-#define symbGetUdtIsValistStructArray( s ) (((s)->udt.options and FB_UDTOPT_ISVALISTSTRUCTARRAY) <> 0)
+#define symbSetUdtValistType( s, t )   (s)->udt.options or= (((t) shl 20) and FB_UDTOPT_VALISTTYPEMASK)
+#define symbGetUdtValistType( s )    (((s)->udt.options and FB_UDTOPT_VALISTTYPEMASK) shr 20)
 
 #define symbSetUdtIsZstring( s )   (s)->udt.options or= FB_UDTOPT_ISZSTRING
 #define symbGetUdtIsZstring( s ) (((s)->udt.options and FB_UDTOPT_ISZSTRING) <> 0 )