Asm: extract section names quoted with double quote characters

The original code could not extract .inittext in

	.section ".inittext","ax"

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

Units/parser-asm.r/gas-section.d/expected.tags

@@ -2,3 +2,5 @@ machine/asm.h	input.s	/^#include <machine\/asm.h>/;"	h	roles:system
 .rodata.cst8	input.s	/^	.section .rodata.cst8,"aM",@progbits,8$/;"	s	roles:placement
 one	input.s	/^one:	.double 1.0$/;"	l	roles:def
 limit	input.s	/^limit:	.double 0.29$/;"	l	roles:def
+.inittext	input-0.s	/^	.section ".inittext","ax"$/;"	s	roles:placement
+intcall	input-0.s	/^intcall:$/;"	l	roles:def

Units/parser-asm.r/gas-section.d/input-0.s

@@ -0,0 +1,14 @@
+/* Taken from linux/arch/x86/boot/bioscall.S */
+
+/*
+ * "Glove box" for BIOS calls.  Avoids the constant problems with BIOSes
+ * touching registers they shouldn't be.
+ */
+
+	.code16
+	.section ".inittext","ax"
+	.globl	intcall
+	.type	intcall, @function
+intcall:
+	/* Self-modify the INT instruction.  Ugly, but works. */
+	cmpb	%al, 3f

parsers/asm.c

@@ -450,6 +450,21 @@ static bool processCppMacroX (vString *identifier, int lastChar, vString *line)
 	return r;
 }
 
+static bool isEligibleAsSectionName (const vString *str)
+{
+	char *c = vStringValue(str);
+	while (*c)
+	{
+		if (!(isalnum(((unsigned char)*c))
+			  || (*c == '.')
+			  || (*c == '-')
+			  || (*c == '_')))
+			return false;
+		c++;
+	}
+	return true;
+}
+
 static const unsigned char *readLineViaCpp (const char *commentChars)
 {
 	static vString *line;
@@ -475,10 +490,39 @@ static const unsigned char *readLineViaCpp (const char *commentChars)
 				continue;
 
 			/* We cannot store these values to vString
-			 * Store a whitespace as a dummy value for them.
+			 * Store a whitespace as a dummy value for them, but...
 			 */
 			if (!truncation)
+			{
 				vStringPut (line, ' ');
+
+				/* Quoted from the info document of Gas:
+				   -------------------------------------
+				   For ELF targets, the assembler supports another type of '.section'
+				   directive for compatibility with the Solaris assembler:
+
+				   .section "NAME"[, FLAGS...]
+				   -------------------------------------
+
+				   If we replace "..." with ' ' here, we can lost the name
+				   of the section. */
+				const vString *str = cppGetLastCharOrStringContents();
+				if (str)
+				{
+					const char *section = strrstr (vStringValue (line), ".section");
+					if (section && isEligibleAsSectionName(str))
+					{
+						section += strlen(".section");
+						while (isspace((unsigned char)*section))
+							section++;
+						if (*section == '\0')
+						{
+							vStringCat (line, str);
+							vStringPut (line, ' ');
+						}
+					}
+				}
+			}
 		}
 		else if (c == '\n' || (extraLinesepChars[0] != '\0'
 							   && strchr (extraLinesepChars, c) != NULL))