Handle directive arguments with * in them.

Some of the CFI directives from upstream include expressions such as:

   .cfi_adjust_cfa_offset 32*5+8

(Also the latest version of peg moves the go generate line to
delocate.peg.go.)

Change-Id: I21bdf9ae44f81e4eca7b3565c4581a670f621a80
Reviewed-on: https://boringssl-review.googlesource.com/25624
Reviewed-by: Adam Langley <agl@google.com>

util/fipstools/delocate.go

@@ -12,8 +12,6 @@
 // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-//go:generate peg delocate.peg
-
 // delocate performs several transformations of textual assembly code. See
 // crypto/fipsmodule/FIPS.md for an overview.
 package main

util/fipstools/delocate.peg

@@ -32,7 +32,7 @@ Directive <- '.' DirectiveName (WS Args)?
 DirectiveName <- [[A-Z0-9_]]+
 LocationDirective <- (".file" / ".loc") WS [^#\n]+
 Args <- Arg ((WS? ',' WS?) Arg)*
-Arg <- QuotedArg / [[0-9a-z%+\-_@.]]*
+Arg <- QuotedArg / [[0-9a-z%+\-*_@.]]*
 QuotedArg <- '"' QuotedText '"'
 QuotedText <- (EscapedChar / [^"])*
 LabelContainingDirective <- LabelContainingDirectiveName WS SymbolArgs

util/fipstools/testdata/x86_64-Basic/in.s

@@ -13,6 +13,7 @@ foo:
 	pushq %rbp
 	.cfi_def_cfa_offset 16
 	.cfi_offset 6, -16
+	.cfi_adjust_cfa_offset 32*5+8
 	movq %rsp, %rbp
 	movq %rdi, -24(%rbp)
 	movq -24(%rbp), %rax

util/fipstools/testdata/x86_64-Basic/out.s

@@ -16,6 +16,7 @@ foo:
 	pushq %rbp
 	.cfi_def_cfa_offset 16
 	.cfi_offset 6, -16
+	.cfi_adjust_cfa_offset 32*5+8
 	movq %rsp, %rbp
 	movq %rdi, -24(%rbp)
 	movq -24(%rbp), %rax