mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-03-28 15:46:52 +00:00
configure: Define target access alignment in configure
This patch moves the define of target access alignment earlier from target/foo/cpu.h to configure. Suggested in Richard Henderson's reply to "[PATCH 1/4] tcg: TCGMemOp is now accelerator independent MemOp" Backports commit 52bf9771fdfce98e98cea36a17a18915be6f6b7f from qemu
This commit is contained in:
parent
c041f5f2cc
commit
b4c2c94602
12
qemu/configure
vendored
12
qemu/configure
vendored
|
@ -1634,11 +1634,16 @@ for target in $target_list; do
|
|||
target_dir="$target"
|
||||
config_target_mak=$target_dir/config-target.mak
|
||||
target_name=$(echo $target | cut -d '-' -f 1)
|
||||
target_aligned_only="no"
|
||||
case "$target_name" in
|
||||
alpha|hppa|mips64el|mips64|mipsel|mips|mipsn32|mipsn32el|sh4|sh4eb|sparc|sparc64|sparc32plus|xtensa|xtensaeb)
|
||||
target_aligned_only="yes"
|
||||
;;
|
||||
esac
|
||||
target_bigendian="no"
|
||||
|
||||
case "$target_name" in
|
||||
aarch64eb|armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or32|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)
|
||||
target_bigendian=yes
|
||||
target_bigendian="yes"
|
||||
;;
|
||||
esac
|
||||
target_softmmu="yes"
|
||||
|
@ -1779,6 +1784,9 @@ target_arch_name="$(upper $TARGET_ARCH)"
|
|||
echo "TARGET_$target_arch_name=y" >> $config_target_mak
|
||||
echo "TARGET_NAME=$target_name" >> $config_target_mak
|
||||
echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak
|
||||
if test "$target_aligned_only" = "yes" ; then
|
||||
echo "TARGET_ALIGNED_ONLY=y" >> $config_target_mak
|
||||
fi
|
||||
if test "$target_bigendian" = "yes" ; then
|
||||
echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
|
||||
fi
|
||||
|
|
|
@ -86,7 +86,7 @@ struct TranslationBlock;
|
|||
* @do_unassigned_access: Callback for unassigned access handling.
|
||||
* (this is deprecated: new targets should use do_transaction_failed instead)
|
||||
* @do_unaligned_access: Callback for unaligned access handling, if
|
||||
* the target defines #ALIGNED_ONLY.
|
||||
* the target defines #TARGET_ALIGNED_ONLY.
|
||||
* @do_transaction_failed: Callback for handling failed memory transactions
|
||||
* (ie bus faults or external aborts; not MMU faults)
|
||||
* @memory_rw_debug: Callback for GDB memory access.
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
#ifndef MIPS_CPU_H
|
||||
#define MIPS_CPU_H
|
||||
|
||||
#define ALIGNED_ONLY
|
||||
|
||||
#include "config.h"
|
||||
#include "qemu-common.h"
|
||||
#include "cpu-qom.h"
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
#include "cpu-qom.h"
|
||||
#include "exec/cpu-defs.h"
|
||||
|
||||
#define ALIGNED_ONLY
|
||||
|
||||
#if !defined(TARGET_SPARC64)
|
||||
#define TARGET_DPREGS 16
|
||||
#else
|
||||
|
|
|
@ -341,10 +341,12 @@ typedef enum TCGMemOp {
|
|||
MO_TE = MO_LE,
|
||||
#endif
|
||||
|
||||
/* MO_UNALN accesses are never checked for alignment.
|
||||
/*
|
||||
* MO_UNALN accesses are never checked for alignment.
|
||||
* MO_ALIGN accesses will result in a call to the CPU's
|
||||
* do_unaligned_access hook if the guest address is not aligned.
|
||||
* The default depends on whether the target CPU defines ALIGNED_ONLY.
|
||||
* The default depends on whether the target CPU defines
|
||||
* TARGET_ALIGNED_ONLY.
|
||||
*
|
||||
* Some architectures (e.g. ARMv8) need the address which is aligned
|
||||
* to a size more than the size of the memory access.
|
||||
|
@ -361,7 +363,7 @@ typedef enum TCGMemOp {
|
|||
*/
|
||||
MO_ASHIFT = 4,
|
||||
MO_AMASK = 7 << MO_ASHIFT,
|
||||
#ifdef ALIGNED_ONLY
|
||||
#ifdef TARGET_ALIGNED_ONLY
|
||||
MO_ALIGN = 0,
|
||||
MO_UNALN = MO_AMASK,
|
||||
#else
|
||||
|
|
Loading…
Reference in a new issue