mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 10:13:56 -06:00
target-arm: final conversion to AREG0 free mode
Convert code load functions and switch to AREG0 free mode. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
9ef3927725
commit
d31dd73e48
6 changed files with 16 additions and 21 deletions
|
@ -734,9 +734,10 @@ static inline void cpu_pc_from_tb(CPUARMState *env, TranslationBlock *tb)
|
|||
}
|
||||
|
||||
/* Load an instruction and return it in the standard little-endian order */
|
||||
static inline uint32_t arm_ldl_code(uint32_t addr, bool do_swap)
|
||||
static inline uint32_t arm_ldl_code(CPUARMState *env, uint32_t addr,
|
||||
bool do_swap)
|
||||
{
|
||||
uint32_t insn = ldl_code(addr);
|
||||
uint32_t insn = cpu_ldl_code(env, addr);
|
||||
if (do_swap) {
|
||||
return bswap32(insn);
|
||||
}
|
||||
|
@ -744,9 +745,10 @@ static inline uint32_t arm_ldl_code(uint32_t addr, bool do_swap)
|
|||
}
|
||||
|
||||
/* Ditto, for a halfword (Thumb) instruction */
|
||||
static inline uint16_t arm_lduw_code(uint32_t addr, bool do_swap)
|
||||
static inline uint16_t arm_lduw_code(CPUARMState *env, uint32_t addr,
|
||||
bool do_swap)
|
||||
{
|
||||
uint16_t insn = lduw_code(addr);
|
||||
uint16_t insn = cpu_lduw_code(env, addr);
|
||||
if (do_swap) {
|
||||
return bswap16(insn);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue