From: Jan Kiszka <jan.kis...@siemens.com>
No functional changes.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
hypervisor/arch/arm/include/asm/sysregs.h | 8 ++++----
hypervisor/arch/arm64/include/asm/sysregs.h | 5 +++--
inmates/lib/arm/include/asm/sysregs.h | 6 +++---
inmates/lib/arm64/include/asm/sysregs.h | 5 +++--
inmates/tests/x86/sse-demo.c | 10 +++++-----
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/hypervisor/arch/arm/include/asm/sysregs.h
b/hypervisor/arch/arm/include/asm/sysregs.h
index b7eaccf6..308278c4 100644
--- a/hypervisor/arch/arm/include/asm/sysregs.h
+++ b/hypervisor/arch/arm/include/asm/sysregs.h
@@ -288,17 +288,17 @@ asm(".arch_extension virt\n");
#define arm_write_sysreg_32(op1, crn, crm, op2, val) \
asm volatile ("mcr p15, "#op1", %0, "#crn", "#crm", "#op2"\n" \
- : : "r"((u32)(val)))
+ : : "r" ((u32)(val)))
#define arm_write_sysreg_64(op1, crm, val) \
asm volatile ("mcrr p15, "#op1", %Q0, %R0, "#crm"\n" \
- : : "r"((u64)(val)))
+ : : "r" ((u64)(val)))
#define arm_read_sysreg_32(op1, crn, crm, op2, val) \
asm volatile ("mrc p15, "#op1", %0, "#crn", "#crm", "#op2"\n" \
- : "=r"((u32)(val)))
+ : "=r" ((u32)(val)))
#define arm_read_sysreg_64(op1, crm, val) \
asm volatile ("mrrc p15, "#op1", %Q0, %R0, "#crm"\n" \
- : "=r"((u64)(val)))
+ : "=r" ((u64)(val)))
#define arm_read_banked_reg(reg, val) \
asm volatile ("mrs %0, " #reg "\n" : "=r" (val))
diff --git a/hypervisor/arch/arm64/include/asm/sysregs.h
b/hypervisor/arch/arm64/include/asm/sysregs.h
index 5acd6d12..868ef887 100644
--- a/hypervisor/arch/arm64/include/asm/sysregs.h
+++ b/hypervisor/arch/arm64/include/asm/sysregs.h
@@ -175,10 +175,11 @@
#define SYSREG_64(op1, crn, crm, op2) SYSREG_32(op1, crn, crm, op2)
#define arm_write_sysreg(sysreg, val) \
- asm volatile ("msr "__stringify(sysreg)", %0\n" : :
"r"((u64)(val)))
+ asm volatile ("msr "__stringify(sysreg)", %0\n" \
+ : : "r" ((u64)(val)))
#define arm_read_sysreg(sysreg, val) \
- asm volatile ("mrs %0, "__stringify(sysreg)"\n" : "=r"((val)))
+ asm volatile ("mrs %0, "__stringify(sysreg)"\n" : "=r" ((val)))
#endif /* __ASSEMBLY__ */
diff --git a/inmates/lib/arm/include/asm/sysregs.h
b/inmates/lib/arm/include/asm/sysregs.h
index c0b137c7..ae61155d 100644
--- a/inmates/lib/arm/include/asm/sysregs.h
+++ b/inmates/lib/arm/include/asm/sysregs.h
@@ -102,14 +102,14 @@ asm(".arch_extension virt\n");
#define arm_write_sysreg_32(op1, crn, crm, op2, val) \
asm volatile ("mcr p15, "#op1", %0, "#crn", "#crm", "#op2"\n" \
- : : "r"((u32)(val)))
+ : : "r" ((u32)(val)))
#define arm_read_sysreg_32(op1, crn, crm, op2, val) \
asm volatile ("mrc p15, "#op1", %0, "#crn", "#crm", "#op2"\n" \
- : "=r"((u32)(val)))
+ : "=r" ((u32)(val)))
#define arm_read_sysreg_64(op1, crm, val) \
asm volatile ("mrrc p15, "#op1", %Q0, %R0, "#crm"\n" \
- : "=r"((u64)(val)))
+ : "=r" ((u64)(val)))
#else /* __ASSEMBLY__ */
diff --git a/inmates/lib/arm64/include/asm/sysregs.h
b/inmates/lib/arm64/include/asm/sysregs.h
index 6d94a59f..fe6cb45b 100644
--- a/inmates/lib/arm64/include/asm/sysregs.h
+++ b/inmates/lib/arm64/include/asm/sysregs.h
@@ -90,10 +90,11 @@
#define SYSREG_32(op1, crn, crm, op2) s3_##op1 ##_##crn ##_##crm ##_##op2
#define arm_write_sysreg(sysreg, val) \
- asm volatile ("msr "__stringify(sysreg)", %0\n" : :
"r"((u64)(val)))
+ asm volatile ("msr "__stringify(sysreg)", %0\n" \
+ : : "r" ((u64)(val)))
#define arm_read_sysreg(sysreg, val) \
- asm volatile ("mrs %0, "__stringify(sysreg)"\n" : "=r"((val)))
+ asm volatile ("mrs %0, "__stringify(sysreg)"\n" : "=r" ((val)))
#include <asm/sysregs_common.h>
diff --git a/inmates/tests/x86/sse-demo.c b/inmates/tests/x86/sse-demo.c
index 237202d4..6b0801ca 100644
--- a/inmates/tests/x86/sse-demo.c
+++ b/inmates/tests/x86/sse-demo.c
@@ -39,7 +39,7 @@ void inmate_main(void)
printk("Testing SSE...\n");
asm volatile("addps %1, %0\t\n"
- : "+x"(f_result) : "x"(f_addend));
+ : "+x" (f_result) : "x" (f_addend));
/* Test raw result */
EXPECT_EQUAL(*(u32*)&f_result, 0x4426c000);
}
@@ -52,7 +52,7 @@ void inmate_main(void)
printk("Testing SSE2...\n");
d_result = d_b;
asm volatile("addsd %1, %0\t\n"
- : "+x"(d_result) : "m"(d_a));
+ : "+x" (d_result) : "m" (d_a));
EXPECT_EQUAL(d_result, 667);
}
@@ -60,7 +60,7 @@ void inmate_main(void)
d_result = 0;
printk("Testing AVX...\n");
asm volatile("vaddsd %2, %1, %0\t\n"
- : "=x"(d_result) : "x"(d_a), "m"(d_b));
+ : "=x" (d_result) : "x" (d_a), "m" (d_b));
EXPECT_EQUAL(d_result, 667);
}
@@ -72,7 +72,7 @@ void inmate_main(void)
if (x86_cpu_features.pclmulqdq && x86_cpu_features.avx) {
printk("Testing AVX PCLMULQDQ...\n");
asm volatile("vpclmulqdq %3, %2, %1, %0\t\n"
- : "=x"(x_result) : "x"(x_a), "x"(x_b), "i"(0));
+ : "=x" (x_result) : "x" (x_a), "x" (x_b), "i" (0));
EXPECT_EQUAL(x_result[0], 0x5ff61cc8b1043fa2);
EXPECT_EQUAL(x_result[1], 0x00009602d147dc12);
@@ -81,7 +81,7 @@ void inmate_main(void)
if (x86_cpu_features.pclmulqdq) {
printk("Testing PCLMULQDQ...\n");
asm volatile("pclmulqdq %2, %1, %0\t\n"
- : "+x"(x_a) : "x"(x_b), "i"(0));
+ : "+x" (x_a) : "x" (x_b), "i" (0));
EXPECT_EQUAL(x_a[0], 0x5ff61cc8b1043fa2);
EXPECT_EQUAL(x_a[1], 0x00009602d147dc12);
--
2.26.2
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/73386d74-0b76-1e5f-11c0-ee35c72ca8eb%40siemens.com.
