* Flavors
*/
-#define ARM_THREAD_STATE 1
+#define ARM_THREAD_STATE 1
#define ARM_UNIFIED_THREAD_STATE ARM_THREAD_STATE
-#define ARM_VFP_STATE 2
-#define ARM_EXCEPTION_STATE 3
-#define ARM_DEBUG_STATE 4 /* pre-armv8 */
-#define THREAD_STATE_NONE 5
-#define ARM_THREAD_STATE64 6
-#define ARM_EXCEPTION_STATE64 7
-// ARM_THREAD_STATE_LAST (legacy) 8
-#define ARM_THREAD_STATE32 9
+#define ARM_VFP_STATE 2
+#define ARM_EXCEPTION_STATE 3
+#define ARM_DEBUG_STATE 4 /* pre-armv8 */
+#define THREAD_STATE_NONE 5
+#define ARM_THREAD_STATE64 6
+#define ARM_EXCEPTION_STATE64 7
+// ARM_THREAD_STATE_LAST 8 /* legacy */
+#define ARM_THREAD_STATE32 9
/* API */
-#define ARM_DEBUG_STATE32 14
-#define ARM_DEBUG_STATE64 15
-#define ARM_NEON_STATE 16
-#define ARM_NEON_STATE64 17
-#define ARM_CPMU_STATE64 18
+#define ARM_DEBUG_STATE32 14
+#define ARM_DEBUG_STATE64 15
+#define ARM_NEON_STATE 16
+#define ARM_NEON_STATE64 17
+#define ARM_CPMU_STATE64 18
#ifdef XNU_KERNEL_PRIVATE
/* For kernel use */
-#define ARM_SAVED_STATE32 20
-#define ARM_SAVED_STATE64 21
-#define ARM_NEON_SAVED_STATE32 22
-#define ARM_NEON_SAVED_STATE64 23
+#define ARM_SAVED_STATE32 20
+#define ARM_SAVED_STATE64 21
+#define ARM_NEON_SAVED_STATE32 22
+#define ARM_NEON_SAVED_STATE64 23
#endif /* XNU_KERNEL_PRIVATE */
+
+#define ARM_STATE_FLAVOR_IS_OTHER_VALID(_flavor_) 0
+
+#define ARM_PAGEIN_STATE 27
+
#define VALID_THREAD_STATE_FLAVOR(x) \
-((x == ARM_THREAD_STATE) || \
- (x == ARM_VFP_STATE) || \
- (x == ARM_EXCEPTION_STATE) || \
- (x == ARM_DEBUG_STATE) || \
- (x == THREAD_STATE_NONE) || \
- (x == ARM_THREAD_STATE32) || \
- (x == ARM_THREAD_STATE64) || \
- (x == ARM_EXCEPTION_STATE64) || \
- (x == ARM_NEON_STATE) || \
- (x == ARM_NEON_STATE64) || \
- (x == ARM_DEBUG_STATE32) || \
- (x == ARM_DEBUG_STATE64))
+ ((x == ARM_THREAD_STATE) || \
+ (x == ARM_VFP_STATE) || \
+ (x == ARM_EXCEPTION_STATE) || \
+ (x == ARM_DEBUG_STATE) || \
+ (x == THREAD_STATE_NONE) || \
+ (x == ARM_THREAD_STATE32) || \
+ (x == ARM_THREAD_STATE64) || \
+ (x == ARM_EXCEPTION_STATE64) || \
+ (x == ARM_NEON_STATE) || \
+ (x == ARM_NEON_STATE64) || \
+ (x == ARM_DEBUG_STATE32) || \
+ (x == ARM_DEBUG_STATE64) || \
+ (x == ARM_PAGEIN_STATE) || \
+ (ARM_STATE_FLAVOR_IS_OTHER_VALID(x)))
struct arm_state_hdr {
uint32_t flavor;
};
typedef struct arm_state_hdr arm_state_hdr_t;
-typedef _STRUCT_ARM_THREAD_STATE arm_thread_state_t;
-typedef _STRUCT_ARM_THREAD_STATE arm_thread_state32_t;
-typedef _STRUCT_ARM_THREAD_STATE64 arm_thread_state64_t;
+typedef _STRUCT_ARM_THREAD_STATE arm_thread_state_t;
+typedef _STRUCT_ARM_THREAD_STATE arm_thread_state32_t;
+typedef _STRUCT_ARM_THREAD_STATE64 arm_thread_state64_t;
#if !defined(KERNEL)
#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL && defined(__arm64__)
+
+/* Accessor macros for arm_thread_state64_t pointer fields */
+
+/* Return pc field of arm_thread_state64_t as a data pointer value */
#define arm_thread_state64_get_pc(ts) \
__darwin_arm_thread_state64_get_pc(ts)
+/* Return pc field of arm_thread_state64_t as a function pointer. May return
+ * NULL if a valid function pointer cannot be constructed, the caller should
+ * fall back to the arm_thread_state64_get_pc() macro in that case. */
#define arm_thread_state64_get_pc_fptr(ts) \
__darwin_arm_thread_state64_get_pc_fptr(ts)
+/* Set pc field of arm_thread_state64_t to a function pointer */
#define arm_thread_state64_set_pc_fptr(ts, fptr) \
__darwin_arm_thread_state64_set_pc_fptr(ts, fptr)
+/* Return lr field of arm_thread_state64_t as a data pointer value */
#define arm_thread_state64_get_lr(ts) \
__darwin_arm_thread_state64_get_lr(ts)
+/* Return lr field of arm_thread_state64_t as a function pointer. May return
+ * NULL if a valid function pointer cannot be constructed, the caller should
+ * fall back to the arm_thread_state64_get_lr() macro in that case. */
#define arm_thread_state64_get_lr_fptr(ts) \
__darwin_arm_thread_state64_get_lr_fptr(ts)
+/* Set lr field of arm_thread_state64_t to a function pointer */
#define arm_thread_state64_set_lr_fptr(ts, fptr) \
__darwin_arm_thread_state64_set_lr_fptr(ts, fptr)
+/* Return sp field of arm_thread_state64_t as a data pointer value */
#define arm_thread_state64_get_sp(ts) \
__darwin_arm_thread_state64_get_sp(ts)
+/* Set sp field of arm_thread_state64_t to a data pointer value */
#define arm_thread_state64_set_sp(ts, ptr) \
__darwin_arm_thread_state64_set_sp(ts, ptr)
+/* Return fp field of arm_thread_state64_t as a data pointer value */
#define arm_thread_state64_get_fp(ts) \
__darwin_arm_thread_state64_get_fp(ts)
+/* Set fp field of arm_thread_state64_t to a data pointer value */
#define arm_thread_state64_set_fp(ts, ptr) \
__darwin_arm_thread_state64_set_fp(ts, ptr)
+
#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL && defined(__arm64__) */
#endif /* !defined(KERNEL) */
arm_thread_state64_t ts_64;
} uts;
};
-#define ts_32 uts.ts_32
-#define ts_64 uts.ts_64
+#define ts_32 uts.ts_32
+#define ts_64 uts.ts_64
typedef struct arm_unified_thread_state arm_unified_thread_state_t;
#define ARM_THREAD_STATE_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_thread_state_t)/sizeof(uint32_t)))
+ (sizeof (arm_thread_state_t)/sizeof(uint32_t)))
#define ARM_THREAD_STATE32_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_thread_state32_t)/sizeof(uint32_t)))
+ (sizeof (arm_thread_state32_t)/sizeof(uint32_t)))
#define ARM_THREAD_STATE64_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_thread_state64_t)/sizeof(uint32_t)))
+ (sizeof (arm_thread_state64_t)/sizeof(uint32_t)))
#define ARM_UNIFIED_THREAD_STATE_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_unified_thread_state_t)/sizeof(uint32_t)))
+ (sizeof (arm_unified_thread_state_t)/sizeof(uint32_t)))
+
+typedef _STRUCT_ARM_VFP_STATE arm_vfp_state_t;
+typedef _STRUCT_ARM_NEON_STATE arm_neon_state_t;
+typedef _STRUCT_ARM_NEON_STATE arm_neon_state32_t;
+typedef _STRUCT_ARM_NEON_STATE64 arm_neon_state64_t;
-typedef _STRUCT_ARM_VFP_STATE arm_vfp_state_t;
-typedef _STRUCT_ARM_NEON_STATE arm_neon_state_t;
-typedef _STRUCT_ARM_NEON_STATE arm_neon_state32_t;
-typedef _STRUCT_ARM_NEON_STATE64 arm_neon_state64_t;
-typedef _STRUCT_ARM_EXCEPTION_STATE arm_exception_state_t;
-typedef _STRUCT_ARM_EXCEPTION_STATE arm_exception_state32_t;
-typedef _STRUCT_ARM_EXCEPTION_STATE64 arm_exception_state64_t;
+typedef _STRUCT_ARM_EXCEPTION_STATE arm_exception_state_t;
+typedef _STRUCT_ARM_EXCEPTION_STATE arm_exception_state32_t;
+typedef _STRUCT_ARM_EXCEPTION_STATE64 arm_exception_state64_t;
-typedef _STRUCT_ARM_DEBUG_STATE32 arm_debug_state32_t;
-typedef _STRUCT_ARM_DEBUG_STATE64 arm_debug_state64_t;
+typedef _STRUCT_ARM_DEBUG_STATE32 arm_debug_state32_t;
+typedef _STRUCT_ARM_DEBUG_STATE64 arm_debug_state64_t;
+
+typedef _STRUCT_ARM_PAGEIN_STATE arm_pagein_state_t;
#if defined(XNU_KERNEL_PRIVATE) && defined(__arm64__)
/* See below for ARM64 kernel structure definition for arm_debug_state. */
-#else
+#else /* defined(XNU_KERNEL_PRIVATE) && defined(__arm64__) */
/*
* Otherwise not ARM64 kernel and we must preserve legacy ARM definitions of
* arm_debug_state for binary compatability of userland consumers of this file.
*/
#if defined(__arm__)
-typedef _STRUCT_ARM_DEBUG_STATE arm_debug_state_t;
+typedef _STRUCT_ARM_DEBUG_STATE arm_debug_state_t;
#elif defined(__arm64__)
-typedef _STRUCT_ARM_LEGACY_DEBUG_STATE arm_debug_state_t;
-#else
+typedef _STRUCT_ARM_LEGACY_DEBUG_STATE arm_debug_state_t;
+#else /* defined(__arm__) */
#error Undefined architecture
-#endif
-#endif
+#endif /* defined(__arm__) */
+#endif /* defined(XNU_KERNEL_PRIVATE) && defined(__arm64__) */
#define ARM_VFP_STATE_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_vfp_state_t)/sizeof(uint32_t)))
+ (sizeof (arm_vfp_state_t)/sizeof(uint32_t)))
#define ARM_EXCEPTION_STATE_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_exception_state_t)/sizeof(uint32_t)))
+ (sizeof (arm_exception_state_t)/sizeof(uint32_t)))
#define ARM_EXCEPTION_STATE64_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_exception_state64_t)/sizeof(uint32_t)))
+ (sizeof (arm_exception_state64_t)/sizeof(uint32_t)))
#define ARM_DEBUG_STATE_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_debug_state_t)/sizeof(uint32_t)))
+ (sizeof (arm_debug_state_t)/sizeof(uint32_t)))
#define ARM_DEBUG_STATE32_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_debug_state32_t)/sizeof(uint32_t)))
+ (sizeof (arm_debug_state32_t)/sizeof(uint32_t)))
+
+#define ARM_PAGEIN_STATE_COUNT ((mach_msg_type_number_t) \
+ (sizeof (arm_pagein_state_t)/sizeof(uint32_t)))
#define ARM_DEBUG_STATE64_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_debug_state64_t)/sizeof(uint32_t)))
+ (sizeof (arm_debug_state64_t)/sizeof(uint32_t)))
#define ARM_NEON_STATE_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_neon_state_t)/sizeof(uint32_t)))
+ (sizeof (arm_neon_state_t)/sizeof(uint32_t)))
#define ARM_NEON_STATE64_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_neon_state64_t)/sizeof(uint32_t)))
+ (sizeof (arm_neon_state64_t)/sizeof(uint32_t)))
+
+#define MACHINE_THREAD_STATE ARM_THREAD_STATE
+#define MACHINE_THREAD_STATE_COUNT ARM_UNIFIED_THREAD_STATE_COUNT
-#define MACHINE_THREAD_STATE ARM_THREAD_STATE
-#define MACHINE_THREAD_STATE_COUNT ARM_UNIFIED_THREAD_STATE_COUNT
/*
* Largest state on this machine:
*/
-#define THREAD_MACHINE_STATE_MAX THREAD_STATE_MAX
+#define THREAD_MACHINE_STATE_MAX THREAD_STATE_MAX
#ifdef XNU_KERNEL_PRIVATE
#if defined(__arm__)
#include <arm/proc_reg.h>
-#define ARM_SAVED_STATE THREAD_STATE_NONE + 1
+#define ARM_SAVED_STATE (THREAD_STATE_NONE + 1)
struct arm_saved_state {
- uint32_t r[13]; /* General purpose register r0-r12 */
- uint32_t sp; /* Stack pointer r13 */
- uint32_t lr; /* Link register r14 */
- uint32_t pc; /* Program counter r15 */
- uint32_t cpsr; /* Current program status register */
- uint32_t fsr; /* Fault status */
- uint32_t far; /* Virtual Fault Address */
- uint32_t exception;/* exception number */
+ uint32_t r[13]; /* General purpose register r0-r12 */
+ uint32_t sp; /* Stack pointer r13 */
+ uint32_t lr; /* Link register r14 */
+ uint32_t pc; /* Program counter r15 */
+ uint32_t cpsr; /* Current program status register */
+ uint32_t fsr; /* Fault status */
+ uint32_t far; /* Virtual Fault Address */
+ uint32_t exception; /* exception number */
};
typedef struct arm_saved_state arm_saved_state_t;
*/
typedef struct arm_saved_state arm_saved_state32_t;
+static inline void
+copy_signed_thread_state(arm_saved_state_t *dst, const arm_saved_state_t *src)
+{
+ *dst = *src;
+}
+
static inline arm_saved_state32_t*
saved_state32(arm_saved_state_t *iss)
{
struct arm_saved_state_tagged {
- uint32_t tag;
- struct arm_saved_state state;
+ uint32_t tag;
+ struct arm_saved_state state;
};
typedef struct arm_saved_state_tagged arm_saved_state_tagged_t;
#define ARM_SAVED_STATE32_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_saved_state_t)/sizeof(unsigned int)))
+ (sizeof (arm_saved_state_t)/sizeof(unsigned int)))
static inline register_t
return iss->pc;
}
+static inline void
+add_saved_state_pc(arm_saved_state_t *iss, int diff)
+{
+ iss->pc += diff;
+}
+
static inline void
set_saved_state_pc(arm_saved_state_t *iss, register_t pc)
{
return iss->cpsr;
}
+static inline void
+mask_saved_state_cpsr(arm_saved_state_t *iss, uint32_t set_bits, uint32_t clear_bits)
+{
+ iss->cpsr |= set_bits;
+ iss->cpsr &= clear_bits;
+}
+
static inline void
set_saved_state_cpsr(arm_saved_state_t *iss, register_t cpsr)
{
*/
struct arm_saved_state32 {
- uint32_t r[13]; /* General purpose register r0-r12 */
- uint32_t sp; /* Stack pointer r13 */
- uint32_t lr; /* Link register r14 */
- uint32_t pc; /* Program counter r15 */
- uint32_t cpsr; /* Current program status register */
- uint32_t far; /* Virtual fault address */
- uint32_t esr; /* Exception syndrome register */
- uint32_t exception; /* Exception number */
+ uint32_t r[13]; /* General purpose register r0-r12 */
+ uint32_t sp; /* Stack pointer r13 */
+ uint32_t lr; /* Link register r14 */
+ uint32_t pc; /* Program counter r15 */
+ uint32_t cpsr; /* Current program status register */
+ uint32_t far; /* Virtual fault address */
+ uint32_t esr; /* Exception syndrome register */
+ uint32_t exception; /* Exception number */
};
typedef struct arm_saved_state32 arm_saved_state32_t;
struct arm_saved_state32_tagged {
- uint32_t tag;
- struct arm_saved_state32 state;
+ uint32_t tag;
+ struct arm_saved_state32 state;
};
typedef struct arm_saved_state32_tagged arm_saved_state32_tagged_t;
#define ARM_SAVED_STATE32_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_saved_state32_t)/sizeof(unsigned int)))
+ (sizeof(arm_saved_state32_t)/sizeof(unsigned int)))
struct arm_saved_state64 {
- uint64_t x[29]; /* General purpose registers x0-x28 */
- uint64_t fp; /* Frame pointer x29 */
- uint64_t lr; /* Link register x30 */
- uint64_t sp; /* Stack pointer x31 */
- uint64_t pc; /* Program counter */
- uint32_t cpsr; /* Current program status register */
- uint32_t reserved; /* Reserved padding */
- uint64_t far; /* Virtual fault address */
- uint32_t esr; /* Exception syndrome register */
- uint32_t exception; /* Exception number */
+ uint64_t x[29]; /* General purpose registers x0-x28 */
+ uint64_t fp; /* Frame pointer x29 */
+ uint64_t lr; /* Link register x30 */
+ uint64_t sp; /* Stack pointer x31 */
+ uint64_t pc; /* Program counter */
+ uint32_t cpsr; /* Current program status register */
+ uint32_t reserved; /* Reserved padding */
+ uint64_t far; /* Virtual fault address */
+ uint32_t esr; /* Exception syndrome register */
+ uint32_t exception; /* Exception number */
+#if defined(HAS_APPLE_PAC)
+ uint64_t jophash;
+#endif /* defined(HAS_APPLE_PAC) */
};
typedef struct arm_saved_state64 arm_saved_state64_t;
#define ARM_SAVED_STATE64_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_saved_state64_t)/sizeof(unsigned int)))
+ (sizeof(arm_saved_state64_t)/sizeof(unsigned int)))
struct arm_saved_state64_tagged {
- uint32_t tag;
- struct arm_saved_state64 state;
+ uint32_t tag;
+ struct arm_saved_state64 state;
};
typedef struct arm_saved_state64_tagged arm_saved_state64_tagged_t;
struct arm_saved_state64 ss_64;
} uss;
} __attribute__((aligned(16)));
-#define ss_32 uss.ss_32
-#define ss_64 uss.ss_64
+#define ss_32 uss.ss_32
+#define ss_64 uss.ss_64
typedef struct arm_saved_state arm_saved_state_t;
+#if defined(XNU_KERNEL_PRIVATE)
+#if defined(HAS_APPLE_PAC)
+/*
+ * Methods used to sign and check thread state to detect corruptions of saved
+ * thread state across exceptions and context switches.
+ */
+extern void ml_sign_thread_state(arm_saved_state_t *, uint64_t, uint32_t, uint64_t, uint64_t, uint64_t);
+
+extern void ml_check_signed_state(const arm_saved_state_t *, uint64_t, uint32_t, uint64_t, uint64_t, uint64_t);
+
+/* XXX: including stddef.f here breaks ctfmerge on some builds, so use __builtin_offsetof() instead of offsetof() */
+#define ss64_offsetof(x) __builtin_offsetof(struct arm_saved_state, ss_64.x)
+
+/**
+ * Verify the signed thread state in _iss, execute the assembly instructions
+ * _instr, and re-sign the modified thread state. Varargs specify additional
+ * inputs.
+ *
+ * _instr may read or modify the thread state in the following registers:
+ *
+ * x0: _iss
+ * x1: authed _iss->ss_64.pc
+ * w2: authed _iss->ss_64.cpsr
+ * x3: authed _iss->ss_64.lr
+ * x4: authed _iss->ss_64.x16
+ * x5: authed _iss->ss_64.x17
+ * x6: scratch register
+ * x7: scratch register
+ */
+#define MANIPULATE_SIGNED_THREAD_STATE(_iss, _instr, ...) \
+ asm volatile ( \
+ "mov x8, lr" "\n" \
+ "mov x0, %[iss]" "\n" \
+ "ldp x4, x5, [x0, %[SS64_X16]]" "\n" \
+ "ldr x6, [x0, %[SS64_PC]]" "\n" \
+ "ldr w7, [x0, %[SS64_CPSR]]" "\n" \
+ "ldr x3, [x0, %[SS64_LR]]" "\n" \
+ "mov x1, x6" "\n" \
+ "mov w2, w7" "\n" \
+ "bl _ml_check_signed_state" "\n" \
+ "mov x1, x6" "\n" \
+ "mov w2, w7" "\n" \
+ _instr "\n" \
+ "bl _ml_sign_thread_state" "\n" \
+ "mov lr, x8" "\n" \
+ : \
+ : [iss] "r"(_iss), \
+ [SS64_X16] "i"(ss64_offsetof(x[16])), \
+ [SS64_PC] "i"(ss64_offsetof(pc)), \
+ [SS64_CPSR] "i"(ss64_offsetof(cpsr)), \
+ [SS64_LR] "i"(ss64_offsetof(lr)),##__VA_ARGS__ \
+ : "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8" \
+ )
+
+static inline void
+check_and_sign_copied_thread_state(arm_saved_state_t *dst, const arm_saved_state_t *src)
+{
+ MANIPULATE_SIGNED_THREAD_STATE(src,
+ "mov x0, %[dst]",
+ [dst] "r"(dst)
+ );
+}
+#endif /* defined(HAS_APPLE_PAC) */
+
+static inline void
+copy_signed_thread_state(arm_saved_state_t *dst, const arm_saved_state_t *src)
+{
+ *dst = *src;
+#if defined(HAS_APPLE_PAC)
+ check_and_sign_copied_thread_state(dst, src);
+#endif
+}
+
+#endif /* defined(XNU_KERNEL_PRIVATE) */
static inline boolean_t
is_saved_state32(const arm_saved_state_t *iss)
return is_saved_state32(iss) ? const_saved_state32(iss)->pc : const_saved_state64(iss)->pc;
}
+static inline void
+add_saved_state_pc(arm_saved_state_t *iss, int diff)
+{
+ if (is_saved_state32(iss)) {
+ uint64_t pc = saved_state32(iss)->pc + diff;
+ saved_state32(iss)->pc = CAST_ASSERT_SAFE(uint32_t, pc);
+ } else {
+#if defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC)
+ MANIPULATE_SIGNED_THREAD_STATE(iss,
+ "mov w6, %w[diff] \n"
+ "add x1, x1, w6, sxtw \n"
+ "str x1, [x0, %[SS64_PC]] \n",
+ [diff] "r"(diff)
+ );
+#else
+ saved_state64(iss)->pc += diff;
+#endif /* defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC) */
+ }
+}
+
static inline void
set_saved_state_pc(arm_saved_state_t *iss, register_t pc)
{
if (is_saved_state32(iss)) {
saved_state32(iss)->pc = CAST_ASSERT_SAFE(uint32_t, pc);
} else {
+#if defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC)
+ MANIPULATE_SIGNED_THREAD_STATE(iss,
+ "mov x1, %[pc] \n"
+ "str x1, [x0, %[SS64_PC]] \n",
+ [pc] "r"(pc)
+ );
+#else
saved_state64(iss)->pc = pc;
+#endif /* defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC) */
}
}
if (is_saved_state32(iss)) {
saved_state32(iss)->lr = CAST_ASSERT_SAFE(uint32_t, lr);
} else {
+#if defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC)
+ MANIPULATE_SIGNED_THREAD_STATE(iss,
+ "mov x3, %[lr] \n"
+ "str x3, [x0, %[SS64_LR]] \n",
+ [lr] "r"(lr)
+ );
+#else
saved_state64(iss)->lr = lr;
+#endif /* defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC) */
}
}
if (is_saved_state32(iss)) {
saved_state32(iss)->r[reg] = CAST_ASSERT_SAFE(uint32_t, value);
} else {
+#if defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC)
+ /* x16 and x17 are part of the jophash */
+ if (reg == 16) {
+ MANIPULATE_SIGNED_THREAD_STATE(iss,
+ "mov x4, %[value] \n"
+ "str x4, [x0, %[SS64_X16]] \n",
+ [value] "r"(value)
+ );
+ return;
+ } else if (reg == 17) {
+ MANIPULATE_SIGNED_THREAD_STATE(iss,
+ "mov x5, %[value] \n"
+ "str x5, [x0, %[SS64_X17]] \n",
+ [value] "r"(value),
+ [SS64_X17] "i"(ss64_offsetof(x[17]))
+ );
+ return;
+ }
+#endif
saved_state64(iss)->x[reg] = value;
}
}
return is_saved_state32(iss) ? const_saved_state32(iss)->cpsr : const_saved_state64(iss)->cpsr;
}
+static inline void
+mask_saved_state_cpsr(arm_saved_state_t *iss, uint32_t set_bits, uint32_t clear_bits)
+{
+ if (is_saved_state32(iss)) {
+ saved_state32(iss)->cpsr |= set_bits;
+ saved_state32(iss)->cpsr &= ~clear_bits;
+ } else {
+#if defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC)
+ MANIPULATE_SIGNED_THREAD_STATE(iss,
+ "mov w6, %w[set_bits] \n"
+ "orr w2, w2, w6, lsl #0 \n"
+ "mov w6, %w[clear_bits] \n"
+ "bic w2, w2, w6, lsl #0 \n"
+ "str w2, [x0, %[SS64_CPSR]] \n",
+ [set_bits] "r"(set_bits),
+ [clear_bits] "r"(clear_bits)
+ );
+#else
+ saved_state64(iss)->cpsr |= set_bits;
+ saved_state64(iss)->cpsr &= ~clear_bits;
+#endif /* defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC) */
+ }
+}
+
static inline void
set_saved_state_cpsr(arm_saved_state_t *iss, uint32_t cpsr)
{
if (is_saved_state32(iss)) {
saved_state32(iss)->cpsr = cpsr;
} else {
+#if defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC)
+ MANIPULATE_SIGNED_THREAD_STATE(iss,
+ "mov w2, %w[cpsr] \n"
+ "str w2, [x0, %[SS64_CPSR]] \n",
+ [cpsr] "r"(cpsr)
+ );
+#else
saved_state64(iss)->cpsr = cpsr;
+#endif /* defined(XNU_KERNEL_PRIVATE) && defined(HAS_APPLE_PAC) */
}
}
return is_saved_state32(iss) ? (int)const_saved_state32(iss)->r[12] : (int)const_saved_state64(iss)->x[ARM64_SYSCALL_CODE_REG_NUM]; /* Only first word counts here */
}
-typedef _STRUCT_ARM_LEGACY_DEBUG_STATE arm_legacy_debug_state_t;
+typedef _STRUCT_ARM_LEGACY_DEBUG_STATE arm_legacy_debug_state_t;
struct arm_debug_aggregate_state {
- arm_state_hdr_t dsh;
+ arm_state_hdr_t dsh;
union {
arm_debug_state32_t ds32;
arm_debug_state64_t ds64;
typedef struct arm_debug_aggregate_state arm_debug_state_t;
#define ARM_LEGACY_DEBUG_STATE_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_legacy_debug_state_t)/sizeof(uint32_t)))
+ (sizeof (arm_legacy_debug_state_t)/sizeof(uint32_t)))
/*
* NEON context
struct arm_neon_saved_state32 {
union {
- uint128_t q[16];
- uint64_t d[32];
- uint32_t s[32];
+ uint128_t q[16];
+ uint64_t d[32];
+ uint32_t s[32];
} v;
- uint32_t fpsr;
- uint32_t fpcr;
+ uint32_t fpsr;
+ uint32_t fpcr;
};
typedef struct arm_neon_saved_state32 arm_neon_saved_state32_t;
#define ARM_NEON_SAVED_STATE32_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_neon_saved_state32_t)/sizeof(unsigned int)))
+ (sizeof (arm_neon_saved_state32_t)/sizeof(unsigned int)))
struct arm_neon_saved_state64 {
union {
- uint128_t q[32];
- uint64x2_t d[32];
- uint32x4_t s[32];
+ uint128_t q[32];
+ uint64x2_t d[32];
+ uint32x4_t s[32];
} v;
- uint32_t fpsr;
- uint32_t fpcr;
+ uint32_t fpsr;
+ uint32_t fpcr;
};
typedef struct arm_neon_saved_state64 arm_neon_saved_state64_t;
#define ARM_NEON_SAVED_STATE64_COUNT ((mach_msg_type_number_t) \
- (sizeof (arm_neon_saved_state64_t)/sizeof(unsigned int)))
+ (sizeof (arm_neon_saved_state64_t)/sizeof(unsigned int)))
struct arm_neon_saved_state {
arm_state_hdr_t nsh;
} uns;
};
typedef struct arm_neon_saved_state arm_neon_saved_state_t;
-#define ns_32 uns.ns_32
-#define ns_64 uns.ns_64
+#define ns_32 uns.ns_32
+#define ns_64 uns.ns_64
static inline boolean_t
is_neon_saved_state32(const arm_neon_saved_state_t *state)
extern void saved_state_to_thread_state64(const arm_saved_state_t*, arm_thread_state64_t*);
extern void thread_state64_to_saved_state(const arm_thread_state64_t*, arm_saved_state_t*);
-#else
+#else /* defined(__arm__) */
#error Unknown arch
-#endif
+#endif /* defined(__arm__) */
extern void saved_state_to_thread_state32(const arm_saved_state_t*, arm_thread_state32_t*);
extern void thread_state32_to_saved_state(const arm_thread_state32_t*, arm_saved_state_t*);
#endif /* XNU_KERNEL_PRIVATE */
-#endif /* _ARM_THREAD_STATUS_H_ */
+#endif /* _ARM_THREAD_STATUS_H_ */
projects / apple / xnu.git / blobdiff