target-arm: move arm_*_code to a separate file
These will soon require cpu_ldst.h, so move them out of cpu.h. Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
58ed270df9
commit
1d854765df
|
@ -0,0 +1,47 @@
|
||||||
|
/*
|
||||||
|
* 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 "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 do_swap)
|
||||||
|
{
|
||||||
|
uint32_t insn = cpu_ldl_code(env, addr);
|
||||||
|
if (do_swap) {
|
||||||
|
return bswap32(insn);
|
||||||
|
}
|
||||||
|
return insn;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ditto, for a halfword (Thumb) instruction */
|
||||||
|
static inline uint16_t arm_lduw_code(CPUARMState *env, target_ulong addr,
|
||||||
|
bool do_swap)
|
||||||
|
{
|
||||||
|
uint16_t insn = cpu_lduw_code(env, addr);
|
||||||
|
if (do_swap) {
|
||||||
|
return bswap16(insn);
|
||||||
|
}
|
||||||
|
return insn;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
|
@ -1199,26 +1199,4 @@ 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(CPUARMState *env, target_ulong addr,
|
|
||||||
bool do_swap)
|
|
||||||
{
|
|
||||||
uint32_t insn = cpu_ldl_code(env, addr);
|
|
||||||
if (do_swap) {
|
|
||||||
return bswap32(insn);
|
|
||||||
}
|
|
||||||
return insn;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Ditto, for a halfword (Thumb) instruction */
|
|
||||||
static inline uint16_t arm_lduw_code(CPUARMState *env, target_ulong addr,
|
|
||||||
bool do_swap)
|
|
||||||
{
|
|
||||||
uint16_t insn = cpu_lduw_code(env, addr);
|
|
||||||
if (do_swap) {
|
|
||||||
return bswap16(insn);
|
|
||||||
}
|
|
||||||
return insn;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "qemu/bitops.h"
|
#include "qemu/bitops.h"
|
||||||
#include "qemu/crc32c.h"
|
#include "qemu/crc32c.h"
|
||||||
|
#include "arm_ldst.h"
|
||||||
#include <zlib.h> /* For crc32 */
|
#include <zlib.h> /* For crc32 */
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "tcg-op.h"
|
#include "tcg-op.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
|
#include "arm_ldst.h"
|
||||||
#include "translate.h"
|
#include "translate.h"
|
||||||
#include "internals.h"
|
#include "internals.h"
|
||||||
#include "qemu/host-utils.h"
|
#include "qemu/host-utils.h"
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
#include "tcg-op.h"
|
#include "tcg-op.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
#include "qemu/bitops.h"
|
#include "qemu/bitops.h"
|
||||||
|
#include "arm_ldst.h"
|
||||||
|
|
||||||
#include "exec/helper-proto.h"
|
#include "exec/helper-proto.h"
|
||||||
#include "exec/helper-gen.h"
|
#include "exec/helper-gen.h"
|
||||||
|
|
Loading…
Reference in New Issue