haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target-arm: Drop success/fail return from cpreg read and write functions

Browse source 
All cpreg read and write functions now return 0, so we can clean up
their prototypes:
 * write functions return void
 * read functions return the value rather than taking a pointer
   to write the value to

This is a fairly mechanical change which makes only the bare
minimum set of changes to the callers of read and write functions.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
This commit is contained in:
Peter Maydell 2014-02-20 10:35:54 +00:00
parent 92611c0019
commit c4241c7d38
6 changed files with 154 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
hw/arm/pxa2xx.c
View file

@ -224,15 +224,13 @@ static const VMStateDescription vmstate_pxa2xx_cm = {
} }
}; };
static int pxa2xx_clkcfg_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t pxa2xx_clkcfg_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
PXA2xxState *s = (PXA2xxState *)ri->opaque; PXA2xxState *s = (PXA2xxState *)ri->opaque;
*value = s->clkcfg; return s->clkcfg;
return 0;
} }
static int pxa2xx_clkcfg_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pxa2xx_clkcfg_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
PXA2xxState *s = (PXA2xxState *)ri->opaque; PXA2xxState *s = (PXA2xxState *)ri->opaque;
@ -240,10 +238,9 @@ static int pxa2xx_clkcfg_write(CPUARMState *env, const ARMCPRegInfo *ri,
if (value & 2) { if (value & 2) {
printf("%s: CPU frequency change attempt\n", __func__); printf("%s: CPU frequency change attempt\n", __func__);
} }
return 0;
} }
static int pxa2xx_pwrmode_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pxa2xx_pwrmode_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
PXA2xxState *s = (PXA2xxState *)ri->opaque; PXA2xxState *s = (PXA2xxState *)ri->opaque;
@ -310,36 +307,29 @@ static int pxa2xx_pwrmode_write(CPUARMState *env, const ARMCPRegInfo *ri,
printf("%s: machine entered %s mode\n", __func__, printf("%s: machine entered %s mode\n", __func__,
pwrmode[value & 7]); pwrmode[value & 7]);
} }
return 0;
} }
static int pxa2xx_cppmnc_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t pxa2xx_cppmnc_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
PXA2xxState *s = (PXA2xxState *)ri->opaque; PXA2xxState *s = (PXA2xxState *)ri->opaque;
*value = s->pmnc; return s->pmnc;
return 0;
} }
static int pxa2xx_cppmnc_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pxa2xx_cppmnc_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
PXA2xxState *s = (PXA2xxState *)ri->opaque; PXA2xxState *s = (PXA2xxState *)ri->opaque;
s->pmnc = value; s->pmnc = value;
return 0;
} }
static int pxa2xx_cpccnt_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t pxa2xx_cpccnt_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
PXA2xxState *s = (PXA2xxState *)ri->opaque; PXA2xxState *s = (PXA2xxState *)ri->opaque;
if (s->pmnc & 1) { if (s->pmnc & 1) {
*value = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
} else { } else {
*value = 0;
}
return 0; return 0;
}
} }
static const ARMCPRegInfo pxa_cp_reginfo[] = { static const ARMCPRegInfo pxa_cp_reginfo[] = {

9
hw/arm/pxa2xx_pic.c
View file

@ -217,20 +217,17 @@ static const int pxa2xx_cp_reg_map[0x10] = {
[0xa] = ICPR2, [0xa] = ICPR2,
}; };
static int pxa2xx_pic_cp_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t pxa2xx_pic_cp_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
int offset = pxa2xx_cp_reg_map[ri->crn]; int offset = pxa2xx_cp_reg_map[ri->crn];
*value = pxa2xx_pic_mem_read(ri->opaque, offset, 4); return pxa2xx_pic_mem_read(ri->opaque, offset, 4);
return 0;
} }
static int pxa2xx_pic_cp_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pxa2xx_pic_cp_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
int offset = pxa2xx_cp_reg_map[ri->crn]; int offset = pxa2xx_cp_reg_map[ri->crn];
pxa2xx_pic_mem_write(ri->opaque, offset, value, 4); pxa2xx_pic_mem_write(ri->opaque, offset, value, 4);
return 0;
} }
#define REGINFO_FOR_PIC_CP(NAME, CRN) \ #define REGINFO_FOR_PIC_CP(NAME, CRN) \

6
target-arm/cpu.c
View file

@ -681,14 +681,12 @@ static void cortex_a9_initfn(Object *obj)
} }
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
static int a15_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t a15_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
/* Linux wants the number of processors from here. /* Linux wants the number of processors from here.
* Might as well set the interrupt-controller bit too. * Might as well set the interrupt-controller bit too.
*/ */
*value = ((smp_cpus - 1) << 24) | (1 << 23); return ((smp_cpus - 1) << 24) | (1 << 23);
return 0;
} }
#endif #endif

19
target-arm/cpu.h
View file

@ -827,10 +827,11 @@ typedef enum CPAccessResult {
CP_ACCESS_TRAP_UNCATEGORIZED = 2, CP_ACCESS_TRAP_UNCATEGORIZED = 2,
} CPAccessResult; } CPAccessResult;
/* Access functions for coprocessor registers. These should always succeed. */ /* Access functions for coprocessor registers. These cannot fail and
typedef int CPReadFn(CPUARMState *env, const ARMCPRegInfo *opaque, * may not raise exceptions.
uint64_t *value); */
typedef int CPWriteFn(CPUARMState *env, const ARMCPRegInfo *opaque, typedef uint64_t CPReadFn(CPUARMState *env, const ARMCPRegInfo *opaque);
typedef void CPWriteFn(CPUARMState *env, const ARMCPRegInfo *opaque,
uint64_t value); uint64_t value);
/* Access permission check functions for coprocessor registers. */ /* Access permission check functions for coprocessor registers. */
typedef CPAccessResult CPAccessFn(CPUARMState *env, const ARMCPRegInfo *opaque); typedef CPAccessResult CPAccessFn(CPUARMState *env, const ARMCPRegInfo *opaque);
@ -906,14 +907,14 @@ struct ARMCPRegInfo {
/* Function for doing a "raw" read; used when we need to copy /* Function for doing a "raw" read; used when we need to copy
* coprocessor state to the kernel for KVM or out for * coprocessor state to the kernel for KVM or out for
* migration. This only needs to be provided if there is also a * migration. This only needs to be provided if there is also a
* readfn and it makes an access permission check. * readfn and it has side effects (for instance clear-on-read bits).
*/ */
CPReadFn *raw_readfn; CPReadFn *raw_readfn;
/* Function for doing a "raw" write; used when we need to copy KVM /* Function for doing a "raw" write; used when we need to copy KVM
* kernel coprocessor state into userspace, or for inbound * kernel coprocessor state into userspace, or for inbound
* migration. This only needs to be provided if there is also a * migration. This only needs to be provided if there is also a
* writefn and it makes an access permission check or masks out * writefn and it masks out "unwritable" bits or has write-one-to-clear
* "unwritable" bits or has write-one-to-clear or similar behaviour. * or similar behaviour.
*/ */
CPWriteFn *raw_writefn; CPWriteFn *raw_writefn;
/* Function for resetting the register. If NULL, then reset will be done /* Function for resetting the register. If NULL, then reset will be done
@ -948,10 +949,10 @@ static inline void define_one_arm_cp_reg(ARMCPU *cpu, const ARMCPRegInfo *regs)
const ARMCPRegInfo *get_arm_cp_reginfo(GHashTable *cpregs, uint32_t encoded_cp); const ARMCPRegInfo *get_arm_cp_reginfo(GHashTable *cpregs, uint32_t encoded_cp);
/* CPWriteFn that can be used to implement writes-ignored behaviour */ /* CPWriteFn that can be used to implement writes-ignored behaviour */
int arm_cp_write_ignore(CPUARMState *env, const ARMCPRegInfo *ri, void arm_cp_write_ignore(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value); uint64_t value);
/* CPReadFn that can be used for read-as-zero behaviour */ /* CPReadFn that can be used for read-as-zero behaviour */
int arm_cp_read_zero(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t *value); uint64_t arm_cp_read_zero(CPUARMState *env, const ARMCPRegInfo *ri);
/* CPResetFn that does nothing, for use if no reset is required even /* CPResetFn that does nothing, for use if no reset is required even
* if fieldoffset is non zero. * if fieldoffset is non zero.

222
target-arm/helper.c
View file

@ -107,18 +107,16 @@ static int aarch64_fpu_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg)
} }
} }
static int raw_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t raw_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
if (ri->type & ARM_CP_64BIT) { if (ri->type & ARM_CP_64BIT) {
*value = CPREG_FIELD64(env, ri); return CPREG_FIELD64(env, ri);
} else { } else {
*value = CPREG_FIELD32(env, ri); return CPREG_FIELD32(env, ri);
} }
return 0;
} }
static int raw_write(CPUARMState *env, const ARMCPRegInfo *ri, static void raw_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
if (ri->type & ARM_CP_64BIT) { if (ri->type & ARM_CP_64BIT) {
@ -126,7 +124,6 @@ static int raw_write(CPUARMState *env, const ARMCPRegInfo *ri,
} else { } else {
CPREG_FIELD32(env, ri) = value; CPREG_FIELD32(env, ri) = value;
} }
return 0;
} }
static bool read_raw_cp_reg(CPUARMState *env, const ARMCPRegInfo *ri, static bool read_raw_cp_reg(CPUARMState *env, const ARMCPRegInfo *ri,
@ -138,11 +135,11 @@ static bool read_raw_cp_reg(CPUARMState *env, const ARMCPRegInfo *ri,
if (ri->type & ARM_CP_CONST) { if (ri->type & ARM_CP_CONST) {
*v = ri->resetvalue; *v = ri->resetvalue;
} else if (ri->raw_readfn) { } else if (ri->raw_readfn) {
return (ri->raw_readfn(env, ri, v) == 0); *v = ri->raw_readfn(env, ri);
} else if (ri->readfn) { } else if (ri->readfn) {
return (ri->readfn(env, ri, v) == 0); *v = ri->readfn(env, ri);
} else { } else {
raw_read(env, ri, v); *v = raw_read(env, ri);
} }
return true; return true;
} }
@ -159,9 +156,9 @@ static bool write_raw_cp_reg(CPUARMState *env, const ARMCPRegInfo *ri,
if (ri->type & ARM_CP_CONST) { if (ri->type & ARM_CP_CONST) {
return true; return true;
} else if (ri->raw_writefn) { } else if (ri->raw_writefn) {
return (ri->raw_writefn(env, ri, v) == 0); ri->raw_writefn(env, ri, v);
} else if (ri->writefn) { } else if (ri->writefn) {
return (ri->writefn(env, ri, v) == 0); ri->writefn(env, ri, v);
} else { } else {
raw_write(env, ri, v); raw_write(env, ri, v);
} }
@ -309,14 +306,13 @@ void init_cpreg_list(ARMCPU *cpu)
g_list_free(keys); g_list_free(keys);
} }
static int dacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void dacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
{ {
env->cp15.c3 = value; env->cp15.c3 = value;
tlb_flush(env, 1); /* Flush TLB as domain not tracked in TLB */ tlb_flush(env, 1); /* Flush TLB as domain not tracked in TLB */
return 0;
} }
static int fcse_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void fcse_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
{ {
if (env->cp15.c13_fcse != value) { if (env->cp15.c13_fcse != value) {
/* Unlike real hardware the qemu TLB uses virtual addresses, /* Unlike real hardware the qemu TLB uses virtual addresses,
@ -325,9 +321,9 @@ static int fcse_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
tlb_flush(env, 1); tlb_flush(env, 1);
env->cp15.c13_fcse = value; env->cp15.c13_fcse = value;
} }
return 0;
} }
static int contextidr_write(CPUARMState *env, const ARMCPRegInfo *ri,
static void contextidr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
if (env->cp15.c13_context != value && !arm_feature(env, ARM_FEATURE_MPU)) { if (env->cp15.c13_context != value && !arm_feature(env, ARM_FEATURE_MPU)) {
@ -338,39 +334,34 @@ static int contextidr_write(CPUARMState *env, const ARMCPRegInfo *ri,
tlb_flush(env, 1); tlb_flush(env, 1);
} }
env->cp15.c13_context = value; env->cp15.c13_context = value;
return 0;
} }
static int tlbiall_write(CPUARMState *env, const ARMCPRegInfo *ri, static void tlbiall_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* Invalidate all (TLBIALL) */ /* Invalidate all (TLBIALL) */
tlb_flush(env, 1); tlb_flush(env, 1);
return 0;
} }
static int tlbimva_write(CPUARMState *env, const ARMCPRegInfo *ri, static void tlbimva_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* Invalidate single TLB entry by MVA and ASID (TLBIMVA) */ /* Invalidate single TLB entry by MVA and ASID (TLBIMVA) */
tlb_flush_page(env, value & TARGET_PAGE_MASK); tlb_flush_page(env, value & TARGET_PAGE_MASK);
return 0;
} }
static int tlbiasid_write(CPUARMState *env, const ARMCPRegInfo *ri, static void tlbiasid_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* Invalidate by ASID (TLBIASID) */ /* Invalidate by ASID (TLBIASID) */
tlb_flush(env, value == 0); tlb_flush(env, value == 0);
return 0;
} }
static int tlbimvaa_write(CPUARMState *env, const ARMCPRegInfo *ri, static void tlbimvaa_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* Invalidate single entry by MVA, all ASIDs (TLBIMVAA) */ /* Invalidate single entry by MVA, all ASIDs (TLBIMVAA) */
tlb_flush_page(env, value & TARGET_PAGE_MASK); tlb_flush_page(env, value & TARGET_PAGE_MASK);
return 0;
} }
static const ARMCPRegInfo cp_reginfo[] = { static const ARMCPRegInfo cp_reginfo[] = {
@ -450,14 +441,14 @@ static const ARMCPRegInfo not_v7_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{ {
if (env->cp15.c1_coproc != value) { if (env->cp15.c1_coproc != value) {
env->cp15.c1_coproc = value; env->cp15.c1_coproc = value;
/* ??? Is this safe when called from within a TB? */ /* ??? Is this safe when called from within a TB? */
tb_flush(env); tb_flush(env);
} }
return 0;
} }
static const ARMCPRegInfo v6_cp_reginfo[] = { static const ARMCPRegInfo v6_cp_reginfo[] = {
@ -496,89 +487,77 @@ static CPAccessResult pmreg_access(CPUARMState *env, const ARMCPRegInfo *ri)
return CP_ACCESS_OK; return CP_ACCESS_OK;
} }
static int pmcr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* only the DP, X, D and E bits are writable */ /* only the DP, X, D and E bits are writable */
env->cp15.c9_pmcr &= ~0x39; env->cp15.c9_pmcr &= ~0x39;
env->cp15.c9_pmcr |= (value & 0x39); env->cp15.c9_pmcr |= (value & 0x39);
return 0;
} }
static int pmcntenset_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmcntenset_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
value &= (1 << 31); value &= (1 << 31);
env->cp15.c9_pmcnten |= value; env->cp15.c9_pmcnten |= value;
return 0;
} }
static int pmcntenclr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmcntenclr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
value &= (1 << 31); value &= (1 << 31);
env->cp15.c9_pmcnten &= ~value; env->cp15.c9_pmcnten &= ~value;
return 0;
} }
static int pmovsr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmovsr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c9_pmovsr &= ~value; env->cp15.c9_pmovsr &= ~value;
return 0;
} }
static int pmxevtyper_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmxevtyper_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c9_pmxevtyper = value & 0xff; env->cp15.c9_pmxevtyper = value & 0xff;
return 0;
} }
static int pmuserenr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmuserenr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c9_pmuserenr = value & 1; env->cp15.c9_pmuserenr = value & 1;
return 0;
} }
static int pmintenset_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmintenset_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* We have no event counters so only the C bit can be changed */ /* We have no event counters so only the C bit can be changed */
value &= (1 << 31); value &= (1 << 31);
env->cp15.c9_pminten |= value; env->cp15.c9_pminten |= value;
return 0;
} }
static int pmintenclr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmintenclr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
value &= (1 << 31); value &= (1 << 31);
env->cp15.c9_pminten &= ~value; env->cp15.c9_pminten &= ~value;
return 0;
} }
static int vbar_write(CPUARMState *env, const ARMCPRegInfo *ri, static void vbar_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c12_vbar = value & ~0x1Ful; env->cp15.c12_vbar = value & ~0x1Ful;
return 0;
} }
static int ccsidr_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t ccsidr_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
ARMCPU *cpu = arm_env_get_cpu(env); ARMCPU *cpu = arm_env_get_cpu(env);
*value = cpu->ccsidr[env->cp15.c0_cssel]; return cpu->ccsidr[env->cp15.c0_cssel];
return 0;
} }
static int csselr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void csselr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c0_cssel = value & 0xf; env->cp15.c0_cssel = value & 0xf;
return 0;
} }
static const ARMCPRegInfo v7_cp_reginfo[] = { static const ARMCPRegInfo v7_cp_reginfo[] = {
@ -675,14 +654,14 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int teecr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void teecr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{ {
value &= 1; value &= 1;
env->teecr = value; env->teecr = value;
return 0;
} }
static CPAccessResultg teehbr_access(CPUARMState *env, const ARMCPRegInfo *ri) static CPAccessResult teehbr_access(CPUARMState *env, const ARMCPRegInfo *ri)
{ {
if (arm_current_pl(env) == 0 && (env->teecr & 1)) { if (arm_current_pl(env) == 0 && (env->teecr & 1)) {
return CP_ACCESS_TRAP; return CP_ACCESS_TRAP;
@ -833,33 +812,29 @@ static void gt_cnt_reset(CPUARMState *env, const ARMCPRegInfo *ri)
timer_del(cpu->gt_timer[timeridx]); timer_del(cpu->gt_timer[timeridx]);
} }
static int gt_cnt_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t gt_cnt_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
*value = gt_get_countervalue(env); return gt_get_countervalue(env);
return 0;
} }
static int gt_cval_write(CPUARMState *env, const ARMCPRegInfo *ri, static void gt_cval_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
int timeridx = ri->opc1 & 1; int timeridx = ri->opc1 & 1;
env->cp15.c14_timer[timeridx].cval = value; env->cp15.c14_timer[timeridx].cval = value;
gt_recalc_timer(arm_env_get_cpu(env), timeridx); gt_recalc_timer(arm_env_get_cpu(env), timeridx);
return 0;
} }
static int gt_tval_read(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t *value) static uint64_t gt_tval_read(CPUARMState *env, const ARMCPRegInfo *ri)
{ {
int timeridx = ri->crm & 1; int timeridx = ri->crm & 1;
*value = (uint32_t)(env->cp15.c14_timer[timeridx].cval - return (uint32_t)(env->cp15.c14_timer[timeridx].cval -
gt_get_countervalue(env)); gt_get_countervalue(env));
return 0;
} }
static int gt_tval_write(CPUARMState *env, const ARMCPRegInfo *ri, static void gt_tval_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
int timeridx = ri->crm & 1; int timeridx = ri->crm & 1;
@ -867,10 +842,9 @@ static int gt_tval_write(CPUARMState *env, const ARMCPRegInfo *ri,
env->cp15.c14_timer[timeridx].cval = gt_get_countervalue(env) + env->cp15.c14_timer[timeridx].cval = gt_get_countervalue(env) +
+ sextract64(value, 0, 32); + sextract64(value, 0, 32);
gt_recalc_timer(arm_env_get_cpu(env), timeridx); gt_recalc_timer(arm_env_get_cpu(env), timeridx);
return 0;
} }
static int gt_ctl_write(CPUARMState *env, const ARMCPRegInfo *ri, static void gt_ctl_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
ARMCPU *cpu = arm_env_get_cpu(env); ARMCPU *cpu = arm_env_get_cpu(env);
@ -888,7 +862,6 @@ static int gt_ctl_write(CPUARMState *env, const ARMCPRegInfo *ri,
qemu_set_irq(cpu->gt_timer_outputs[timeridx], qemu_set_irq(cpu->gt_timer_outputs[timeridx],
(oldval & 4) && (value & 2)); (oldval & 4) && (value & 2));
} }
return 0;
} }
void arm_gt_ptimer_cb(void *opaque) void arm_gt_ptimer_cb(void *opaque)
@ -990,7 +963,7 @@ static const ARMCPRegInfo generic_timer_cp_reginfo[] = {
#endif #endif
static int par_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void par_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
{ {
if (arm_feature(env, ARM_FEATURE_LPAE)) { if (arm_feature(env, ARM_FEATURE_LPAE)) {
env->cp15.c7_par = value; env->cp15.c7_par = value;
@ -999,7 +972,6 @@ static int par_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
} else { } else {
env->cp15.c7_par = value & 0xfffff1ff; env->cp15.c7_par = value & 0xfffff1ff;
} }
return 0;
} }
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
@ -1028,7 +1000,7 @@ static CPAccessResult ats_access(CPUARMState *env, const ARMCPRegInfo *ri)
return CP_ACCESS_OK; return CP_ACCESS_OK;
} }
static int ats_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void ats_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
{ {
hwaddr phys_addr; hwaddr phys_addr;
target_ulong page_size; target_ulong page_size;
@ -1077,7 +1049,6 @@ static int ats_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
} }
env->cp15.c7_par_hi = 0; env->cp15.c7_par_hi = 0;
} }
return 0;
} }
#endif #endif
@ -1124,32 +1095,26 @@ static uint32_t extended_mpu_ap_bits(uint32_t val)
return ret; return ret;
} }
static int pmsav5_data_ap_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmsav5_data_ap_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c5_data = extended_mpu_ap_bits(value); env->cp15.c5_data = extended_mpu_ap_bits(value);
return 0;
} }
static int pmsav5_data_ap_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t pmsav5_data_ap_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
*value = simple_mpu_ap_bits(env->cp15.c5_data); return simple_mpu_ap_bits(env->cp15.c5_data);
return 0;
} }
static int pmsav5_insn_ap_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmsav5_insn_ap_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c5_insn = extended_mpu_ap_bits(value); env->cp15.c5_insn = extended_mpu_ap_bits(value);
return 0;
} }
static int pmsav5_insn_ap_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t pmsav5_insn_ap_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
*value = simple_mpu_ap_bits(env->cp15.c5_insn); return simple_mpu_ap_bits(env->cp15.c5_insn);
return 0;
} }
static const ARMCPRegInfo pmsav5_cp_reginfo[] = { static const ARMCPRegInfo pmsav5_cp_reginfo[] = {
@ -1201,7 +1166,7 @@ static const ARMCPRegInfo pmsav5_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int vmsa_ttbcr_raw_write(CPUARMState *env, const ARMCPRegInfo *ri, static void vmsa_ttbcr_raw_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
int maskshift = extract32(value, 0, 3); int maskshift = extract32(value, 0, 3);
@ -1219,10 +1184,9 @@ static int vmsa_ttbcr_raw_write(CPUARMState *env, const ARMCPRegInfo *ri,
env->cp15.c2_control = value; env->cp15.c2_control = value;
env->cp15.c2_mask = ~(((uint32_t)0xffffffffu) >> maskshift); env->cp15.c2_mask = ~(((uint32_t)0xffffffffu) >> maskshift);
env->cp15.c2_base_mask = ~((uint32_t)0x3fffu >> maskshift); env->cp15.c2_base_mask = ~((uint32_t)0x3fffu >> maskshift);
return 0;
} }
static int vmsa_ttbcr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void vmsa_ttbcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
if (arm_feature(env, ARM_FEATURE_LPAE)) { if (arm_feature(env, ARM_FEATURE_LPAE)) {
@ -1231,7 +1195,7 @@ static int vmsa_ttbcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
*/ */
tlb_flush(env, 1); tlb_flush(env, 1);
} }
return vmsa_ttbcr_raw_write(env, ri, value); vmsa_ttbcr_raw_write(env, ri, value);
} }
static void vmsa_ttbcr_reset(CPUARMState *env, const ARMCPRegInfo *ri) static void vmsa_ttbcr_reset(CPUARMState *env, const ARMCPRegInfo *ri)
@ -1264,32 +1228,29 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int omap_ticonfig_write(CPUARMState *env, const ARMCPRegInfo *ri, static void omap_ticonfig_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c15_ticonfig = value & 0xe7; env->cp15.c15_ticonfig = value & 0xe7;
/* The OS_TYPE bit in this register changes the reported CPUID! */ /* The OS_TYPE bit in this register changes the reported CPUID! */
env->cp15.c0_cpuid = (value & (1 << 5)) ? env->cp15.c0_cpuid = (value & (1 << 5)) ?
ARM_CPUID_TI915T : ARM_CPUID_TI925T; ARM_CPUID_TI915T : ARM_CPUID_TI925T;
return 0;
} }
static int omap_threadid_write(CPUARMState *env, const ARMCPRegInfo *ri, static void omap_threadid_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c15_threadid = value & 0xffff; env->cp15.c15_threadid = value & 0xffff;
return 0;
} }
static int omap_wfi_write(CPUARMState *env, const ARMCPRegInfo *ri, static void omap_wfi_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* Wait-for-interrupt (deprecated) */ /* Wait-for-interrupt (deprecated) */
cpu_interrupt(CPU(arm_env_get_cpu(env)), CPU_INTERRUPT_HALT); cpu_interrupt(CPU(arm_env_get_cpu(env)), CPU_INTERRUPT_HALT);
return 0;
} }
static int omap_cachemaint_write(CPUARMState *env, const ARMCPRegInfo *ri, static void omap_cachemaint_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* On OMAP there are registers indicating the max/min index of dcache lines /* On OMAP there are registers indicating the max/min index of dcache lines
@ -1297,7 +1258,6 @@ static int omap_cachemaint_write(CPUARMState *env, const ARMCPRegInfo *ri,
*/ */
env->cp15.c15_i_max = 0x000; env->cp15.c15_i_max = 0x000;
env->cp15.c15_i_min = 0xff0; env->cp15.c15_i_min = 0xff0;
return 0;
} }
static const ARMCPRegInfo omap_cp_reginfo[] = { static const ARMCPRegInfo omap_cp_reginfo[] = {
@ -1339,7 +1299,7 @@ static const ARMCPRegInfo omap_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int xscale_cpar_write(CPUARMState *env, const ARMCPRegInfo *ri, static void xscale_cpar_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
value &= 0x3fff; value &= 0x3fff;
@ -1348,7 +1308,6 @@ static int xscale_cpar_write(CPUARMState *env, const ARMCPRegInfo *ri,
tb_flush(env); tb_flush(env);
env->cp15.c15_cpar = value; env->cp15.c15_cpar = value;
} }
return 0;
} }
static const ARMCPRegInfo xscale_cp_reginfo[] = { static const ARMCPRegInfo xscale_cp_reginfo[] = {
@ -1428,8 +1387,7 @@ static const ARMCPRegInfo strongarm_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
CPUState *cs = CPU(arm_env_get_cpu(env)); CPUState *cs = CPU(arm_env_get_cpu(env));
uint32_t mpidr = cs->cpu_index; uint32_t mpidr = cs->cpu_index;
@ -1444,8 +1402,7 @@ static int mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri,
* not currently model any of those cores. * not currently model any of those cores.
*/ */
} }
*value = mpidr; return mpidr;
return 0;
} }
static const ARMCPRegInfo mpidr_cp_reginfo[] = { static const ARMCPRegInfo mpidr_cp_reginfo[] = {
@ -1454,17 +1411,16 @@ static const ARMCPRegInfo mpidr_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int par64_read(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t *value) static uint64_t par64_read(CPUARMState *env, const ARMCPRegInfo *ri)
{ {
*value = ((uint64_t)env->cp15.c7_par_hi << 32) | env->cp15.c7_par; return ((uint64_t)env->cp15.c7_par_hi << 32) | env->cp15.c7_par;
return 0;
} }
static int par64_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void par64_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{ {
env->cp15.c7_par_hi = value >> 32; env->cp15.c7_par_hi = value >> 32;
env->cp15.c7_par = value; env->cp15.c7_par = value;
return 0;
} }
static void par64_reset(CPUARMState *env, const ARMCPRegInfo *ri) static void par64_reset(CPUARMState *env, const ARMCPRegInfo *ri)
@ -1473,27 +1429,24 @@ static void par64_reset(CPUARMState *env, const ARMCPRegInfo *ri)
env->cp15.c7_par = 0; env->cp15.c7_par = 0;
} }
static int ttbr064_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t ttbr064_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
*value = ((uint64_t)env->cp15.c2_base0_hi << 32) | env->cp15.c2_base0; return ((uint64_t)env->cp15.c2_base0_hi << 32) | env->cp15.c2_base0;
return 0;
} }
static int ttbr064_raw_write(CPUARMState *env, const ARMCPRegInfo *ri, static void ttbr064_raw_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c2_base0_hi = value >> 32; env->cp15.c2_base0_hi = value >> 32;
env->cp15.c2_base0 = value; env->cp15.c2_base0 = value;
return 0;
} }
static int ttbr064_write(CPUARMState *env, const ARMCPRegInfo *ri, static void ttbr064_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* Writes to the 64 bit format TTBRs may change the ASID */ /* Writes to the 64 bit format TTBRs may change the ASID */
tlb_flush(env, 1); tlb_flush(env, 1);
return ttbr064_raw_write(env, ri, value); ttbr064_raw_write(env, ri, value);
} }
static void ttbr064_reset(CPUARMState *env, const ARMCPRegInfo *ri) static void ttbr064_reset(CPUARMState *env, const ARMCPRegInfo *ri)
@ -1502,19 +1455,16 @@ static void ttbr064_reset(CPUARMState *env, const ARMCPRegInfo *ri)
env->cp15.c2_base0 = 0; env->cp15.c2_base0 = 0;
} }
static int ttbr164_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t ttbr164_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
*value = ((uint64_t)env->cp15.c2_base1_hi << 32) | env->cp15.c2_base1; return ((uint64_t)env->cp15.c2_base1_hi << 32) | env->cp15.c2_base1;
return 0;
} }
static int ttbr164_write(CPUARMState *env, const ARMCPRegInfo *ri, static void ttbr164_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
env->cp15.c2_base1_hi = value >> 32; env->cp15.c2_base1_hi = value >> 32;
env->cp15.c2_base1 = value; env->cp15.c2_base1 = value;
return 0;
} }
static void ttbr164_reset(CPUARMState *env, const ARMCPRegInfo *ri) static void ttbr164_reset(CPUARMState *env, const ARMCPRegInfo *ri)
@ -1551,32 +1501,26 @@ static const ARMCPRegInfo lpae_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int aa64_fpcr_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t aa64_fpcr_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
*value = vfp_get_fpcr(env); return vfp_get_fpcr(env);
return 0;
} }
static int aa64_fpcr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void aa64_fpcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
vfp_set_fpcr(env, value); vfp_set_fpcr(env, value);
return 0;
} }
static int aa64_fpsr_read(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t aa64_fpsr_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t *value)
{ {
*value = vfp_get_fpsr(env); return vfp_get_fpsr(env);
return 0;
} }
static int aa64_fpsr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void aa64_fpsr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
vfp_set_fpsr(env, value); vfp_set_fpsr(env, value);
return 0;
} }
static const ARMCPRegInfo v8_cp_reginfo[] = { static const ARMCPRegInfo v8_cp_reginfo[] = {
@ -1609,13 +1553,13 @@ static const ARMCPRegInfo v8_cp_reginfo[] = {
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
static int sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{ {
env->cp15.c1_sys = value; env->cp15.c1_sys = value;
/* ??? Lots of these bits are not implemented. */ /* ??? Lots of these bits are not implemented. */
/* This may enable/disable the MMU, so do a TLB flush. */ /* This may enable/disable the MMU, so do a TLB flush. */
tlb_flush(env, 1); tlb_flush(env, 1);
return 0;
} }
void register_cp_regs_for_features(ARMCPU *cpu) void register_cp_regs_for_features(ARMCPU *cpu)
@ -2193,17 +2137,15 @@ const ARMCPRegInfo *get_arm_cp_reginfo(GHashTable *cpregs, uint32_t encoded_cp)
return g_hash_table_lookup(cpregs, &encoded_cp); return g_hash_table_lookup(cpregs, &encoded_cp);
} }
int arm_cp_write_ignore(CPUARMState *env, const ARMCPRegInfo *ri, void arm_cp_write_ignore(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
/* Helper coprocessor write function for write-ignore registers */ /* Helper coprocessor write function for write-ignore registers */
return 0;
} }
int arm_cp_read_zero(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t *value) uint64_t arm_cp_read_zero(CPUARMState *env, const ARMCPRegInfo *ri)
{ {
/* Helper coprocessor write function for read-as-zero registers */ /* Helper coprocessor write function for read-as-zero registers */
*value = 0;
return 0; return 0;
} }

28
target-arm/op_helper.c
View file

@ -294,41 +294,29 @@ void HELPER(access_check_cp_reg)(CPUARMState *env, void *rip)
void HELPER(set_cp_reg)(CPUARMState *env, void *rip, uint32_t value) void HELPER(set_cp_reg)(CPUARMState *env, void *rip, uint32_t value)
{ {
const ARMCPRegInfo *ri = rip; const ARMCPRegInfo *ri = rip;
int excp = ri->writefn(env, ri, value);
if (excp) { ri->writefn(env, ri, value);
raise_exception(env, excp);
}
} }
uint32_t HELPER(get_cp_reg)(CPUARMState *env, void *rip) uint32_t HELPER(get_cp_reg)(CPUARMState *env, void *rip)
{ {
const ARMCPRegInfo *ri = rip; const ARMCPRegInfo *ri = rip;
uint64_t value;
int excp = ri->readfn(env, ri, &value); return ri->readfn(env, ri);
if (excp) {
raise_exception(env, excp);
}
return value;
} }
void HELPER(set_cp_reg64)(CPUARMState *env, void *rip, uint64_t value) void HELPER(set_cp_reg64)(CPUARMState *env, void *rip, uint64_t value)
{ {
const ARMCPRegInfo *ri = rip; const ARMCPRegInfo *ri = rip;
int excp = ri->writefn(env, ri, value);
if (excp) { ri->writefn(env, ri, value);
raise_exception(env, excp);
}
} }
uint64_t HELPER(get_cp_reg64)(CPUARMState *env, void *rip) uint64_t HELPER(get_cp_reg64)(CPUARMState *env, void *rip)
{ {
const ARMCPRegInfo *ri = rip; const ARMCPRegInfo *ri = rip;
uint64_t value;
int excp = ri->readfn(env, ri, &value); return ri->readfn(env, ri);
if (excp) {
raise_exception(env, excp);
}
return value;
} }
/* ??? Flag setting arithmetic is awkward because we need to do comparisons. /* ??? Flag setting arithmetic is awkward because we need to do comparisons.