|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] xen/*/asm-offset: Fix bad copy&paste from x86
commit 98e79be5b60ac5f4fbcb064a9e11c30024929ff1
Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Mon Jan 29 11:39:32 2024 +0000
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Feb 23 17:43:06 2024 +0000
xen/*/asm-offset: Fix bad copy&paste from x86
All architectures have copy&pasted bad logic from x86.
OFFSET() having a trailing semi-colon within the macro expansion can be a
problematic pattern. It's benign in this case, but fix it anyway.
Perform style fixes for the other macros, and tame the mess of BLANK()
position to be consistent (one BLANK() after each block) so the intermediate
form is legible too.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Acked-by: Shawn Anastasio <sanastasio@xxxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
---
xen/arch/arm/arm32/asm-offsets.c | 15 ++++++++-------
xen/arch/arm/arm64/asm-offsets.c | 14 ++++++++------
xen/arch/ppc/ppc64/asm-offsets.c | 9 ++++++---
xen/arch/riscv/riscv64/asm-offsets.c | 10 +++++-----
xen/arch/x86/x86_64/asm-offsets.c | 9 +++++----
5 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/xen/arch/arm/arm32/asm-offsets.c b/xen/arch/arm/arm32/asm-offsets.c
index 05c692bb28..8bbb0f938e 100644
--- a/xen/arch/arm/arm32/asm-offsets.c
+++ b/xen/arch/arm/arm32/asm-offsets.c
@@ -14,12 +14,12 @@
#include <asm/setup.h>
#define DEFINE(_sym, _val) \
- asm volatile ("\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \
- : : "i" (_val) )
+ asm volatile ( "\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\""\
+ :: "i" (_val) )
#define BLANK() \
- asm volatile ( "\n.ascii\"==><==\"" : : )
+ asm volatile ( "\n.ascii\"==><==\"" )
#define OFFSET(_sym, _str, _mem) \
- DEFINE(_sym, offsetof(_str, _mem));
+ DEFINE(_sym, offsetof(_str, _mem))
void __dummy__(void)
{
@@ -62,18 +62,19 @@ void __dummy__(void)
BLANK();
DEFINE(CPUINFO_sizeof, sizeof(struct cpu_info));
+ BLANK();
OFFSET(VCPU_arch_saved_context, struct vcpu, arch.saved_context);
-
BLANK();
+
DEFINE(PROCINFO_sizeof, sizeof(struct proc_info_list));
OFFSET(PROCINFO_cpu_val, struct proc_info_list, cpu_val);
OFFSET(PROCINFO_cpu_mask, struct proc_info_list, cpu_mask);
OFFSET(PROCINFO_cpu_init, struct proc_info_list, cpu_init);
-
BLANK();
- OFFSET(INITINFO_stack, struct init_info, stack);
+ OFFSET(INITINFO_stack, struct init_info, stack);
+ BLANK();
}
/*
diff --git a/xen/arch/arm/arm64/asm-offsets.c b/xen/arch/arm/arm64/asm-offsets.c
index 7adb67a1b8..602ffa5b54 100644
--- a/xen/arch/arm/arm64/asm-offsets.c
+++ b/xen/arch/arm/arm64/asm-offsets.c
@@ -14,12 +14,12 @@
#include <asm/smccc.h>
#define DEFINE(_sym, _val) \
- asm volatile ("\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \
- : : "i" (_val) )
+ asm volatile ( "\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\""\
+ :: "i" (_val) )
#define BLANK() \
- asm volatile ( "\n.ascii\"==><==\"" : : )
+ asm volatile ( "\n.ascii\"==><==\"" )
#define OFFSET(_sym, _str, _mem) \
- DEFINE(_sym, offsetof(_str, _mem));
+ DEFINE(_sym, offsetof(_str, _mem))
void __dummy__(void)
{
@@ -48,13 +48,14 @@ void __dummy__(void)
DEFINE(CPUINFO_sizeof, sizeof(struct cpu_info));
OFFSET(CPUINFO_flags, struct cpu_info, flags);
+ BLANK();
OFFSET(VCPU_arch_saved_context, struct vcpu, arch.saved_context);
-
BLANK();
- OFFSET(INITINFO_stack, struct init_info, stack);
+ OFFSET(INITINFO_stack, struct init_info, stack);
BLANK();
+
OFFSET(SMCCC_RES_a0, struct arm_smccc_res, a0);
OFFSET(SMCCC_RES_a2, struct arm_smccc_res, a2);
OFFSET(ARM_SMCCC_1_2_REGS_X0_OFFS, struct arm_smccc_1_2_regs, a0);
@@ -66,6 +67,7 @@ void __dummy__(void)
OFFSET(ARM_SMCCC_1_2_REGS_X12_OFFS, struct arm_smccc_1_2_regs, a12);
OFFSET(ARM_SMCCC_1_2_REGS_X14_OFFS, struct arm_smccc_1_2_regs, a14);
OFFSET(ARM_SMCCC_1_2_REGS_X16_OFFS, struct arm_smccc_1_2_regs, a16);
+ BLANK();
}
/*
diff --git a/xen/arch/ppc/ppc64/asm-offsets.c b/xen/arch/ppc/ppc64/asm-offsets.c
index 634d7260e3..b95865092f 100644
--- a/xen/arch/ppc/ppc64/asm-offsets.c
+++ b/xen/arch/ppc/ppc64/asm-offsets.c
@@ -10,11 +10,11 @@
#define DEFINE(_sym, _val) \
asm volatile ( "\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \
- : : "i" (_val) )
+ :: "i" (_val) )
#define BLANK() \
- asm volatile ( "\n.ascii\"==><==\"" : : )
+ asm volatile ( "\n.ascii\"==><==\"" )
#define OFFSET(_sym, _str, _mem) \
- DEFINE(_sym, offsetof(_str, _mem));
+ DEFINE(_sym, offsetof(_str, _mem))
/* base-2 logarithm */
#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0)
@@ -29,6 +29,7 @@ void __dummy__(void)
DEFINE(GPR_WIDTH, sizeof(unsigned long));
DEFINE(FPR_WIDTH, sizeof(double));
+ BLANK();
OFFSET(UREGS_gprs, struct cpu_user_regs, gprs);
OFFSET(UREGS_r0, struct cpu_user_regs, gprs[0]);
@@ -48,9 +49,11 @@ void __dummy__(void)
OFFSET(UREGS_fpscr, struct cpu_user_regs, fpscr);
OFFSET(UREGS_entry_vector, struct cpu_user_regs, entry_vector);
DEFINE(UREGS_sizeof, sizeof(struct cpu_user_regs));
+ BLANK();
OFFSET(OPAL_base, struct opal, base);
OFFSET(OPAL_entry, struct opal, entry);
+ BLANK();
}
/*
diff --git a/xen/arch/riscv/riscv64/asm-offsets.c
b/xen/arch/riscv/riscv64/asm-offsets.c
index d632b75c2a..9f663b9510 100644
--- a/xen/arch/riscv/riscv64/asm-offsets.c
+++ b/xen/arch/riscv/riscv64/asm-offsets.c
@@ -4,16 +4,15 @@
#include <xen/types.h>
#define DEFINE(_sym, _val) \
- asm volatile ("\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \
- : : "i" (_val) )
+ asm volatile ( "\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\""\
+ :: "i" (_val) )
#define BLANK() \
- asm volatile ( "\n.ascii\"==><==\"" : : )
+ asm volatile ( "\n.ascii\"==><==\"" )
#define OFFSET(_sym, _str, _mem) \
- DEFINE(_sym, offsetof(_str, _mem));
+ DEFINE(_sym, offsetof(_str, _mem))
void asm_offsets(void)
{
- BLANK();
DEFINE(CPU_USER_REGS_SIZE, sizeof(struct cpu_user_regs));
OFFSET(CPU_USER_REGS_ZERO, struct cpu_user_regs, zero);
OFFSET(CPU_USER_REGS_RA, struct cpu_user_regs, ra);
@@ -50,4 +49,5 @@ void asm_offsets(void)
OFFSET(CPU_USER_REGS_SEPC, struct cpu_user_regs, sepc);
OFFSET(CPU_USER_REGS_SSTATUS, struct cpu_user_regs, sstatus);
OFFSET(CPU_USER_REGS_PREGS, struct cpu_user_regs, pregs);
+ BLANK();
}
diff --git a/xen/arch/x86/x86_64/asm-offsets.c
b/xen/arch/x86/x86_64/asm-offsets.c
index f9546ec60b..fee0edc61a 100644
--- a/xen/arch/x86/x86_64/asm-offsets.c
+++ b/xen/arch/x86/x86_64/asm-offsets.c
@@ -17,12 +17,12 @@
#include <xen/multiboot2.h>
#define DEFINE(_sym, _val) \
- asm volatile ("\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \
- : : "i" (_val) )
+ asm volatile ( "\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\""\
+ :: "i" (_val) )
#define BLANK() \
- asm volatile ( "\n.ascii\"==><==\"" : : )
+ asm volatile ( "\n.ascii\"==><==\"" )
#define OFFSET(_sym, _str, _mem) \
- DEFINE(_sym, offsetof(_str, _mem));
+ DEFINE(_sym, offsetof(_str, _mem))
void __dummy__(void)
{
@@ -180,4 +180,5 @@ void __dummy__(void)
BLANK();
OFFSET(DOMAIN_vm_assist, struct domain, vm_assist);
+ BLANK();
}
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |