From f4e7a636a85bab02e7ac0067c5c58768779900a0 Mon Sep 17 00:00:00 2001 From: Liam Bowen Date: Mon, 18 Apr 2022 18:50:23 +0000 Subject: [PATCH] Display warning for invalid RIP-relative addressing --- asm/assemble.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/asm/assemble.c b/asm/assemble.c index cd3f46936..dc5ee0235 100644 --- a/asm/assemble.c +++ b/asm/assemble.c @@ -2264,6 +2264,17 @@ static void gencode(struct out_data *data, insn *ins) rfield, rflags, ins, eat, &errmsg)) nasm_nonfatal("%s", errmsg); + /* If RIP-relative, indexreg and scale must not be present: + * [basereg + indexreg*scale + displacement] + * https://bugzilla.nasm.us/show_bug.cgi?id=3392797 + */ + if (bits == 64 && (opy->eaflags & EAF_REL) && + ((opy->indexreg != -1) || (opy->scale != -1))) { + nasm_warn(WARN_OTHER | ERR_PASS2, + "invalid addressing mode: RIP-relative address " + "cannot contain index register or scale"); + } + p = bytes; *p++ = ea_data.modrm; if (ea_data.sib_present)