f9fd40ebe4
bswap_code is a CPU property of sorts ("is the iside endianness the
opposite way round to TARGET_WORDS_BIGENDIAN?") but it is not the
actual CPU state involved here which is SCTLR.B (set for BE32
binaries, clear for BE8).
Replace bswap_code with SCTLR.B, and pass that to arm_ld*_code.
The next patches will make data fetches honor both SCTLR.B and
CPSR.E appropriately.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
[PC changes:
* rebased on master (Jan 2016)
* s/TARGET_USER_ONLY/CONFIG_USER_ONLY
* Use bswap_code() for disas_set_info() instead of raw sctlr_b
]
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
49 lines
1.5 KiB
C
49 lines
1.5 KiB
C
/*
|
|
* ARM load/store instructions for code (armeb-user support)
|
|
*
|
|
* Copyright (c) 2012 CodeSourcery, LLC
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef ARM_LDST_H
|
|
#define ARM_LDST_H
|
|
|
|
#include "exec/cpu_ldst.h"
|
|
#include "qemu/bswap.h"
|
|
|
|
/* Load an instruction and return it in the standard little-endian order */
|
|
static inline uint32_t arm_ldl_code(CPUARMState *env, target_ulong addr,
|
|
bool sctlr_b)
|
|
{
|
|
uint32_t insn = cpu_ldl_code(env, addr);
|
|
if (bswap_code(sctlr_b)) {
|
|
return bswap32(insn);
|
|
}
|
|
return insn;
|
|
}
|
|
|
|
/* Ditto, for a halfword (Thumb) instruction */
|
|
static inline uint16_t arm_lduw_code(CPUARMState *env, target_ulong addr,
|
|
bool sctlr_b)
|
|
{
|
|
uint16_t insn = cpu_lduw_code(env, addr);
|
|
if (bswap_code(sctlr_b)) {
|
|
return bswap16(insn);
|
|
}
|
|
return insn;
|
|
}
|
|
|
|
#endif
|