ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on Sparc host, implement ld and st 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4457 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-05-14 19:22:05 +00:00
parent 2e56350ef1
commit 7d55170268
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpu-exec.c
View File

@ -53,19 +53,14 @@ static unsigned long next_tb;
// Work around ugly bugs in glibc that mangle global register contents // Work around ugly bugs in glibc that mangle global register contents
static volatile void *saved_env; static volatile void *saved_env;
static volatile unsigned long saved_t0, saved_i7;
#undef SAVE_GLOBALS #undef SAVE_GLOBALS
#define SAVE_GLOBALS() do { \ #define SAVE_GLOBALS() do { \
saved_env = env; \ saved_env = env; \
saved_t0 = T0; \
asm volatile ("st %%i7, [%0]" : : "r" (&saved_i7)); \
} while(0) } while(0)
#undef RESTORE_GLOBALS #undef RESTORE_GLOBALS
#define RESTORE_GLOBALS() do { \ #define RESTORE_GLOBALS() do { \
env = (void *)saved_env; \ env = (void *)saved_env; \
T0 = saved_t0; \
asm volatile ("ld [%0], %%i7" : : "r" (&saved_i7)); \
} while(0) } while(0)
static int sparc_setjmp(jmp_buf buf) static int sparc_setjmp(jmp_buf buf)

16
tcg/sparc/tcg-target.c
View File

@ -266,13 +266,19 @@ static inline void tcg_out_ldst(TCGContext *s, int ret, int addr, int offset, in
static inline void tcg_out_ld(TCGContext *s, TCGType type, int ret, static inline void tcg_out_ld(TCGContext *s, TCGType type, int ret,
int arg1, tcg_target_long arg2) int arg1, tcg_target_long arg2)
{ {
fprintf(stderr, "unimplemented %s\n", __func__); if (type == TCG_TYPE_I32)
tcg_out_ldst(s, ret, arg1, arg2, LDUW);
else
tcg_out_ldst(s, ret, arg1, arg2, LDX);
} }
static inline void tcg_out_st(TCGContext *s, TCGType type, int arg, static inline void tcg_out_st(TCGContext *s, TCGType type, int arg,
int arg1, tcg_target_long arg2) int arg1, tcg_target_long arg2)
{ {
fprintf(stderr, "unimplemented %s\n", __func__); if (type == TCG_TYPE_I32)
tcg_out_ldst(s, arg, arg1, arg2, STW);
else
tcg_out_ldst(s, arg, arg1, arg2, STX);
} }
static inline void tcg_out_arith(TCGContext *s, int rd, int rs1, int rs2, static inline void tcg_out_arith(TCGContext *s, int rd, int rs1, int rs2,
@ -312,10 +318,14 @@ static inline void tcg_out_nop(TCGContext *s)
tcg_out32(s, SETHI | INSN_RD(TCG_REG_G0) | 0); tcg_out32(s, SETHI | INSN_RD(TCG_REG_G0) | 0);
} }
static inline void tcg_target_prologue(TCGContext *s) /* Generate global QEMU prologue and epilogue code */
void tcg_target_qemu_prologue(TCGContext *s)
{ {
tcg_out32(s, SAVE | INSN_RD(TCG_REG_O6) | INSN_RS1(TCG_REG_O6) | tcg_out32(s, SAVE | INSN_RD(TCG_REG_O6) | INSN_RS1(TCG_REG_O6) |
INSN_IMM13(-TCG_TARGET_STACK_MINFRAME)); INSN_IMM13(-TCG_TARGET_STACK_MINFRAME));
tcg_out32(s, JMPL | INSN_RD(TCG_REG_G0) | INSN_RS1(TCG_REG_O0) |
INSN_RS2(TCG_REG_G0));
tcg_out_nop(s);
} }
static inline void tcg_out_op(TCGContext *s, int opc, const TCGArg *args, static inline void tcg_out_op(TCGContext *s, int opc, const TCGArg *args,

3
tcg/sparc/tcg-target.h
View File

@ -84,8 +84,9 @@ enum {
/* optional instructions */ /* optional instructions */
//#define TCG_TARGET_HAS_bswap_i32 //#define TCG_TARGET_HAS_bswap_i32
//#define TCG_TARGET_HAS_bswap_i64 //#define TCG_TARGET_HAS_bswap_i64
//#define TCG_TARGET_HAS_neg_i32
//#define TCG_TARGET_HAS_neg_i64
#define TCG_TARGET_NEEDS_PROLOGUE 1
/* Note: must be synced with dyngen-exec.h */ /* Note: must be synced with dyngen-exec.h */
#ifdef HOST_SOLARIS #ifdef HOST_SOLARIS