Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions so3/avz/include/avz/domain.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,18 @@

#ifdef __ASSEMBLY__

.macro curdom rd,
tmp

// Compute the address of the stack bottom where cpu_info is located.
ldr \rd,
= (~(DOMAIN_STACK_SIZE - 1)) mov \tmp, sp and \rd, \tmp, \rd

// Get the address of the domain descriptor
ldr \rd,
[\rd].endm
/* clang-format off */
.macro curdom rd, tmp

// Compute the address of the stack bottom where cpu_info is located.
ldr \rd, = (~(DOMAIN_STACK_SIZE - 1))
mov \tmp, sp
and \rd, \tmp, \rd

// Get the address of the domain descriptor
ldr \rd, [\rd]
.endm
/* clang-format on */

#else /* __ASSEMBLY__ */

Expand Down
2 changes: 1 addition & 1 deletion target/virt64_capsule.its
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

fdt {
description = "Flattened Device Tree blob";
data = /incbin/("../so3/dts/virt64_guest.dtb");
data = /incbin/("../so3/dts/virt64_capsule.dtb");
type = "flat_dt";
arch = "arm64";
compression = "none";
Expand Down
Loading