aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2024-11-13 23:21:17 +0100
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-12-20 17:44:57 +0100
commite3b64ebf494d07dfd6adf113115eac8819dbf0b0 (patch)
treef11d499730bae59c085becde0534dffc19205c0e
parentf9ba56a03c2e954c37737826203574a8cde0b3e3 (diff)
downloadqemu-e3b64ebf494d07dfd6adf113115eac8819dbf0b0.zip
qemu-e3b64ebf494d07dfd6adf113115eac8819dbf0b0.tar.gz
qemu-e3b64ebf494d07dfd6adf113115eac8819dbf0b0.tar.bz2
target/arm/cpu: Restrict cpu_untagged_addr() to user emulation
Move the #endif guard where it belongs to restrict the cpu_untagged_addr() implementation to user emulation. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20241114011310.3615-11-philmd@linaro.org>
-rw-r--r--target/arm/cpu.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index d86e641..12b8466 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -3355,8 +3355,8 @@ extern const uint64_t pred_esz_masks[5];
#define TAG_GRANULE (1 << LOG2_TAG_GRANULE)
#ifdef CONFIG_USER_ONLY
+
#define TARGET_PAGE_DATA_SIZE (TARGET_PAGE_SIZE >> (LOG2_TAG_GRANULE + 1))
-#endif
#ifdef TARGET_TAGGED_ADDRESSES
/**
@@ -3382,6 +3382,7 @@ static inline target_ulong cpu_untagged_addr(CPUState *cs, target_ulong x)
}
return x;
}
-#endif
+#endif /* TARGET_TAGGED_ADDRESSES */
+#endif /* CONFIG_USER_ONLY */
#endif