Skip to content

Commit

Permalink
Sparc: split CWP and PSTATE op helpers
Browse files Browse the repository at this point in the history
Move CWP and PSTATE op helpers to win_helper.c.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
  • Loading branch information
blueswirl committed Oct 23, 2011
1 parent 2ffd917 commit 070af38
Show file tree
Hide file tree
Showing 4 changed files with 524 additions and 491 deletions.
4 changes: 2 additions & 2 deletions Makefile.target
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ libobj-$(TARGET_SPARC64) += vis_helper.o
libobj-$(CONFIG_NEED_MMU) += mmu.o
libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
ifeq ($(TARGET_BASE_ARCH), sparc)
libobj-y += fop_helper.o cc_helper.o cpu_init.o
libobj-y += fop_helper.o cc_helper.o win_helper.o cpu_init.o
endif
libobj-$(TARGET_SPARC) += int32_helper.o
libobj-$(TARGET_SPARC64) += int64_helper.o
Expand All @@ -97,7 +97,7 @@ tcg/tcg.o: cpu.h

# HELPER_CFLAGS is used for all the code compiled with static register
# variables
op_helper.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
op_helper.o win_helper.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

# Note: this is a workaround. The real fix is to avoid compiling
# cpu_signal_handler() in user-exec.c.
Expand Down
4 changes: 3 additions & 1 deletion target-sparc/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ void gen_intermediate_code_init(CPUSPARCState *env);
/* cpu-exec.c */
int cpu_sparc_exec(CPUSPARCState *s);

/* op_helper.c */
/* win_helper.c */
target_ulong cpu_get_psr(CPUState *env1);
void cpu_put_psr(CPUState *env1, target_ulong val);
#ifdef TARGET_SPARC64
Expand All @@ -522,6 +522,8 @@ void cpu_change_pstate(CPUState *env1, uint32_t new_pstate);
int cpu_cwp_inc(CPUState *env1, int cwp);
int cpu_cwp_dec(CPUState *env1, int cwp);
void cpu_set_cwp(CPUState *env1, int new_cwp);

/* op_helper.c */
void leon3_irq_manager(void *irq_manager, int intno);

/* sun4m.c, sun4u.c */
Expand Down
Loading

0 comments on commit 070af38

Please sign in to comment.