target-arm: Split out private-to-target functions into internals.h
Currently cpu.h defines a mixture of functions and types needed by the rest of QEMU and those needed only by files within target-arm/. Split the latter out into a new header so they aren't needlessly exposed further than required. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
This commit is contained in:
parent
c6138aabfb
commit
ccd380876b
|
@ -19,6 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
#include "internals.h"
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "hw/qdev-properties.h"
|
#include "hw/qdev-properties.h"
|
||||||
#include "qapi/qmp/qerror.h"
|
#include "qapi/qmp/qerror.h"
|
||||||
|
|
|
@ -111,11 +111,6 @@ typedef struct ARMGenericTimer {
|
||||||
#define GTIMER_VIRT 1
|
#define GTIMER_VIRT 1
|
||||||
#define NUM_GTIMERS 2
|
#define NUM_GTIMERS 2
|
||||||
|
|
||||||
/* Scale factor for generic timers, ie number of ns per tick.
|
|
||||||
* This gives a 62.5MHz timer.
|
|
||||||
*/
|
|
||||||
#define GTIMER_SCALE 16
|
|
||||||
|
|
||||||
typedef struct CPUARMState {
|
typedef struct CPUARMState {
|
||||||
/* Regs for current mode. */
|
/* Regs for current mode. */
|
||||||
uint32_t regs[16];
|
uint32_t regs[16];
|
||||||
|
@ -322,11 +317,7 @@ typedef struct CPUARMState {
|
||||||
#include "cpu-qom.h"
|
#include "cpu-qom.h"
|
||||||
|
|
||||||
ARMCPU *cpu_arm_init(const char *cpu_model);
|
ARMCPU *cpu_arm_init(const char *cpu_model);
|
||||||
void arm_translate_init(void);
|
|
||||||
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu);
|
|
||||||
int cpu_arm_exec(CPUARMState *s);
|
int cpu_arm_exec(CPUARMState *s);
|
||||||
int bank_number(int mode);
|
|
||||||
void switch_mode(CPUARMState *, int);
|
|
||||||
uint32_t do_arm_semihosting(CPUARMState *env);
|
uint32_t do_arm_semihosting(CPUARMState *env);
|
||||||
|
|
||||||
static inline bool is_a64(CPUARMState *env)
|
static inline bool is_a64(CPUARMState *env)
|
||||||
|
@ -548,17 +539,6 @@ static inline void vfp_set_fpcr(CPUARMState *env, uint32_t val)
|
||||||
vfp_set_fpscr(env, new_fpscr);
|
vfp_set_fpscr(env, new_fpscr);
|
||||||
}
|
}
|
||||||
|
|
||||||
enum arm_fprounding {
|
|
||||||
FPROUNDING_TIEEVEN,
|
|
||||||
FPROUNDING_POSINF,
|
|
||||||
FPROUNDING_NEGINF,
|
|
||||||
FPROUNDING_ZERO,
|
|
||||||
FPROUNDING_TIEAWAY,
|
|
||||||
FPROUNDING_ODD
|
|
||||||
};
|
|
||||||
|
|
||||||
int arm_rmode_to_sf(int rmode);
|
|
||||||
|
|
||||||
enum arm_cpu_mode {
|
enum arm_cpu_mode {
|
||||||
ARM_CPU_MODE_USR = 0x10,
|
ARM_CPU_MODE_USR = 0x10,
|
||||||
ARM_CPU_MODE_FIQ = 0x11,
|
ARM_CPU_MODE_FIQ = 0x11,
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
#include "internals.h"
|
||||||
#include "exec/gdbstub.h"
|
#include "exec/gdbstub.h"
|
||||||
#include "helper.h"
|
#include "helper.h"
|
||||||
#include "qemu/host-utils.h"
|
#include "qemu/host-utils.h"
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* QEMU ARM CPU -- internal functions and types
|
||||||
|
*
|
||||||
|
* Copyright (c) 2014 Linaro Ltd
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, see
|
||||||
|
* <http://www.gnu.org/licenses/gpl-2.0.html>
|
||||||
|
*
|
||||||
|
* This header defines functions, types, etc which need to be shared
|
||||||
|
* between different source files within target-arm/ but which are
|
||||||
|
* private to it and not required by the rest of QEMU.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef TARGET_ARM_INTERNALS_H
|
||||||
|
#define TARGET_ARM_INTERNALS_H
|
||||||
|
|
||||||
|
/* Scale factor for generic timers, ie number of ns per tick.
|
||||||
|
* This gives a 62.5MHz timer.
|
||||||
|
*/
|
||||||
|
#define GTIMER_SCALE 16
|
||||||
|
|
||||||
|
int bank_number(int mode);
|
||||||
|
void switch_mode(CPUARMState *, int);
|
||||||
|
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu);
|
||||||
|
void arm_translate_init(void);
|
||||||
|
|
||||||
|
enum arm_fprounding {
|
||||||
|
FPROUNDING_TIEEVEN,
|
||||||
|
FPROUNDING_POSINF,
|
||||||
|
FPROUNDING_NEGINF,
|
||||||
|
FPROUNDING_ZERO,
|
||||||
|
FPROUNDING_TIEAWAY,
|
||||||
|
FPROUNDING_ODD
|
||||||
|
};
|
||||||
|
|
||||||
|
int arm_rmode_to_sf(int rmode);
|
||||||
|
|
||||||
|
#endif
|
|
@ -21,6 +21,7 @@
|
||||||
#include "sysemu/kvm.h"
|
#include "sysemu/kvm.h"
|
||||||
#include "kvm_arm.h"
|
#include "kvm_arm.h"
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
#include "internals.h"
|
||||||
#include "hw/arm/arm.h"
|
#include "hw/arm/arm.h"
|
||||||
|
|
||||||
static inline void set_feature(uint64_t *features, int feature)
|
static inline void set_feature(uint64_t *features, int feature)
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
*/
|
*/
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "helper.h"
|
#include "helper.h"
|
||||||
|
#include "internals.h"
|
||||||
|
|
||||||
#define SIGNBIT (uint32_t)0x80000000
|
#define SIGNBIT (uint32_t)0x80000000
|
||||||
#define SIGNBIT64 ((uint64_t)1 << 63)
|
#define SIGNBIT64 ((uint64_t)1 << 63)
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "tcg-op.h"
|
#include "tcg-op.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
#include "translate.h"
|
#include "translate.h"
|
||||||
|
#include "internals.h"
|
||||||
#include "qemu/host-utils.h"
|
#include "qemu/host-utils.h"
|
||||||
|
|
||||||
#include "exec/gen-icount.h"
|
#include "exec/gen-icount.h"
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
#include "internals.h"
|
||||||
#include "disas/disas.h"
|
#include "disas/disas.h"
|
||||||
#include "tcg-op.h"
|
#include "tcg-op.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
|
|
Loading…
Reference in New Issue