Commit c44d26a2 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Cornelia Huck
Browse files

target/s390x: Restrict system-mode declarations 



As these declarations are restricted to !CONFIG_USER_ONLY in
helper.c, only declare them when system-mode emulation is used.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20200526172427.17460-8-f4bug@amsat.org>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 8c4b4e37

target/s390x/internal.h

+7 −5
Original line number Diff line number Diff line
@@ -236,9 +236,11 @@ int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, 


/* cc_helper.c */

const char *cc_name(enum cc_op cc_op);

void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);

uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst,

                 uint64_t vr);

#ifndef CONFIG_USER_ONLY

void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);

#endif /* CONFIG_USER_ONLY */





/* cpu.c */
@@ -303,18 +305,18 @@ void s390_cpu_gdb_init(CPUState *cs); 


/* helper.c */

void s390_cpu_dump_state(CPUState *cpu, FILE *f, int flags);

hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);

hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr);

void do_restart_interrupt(CPUS390XState *env);

#ifndef CONFIG_USER_ONLY

uint64_t get_psw_mask(CPUS390XState *env);

void s390_cpu_recompute_watchpoints(CPUState *cs);

void s390x_tod_timer(void *opaque);

void s390x_cpu_timer(void *opaque);

void do_restart_interrupt(CPUS390XState *env);

void s390_handle_wait(S390CPU *cpu);

hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);

hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr);

#define S390_STORE_STATUS_DEF_ADDR offsetof(LowCore, floating_pt_save_area)

int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch);

int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len);

#ifndef CONFIG_USER_ONLY

LowCore *cpu_map_lowcore(CPUS390XState *env);

void cpu_unmap_lowcore(LowCore *lowcore);

#endif /* CONFIG_USER_ONLY */