Skip to content

Commit a454a18

Browse files
Merge pull request #185 from smartobjectoriented/184-clean-clang-formatted-assembly-declaration-in-a-h
Fix bad clang formating
2 parents 1b2d491 + 6077eb5 commit a454a18

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

so3/avz/include/avz/domain.h

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,18 @@
3434

3535
#ifdef __ASSEMBLY__
3636

37-
.macro curdom rd,
38-
tmp
39-
40-
// Compute the address of the stack bottom where cpu_info is located.
41-
ldr \rd,
42-
= (~(DOMAIN_STACK_SIZE - 1)) mov \tmp, sp and \rd, \tmp, \rd
43-
44-
// Get the address of the domain descriptor
45-
ldr \rd,
46-
[\rd].endm
37+
/* clang-format off */
38+
.macro curdom rd, tmp
39+
40+
// Compute the address of the stack bottom where cpu_info is located.
41+
ldr \rd, = (~(DOMAIN_STACK_SIZE - 1))
42+
mov \tmp, sp
43+
and \rd, \tmp, \rd
44+
45+
// Get the address of the domain descriptor
46+
ldr \rd, [\rd]
47+
.endm
48+
/* clang-format on */
4749

4850
#else /* __ASSEMBLY__ */
4951

target/virt64_capsule.its

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
fdt {
3838
description = "Flattened Device Tree blob";
39-
data = /incbin/("../so3/dts/virt64_guest.dtb");
39+
data = /incbin/("../so3/dts/virt64_capsule.dtb");
4040
type = "flat_dt";
4141
arch = "arm64";
4242
compression = "none";

0 commit comments

Comments
 (0)