From 50a9dd78263191474c948d53e837348abd0bf316 Mon Sep 17 00:00:00 2001 From: Henrik Gramner Date: Wed, 29 Mar 2017 16:43:57 +0200 Subject: [PATCH] x86inc: Fix call with memory operands We overload the `call` instruction with a macro, but it would misbehave when the macro argument wasn't a valid identifier. Fix it by explicitly checking if the argument is an identifier. --- common/x86/x86inc.asm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/x86/x86inc.asm b/common/x86/x86inc.asm index 03304c4a..6c2edf9a 100644 --- a/common/x86/x86inc.asm +++ b/common/x86/x86inc.asm @@ -1032,7 +1032,11 @@ INIT_XMM ; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't %macro call 1 - call_internal %1 %+ SUFFIX, %1 + %ifid %1 + call_internal %1 %+ SUFFIX, %1 + %else + call %1 + %endif %endmacro %macro call_internal 2 %xdefine %%i %2 -- 2.40.0