From c8220b638b17cb9eb583cca15d1b02c36a28ed2f Mon Sep 17 00:00:00 2001
From: Erica Z <zerica@callcc.eu>
Date: Sun, 12 May 2024 10:55:05 +0200
Subject: [PATCH] replace asm keyword
when applying a custom set of CFLAGS under clang that does not include
-std=c99, asm is treated as a keyword and as such can not be used as an
identifier. this prevents the issue by renaming the offending variables.
---
amd64/emit.c | 4 ++--
arm64/emit.c | 4 ++--
rv64/emit.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/amd64/emit.c b/amd64/emit.c
index 9636209..2a9b9d2 100644
--- a/amd64/emit.c
+++ b/amd64/emit.c
@@ -60,7 +60,7 @@ enum {
static struct {
short op;
short cls;
- char *asm;
+ char *fmt;
} omap[] = {
{ Oadd, Ka, "+add%k %1, %=" },
{ Osub, Ka, "-sub%k %1, %=" },
@@ -393,7 +393,7 @@ emitins(Ins i, Fn *fn, FILE *f)
|| (omap[o].cls == Ka))
break;
}
- emitf(omap[o].asm, &i, fn, f);
+ emitf(omap[o].fmt, &i, fn, f);
break;
case Onop:
/* just do nothing for nops, they are inserted
diff --git a/arm64/emit.c b/arm64/emit.c
index 990d839..f5166e0 100644
--- a/arm64/emit.c
+++ b/arm64/emit.c
@@ -37,7 +37,7 @@ enum {
static struct {
short op;
short cls;
- char *asm;
+ char *fmt;
} omap[] = {
{ Oadd, Ki, "add %=, %0, %1" },
{ Oadd, Ka, "fadd %=, %0, %1" },
@@ -374,7 +374,7 @@ emitins(Ins *i, E *e)
|| (omap[o].cls == Ki && KBASE(i->cls) == 0))
break;
}
- emitf(omap[o].asm, i, e);
+ emitf(omap[o].fmt, i, e);
break;
case Onop:
break;
diff --git a/rv64/emit.c b/rv64/emit.c
index a410ddf..39b55ea 100644
--- a/rv64/emit.c
+++ b/rv64/emit.c
@@ -8,7 +8,7 @@ enum {
static struct {
short op;
short cls;
- char *asm;
+ char *fmt;
} omap[] = {
{ Oadd, Ki, "add%k %=, %0, %1" },
{ Oadd, Ka, "fadd.%k %=, %0, %1" },
@@ -326,7 +326,7 @@ emitins(Ins *i, Fn *fn, FILE *f)
|| (omap[o].cls == Ki && KBASE(i->cls) == 0))
break;
}
- emitf(omap[o].asm, i, fn, f);
+ emitf(omap[o].fmt, i, fn, f);
break;
case Ocopy:
if (req(i->to, i->arg[0]))