handle AVX-512 mask register usage in fips delocation process

aws · Nov 15, 2023 · 0a3fbc1 · 0a3fbc1
1 parent 20cfdbb
commit 0a3fbc1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/util/fipstools/delocate/delocate.go b/util/fipstools/delocate/delocate.go
@@ -1373,6 +1373,13 @@ Args:
 		case ruleRegisterOrConstant, ruleLocalLabelRef:
 			args = append(args, d.contents(fullArg))
 
+		// The AVX-512 mask register is appended to its
+		// preceding `RegisterOrConstant` without whitespace
+		// or a comma.
+		case ruleAVX512Token:
+			tail := &args[len(args)-1];
+			*tail += d.contents(fullArg);
+
 		case ruleMemoryRef:
 			symbol, offset, section, didChange, symbolIsLocal, memRef := d.parseMemRef(arg.up)
 			changed = didChange

diff --git a/util/fipstools/delocate/delocate.peg b/util/fipstools/delocate/delocate.peg
@@ -72,7 +72,7 @@ LocalLabel <- [0-9][0-9$]*
 LocalLabelRef <- [0-9][0-9$]*[bf]
 Instruction <- InstructionName (WS InstructionArg ((WS? ','? WS?) InstructionArg)*)?
 InstructionName <- [[A-Z]][[A-Z.0-9]]* [.+\-]?
-InstructionArg <- IndirectionIndicator? (ARMConstantTweak / RegisterOrConstant / LocalLabelRef / TOCRefHigh / TOCRefLow / GOTLocation / GOTSymbolOffset / MemoryRef) AVX512Token*
+InstructionArg <- IndirectionIndicator? (ARMConstantTweak / RegisterOrConstant / LocalLabelRef / TOCRefHigh / TOCRefLow / GOTLocation / GOTSymbolOffset / MemoryRef / AVX512Token)
 GOTLocation <- '$_GLOBAL_OFFSET_TABLE_-' LocalSymbol
 GOTSymbolOffset <- ('$' SymbolName '@GOT' 'OFF'?) / (":got:" SymbolName)
 AVX512Token <- WS? '{' '%'? [0-9a-z]* '}'