Skip to content

Commit

Permalink
target/arm: Warn about restoring to unaligned stack
Browse files Browse the repository at this point in the history
Attempting to do an exception return with an exception frame that
is not 8-aligned is UNPREDICTABLE in v8M; warn about this.
(It is not UNPREDICTABLE in v7M, and our implementation can
handle the merely-4-aligned case fine, so we don't need to
do anything except warn.)

Signed-off-by: Peter Maydell <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Message-id: [email protected]
  • Loading branch information
pm215 committed Oct 6, 2017
1 parent 224e0c3 commit cb484f9
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions target/arm/helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -6413,6 +6413,13 @@ static void do_v7m_exception_exit(ARMCPU *cpu)
return_to_sp_process);
uint32_t frameptr = *frame_sp_p;

if (!QEMU_IS_ALIGNED(frameptr, 8) &&
arm_feature(env, ARM_FEATURE_V8)) {
qemu_log_mask(LOG_GUEST_ERROR,
"M profile exception return with non-8-aligned SP "
"for destination state is UNPREDICTABLE\n");
}

/* Pop registers. TODO: make these accesses use the correct
* attributes and address space (S/NS, priv/unpriv) and handle
* memory transaction failures.
Expand Down

0 comments on commit cb484f9

Please sign in to comment.