[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/14] target/arm: Create pauth_ptr_mask
From: |
Richard Henderson |
Subject: |
[PATCH 10/14] target/arm: Create pauth_ptr_mask |
Date: |
Tue, 14 Feb 2023 06:30:44 -1000 |
Keep the logic for pauth within pauth_helper.c, and expose
a helper function for use with the gdbstub pac extension.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/internals.h | 10 ++++++++++
target/arm/pauth_helper.c | 26 ++++++++++++++++++++++----
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index c98482561e..bb3983645d 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -1364,6 +1364,16 @@ int exception_target_el(CPUARMState *env);
bool arm_singlestep_active(CPUARMState *env);
bool arm_generate_debug_exceptions(CPUARMState *env);
+/**
+ * pauth_ptr_mask:
+ * @env: cpu context
+ * @ptr: selects between TTBR0 and TTBR1
+ * @data: selects between TBI and TBID
+ *
+ * Return a mask of the bits of @ptr that contain the authentication code.
+ */
+uint64_t pauth_ptr_mask(CPUARMState *env, uint64_t ptr, bool data);
+
/* Add the cpreg definitions for debug related system registers */
void define_debug_regs(ARMCPU *cpu);
diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
index d0483bf051..20f347332d 100644
--- a/target/arm/pauth_helper.c
+++ b/target/arm/pauth_helper.c
@@ -339,14 +339,32 @@ static uint64_t pauth_addpac(CPUARMState *env, uint64_t
ptr, uint64_t modifier,
return pac | ext | ptr;
}
-static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param)
+static uint64_t pauth_ptr_mask_internal(ARMVAParameters param)
{
- /* Note that bit 55 is used whether or not the regime has 2 ranges. */
- uint64_t extfield = sextract64(ptr, 55, 1);
int bot_pac_bit = 64 - param.tsz;
int top_pac_bit = 64 - 8 * param.tbi;
- return deposit64(ptr, bot_pac_bit, top_pac_bit - bot_pac_bit, extfield);
+ return MAKE_64BIT_MASK(bot_pac_bit, top_pac_bit - bot_pac_bit);
+}
+
+static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param)
+{
+ uint64_t mask = pauth_ptr_mask_internal(param);
+
+ /* Note that bit 55 is used whether or not the regime has 2 ranges. */
+ if (extract64(ptr, 55, 1)) {
+ return ptr | mask;
+ } else {
+ return ptr & ~mask;
+ }
+}
+
+uint64_t pauth_ptr_mask(CPUARMState *env, uint64_t ptr, bool data)
+{
+ ARMMMUIdx mmu_idx = arm_stage1_mmu_idx(env);
+ ARMVAParameters param = aa64_va_parameters(env, ptr, mmu_idx, data);
+
+ return pauth_ptr_mask_internal(param);
}
static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifier,
--
2.34.1
- [PATCH 00/14] target/arm: gdbstub cleanups and additions, Richard Henderson, 2023/02/14
- [PATCH 01/14] target/arm: Normalize aarch64 gdbstub get/set function names, Richard Henderson, 2023/02/14
- [PATCH 02/14] target/arm: Unexport arm_gen_dynamic_sysreg_xml, Richard Henderson, 2023/02/14
- [PATCH 04/14] target/arm: Split out output_vector_union_type, Richard Henderson, 2023/02/14
- [PATCH 07/14] target/arm: Fix svep width in arm_gen_dynamic_svereg_xml, Richard Henderson, 2023/02/14
- [PATCH 10/14] target/arm: Create pauth_ptr_mask,
Richard Henderson <=
- [PATCH 03/14] target/arm: Move arm_gen_dynamic_svereg_xml to gdbstub64.c, Richard Henderson, 2023/02/14
- [PATCH 05/14] target/arm: Simplify register counting in arm_gen_dynamic_svereg_xml, Richard Henderson, 2023/02/14
- [PATCH 06/14] target/arm: Hoist pred_width in arm_gen_dynamic_svereg_xml, Richard Henderson, 2023/02/14
- [PATCH 11/14] target/arm: Implement gdbstub pauth extension, Richard Henderson, 2023/02/14