SPARC fixes: corrected PC/NPC logic (now slower but can be optimized a lot) - fixed flags computations - added register window exceptions support - fixed mul and div - added mulscc - fixed immediate field decoding

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@484 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-01-04 15:01:44 +00:00
parent fb0eaffc6d
commit cf495bcf9f
4 changed files with 1206 additions and 907 deletions

View File

@ -182,7 +182,7 @@
#define TARGET_NR_sysinfo 214 /* Linux Specific */ #define TARGET_NR_sysinfo 214 /* Linux Specific */
#define TARGET_NR_ipc 215 /* Linux Specific */ #define TARGET_NR_ipc 215 /* Linux Specific */
#define TARGET_NR_sigreturn 216 /* Linux Specific */ #define TARGET_NR_sigreturn 216 /* Linux Specific */
#define TARGET_NR_clone 217 /* Linux Specific */ #define TARGET_NR_clone 2170 /* Linux Specific */
#define TARGET_NR_adjtimex 219 /* Linux Specific */ #define TARGET_NR_adjtimex 219 /* Linux Specific */
#define TARGET_NR_sigprocmask 220 /* Linux Specific */ #define TARGET_NR_sigprocmask 220 /* Linux Specific */
#define TARGET_NR_create_module 221 /* Linux Specific */ #define TARGET_NR_create_module 221 /* Linux Specific */

View File

@ -7,12 +7,20 @@
/*#define EXCP_INTERRUPT 0x100*/ /*#define EXCP_INTERRUPT 0x100*/
/* trap definitions */
#define TT_ILL_INSN 0x02
#define TT_WIN_OVF 0x05
#define TT_WIN_UNF 0x06
#define TT_DIV_ZERO 0x2a
#define TT_TRAP 0x80
#define PSR_NEG (1<<23) #define PSR_NEG (1<<23)
#define PSR_ZERO (1<<22) #define PSR_ZERO (1<<22)
#define PSR_OVF (1<<21) #define PSR_OVF (1<<21)
#define PSR_CARRY (1<<20) #define PSR_CARRY (1<<20)
#define NWINDOWS 32
typedef struct CPUSPARCState { typedef struct CPUSPARCState {
uint32_t gregs[8]; /* general registers */ uint32_t gregs[8]; /* general registers */
uint32_t *regwptr; /* pointer to current register window */ uint32_t *regwptr; /* pointer to current register window */
@ -23,6 +31,9 @@ typedef struct CPUSPARCState {
uint32_t y; /* multiply/divide register */ uint32_t y; /* multiply/divide register */
uint32_t psr; /* processor state register */ uint32_t psr; /* processor state register */
uint32_t T2; uint32_t T2;
uint32_t cwp; /* index of current register window (extracted
from PSR) */
uint32_t wim; /* window invalid mask */
jmp_buf jmp_env; jmp_buf jmp_env;
int user_mode_only; int user_mode_only;
int exception_index; int exception_index;
@ -30,6 +41,8 @@ typedef struct CPUSPARCState {
int interrupt_request; int interrupt_request;
struct TranslationBlock *current_tb; struct TranslationBlock *current_tb;
void *opaque; void *opaque;
/* NOTE: we allow 8 more registers to handle wrapping */
uint32_t regbase[NWINDOWS * 16 + 8];
} CPUSPARCState; } CPUSPARCState;
CPUSPARCState *cpu_sparc_init(void); CPUSPARCState *cpu_sparc_init(void);

View File

@ -20,7 +20,7 @@
#include "exec.h" #include "exec.h"
/*XXX*/ /*XXX*/
#define REGNAME g0 #define REGNAME g0
#define REG (env->gregs[0]) #define REG (env->gregs[0])
#include "op_template.h" #include "op_template.h"
@ -117,9 +117,11 @@
#define REGNAME o7 #define REGNAME o7
#define REG (env->regwptr[7]) #define REG (env->regwptr[7])
#include "op_template.h" #include "op_template.h"
#define EIP (env->pc) #define EIP (env->pc)
#define FLAG_SET(x) (env->psr&x)?1:0
#define GET_FLAGS unsigned int Z = FLAG_SET(PSR_ZERO), N = FLAG_SET(PSR_NEG), V = FLAG_SET(PSR_OVF), C = FLAG_SET(PSR_CARRY)
void OPPROTO op_movl_T0_0(void) void OPPROTO op_movl_T0_0(void)
{ {
T0 = 0; T0 = 0;
@ -160,337 +162,500 @@ void OPPROTO op_subl_T1_T2(void)
T1 -= T2; T1 -= T2;
} }
void OPPROTO op_add_T1_T0 (void) void OPPROTO op_add_T1_T0(void)
{ {
T0 += T1; T0 += T1;
} }
void OPPROTO op_and_T1_T0 (void) void OPPROTO op_add_T1_T0_cc(void)
{ {
T0 &= T1; unsigned int src1;
src1 = T0;
T0 += T1;
env->psr = 0;
if (!T0)
env->psr |= PSR_ZERO;
if ((int) T0 < 0)
env->psr |= PSR_NEG;
if (T0 < src1)
env->psr |= PSR_CARRY;
if (((src1 ^ T1 ^ -1) & (src1 ^ T0)) & (1 << 31))
env->psr |= PSR_OVF;
FORCE_RET();
} }
void OPPROTO op_or_T1_T0 (void) void OPPROTO op_sub_T1_T0(void)
{
T0 |= T1;
}
void OPPROTO op_xor_T1_T0 (void)
{
T0 ^= T1;
}
void OPPROTO op_sub_T1_T0 (void)
{ {
T0 -= T1; T0 -= T1;
} }
void OPPROTO op_andn_T1_T0 (void) void OPPROTO op_sub_T1_T0_cc(void)
{
unsigned int src1;
src1 = T0;
T0 -= T1;
env->psr = 0;
if (!T0)
env->psr |= PSR_ZERO;
if ((int) T0 < 0)
env->psr |= PSR_NEG;
if (src1 < T1)
env->psr |= PSR_CARRY;
if (((src1 ^ T1) & (src1 ^ T0)) & (1 << 31))
env->psr |= PSR_OVF;
FORCE_RET();
}
void OPPROTO op_and_T1_T0(void)
{
T0 &= T1;
}
void OPPROTO op_or_T1_T0(void)
{
T0 |= T1;
}
void OPPROTO op_xor_T1_T0(void)
{
T0 ^= T1;
}
void OPPROTO op_andn_T1_T0(void)
{ {
T0 &= ~T1; T0 &= ~T1;
} }
void OPPROTO op_orn_T1_T0 (void) void OPPROTO op_orn_T1_T0(void)
{ {
T0 |= ~T1; T0 |= ~T1;
} }
void OPPROTO op_xnor_T1_T0 (void) void OPPROTO op_xnor_T1_T0(void)
{ {
T0 ^= ~T1; T0 ^= ~T1;
} }
void OPPROTO op_addx_T1_T0 (void) void OPPROTO op_addx_T1_T0(void)
{ {
T0 += T1+((env->psr & PSR_CARRY)?1:0); T0 += T1 + ((env->psr & PSR_CARRY) ? 1 : 0);
} }
void OPPROTO op_umul_T1_T0 (void) void OPPROTO op_umul_T1_T0(void)
{ {
unsigned long long res = T0*T1; uint64_t res;
res = (uint64_t) T0 *(uint64_t) T1;
T0 = res & 0xffffffff; T0 = res & 0xffffffff;
env->y = res >> 32; env->y = res >> 32;
} }
void OPPROTO op_smul_T1_T0 (void) void OPPROTO op_smul_T1_T0(void)
{ {
long long res = T0*T1; uint64_t res;
res = (int64_t) ((int32_t) T0) * (int64_t) ((int32_t) T1);
T0 = res & 0xffffffff; T0 = res & 0xffffffff;
env->y = res >> 32; env->y = res >> 32;
} }
void OPPROTO op_udiv_T1_T0 (void) void OPPROTO op_mulscc_T1_T0(void)
{ {
unsigned long long x0 = T0 * env->y; unsigned int b1, C, V, b2, src1;
unsigned int x1 = T1; C = FLAG_SET(PSR_CARRY);
T0 = x0 / x1; V = FLAG_SET(PSR_OVF);
b1 = C ^ V;
b2 = T0 & 1;
T0 = (b1 << 31) | (T0 >> 1);
if (!(env->y & 1))
T1 = 0;
/* do addition and update flags */
src1 = T0;
T0 += T1;
env->psr = 0;
if (!T0)
env->psr |= PSR_ZERO;
if ((int) T0 < 0)
env->psr |= PSR_NEG;
if (T0 < src1)
env->psr |= PSR_CARRY;
if (((src1 ^ T1 ^ -1) & (src1 ^ T0)) & (1 << 31))
env->psr |= PSR_OVF;
env->y = (b2 << 31) | (env->y >> 1);
FORCE_RET();
} }
void OPPROTO op_sdiv_T1_T0 (void) void OPPROTO op_udiv_T1_T0(void)
{ {
long long x0 = T0 * env->y; uint64_t x0;
int x1 = T1; uint32_t x1;
T0 = x0 / x1;
x0 = T0 | ((uint64_t) (env->y) << 32);
x1 = T1;
x0 = x0 / x1;
if (x0 > 0xffffffff) {
T0 = 0xffffffff;
T1 = 1;
} else {
T0 = x0;
T1 = 0;
}
FORCE_RET();
} }
void OPPROTO op_subx_T1_T0 (void) void OPPROTO op_sdiv_T1_T0(void)
{ {
T0 -= T1+((env->psr & PSR_CARRY)?1:0); int64_t x0;
int32_t x1;
x0 = T0 | ((uint64_t) (env->y) << 32);
x1 = T1;
x0 = x0 / x1;
if ((int32_t) x0 != x0) {
T0 = x0 >> 63;
T1 = 1;
} else {
T0 = x0;
T1 = 0;
}
FORCE_RET();
} }
void OPPROTO op_set_flags (void) void OPPROTO op_div_cc(void)
{ {
env->psr = 0; env->psr = 0;
if (!T0) env->psr |= PSR_ZERO; if (!T0)
if ((unsigned int) T0 < (unsigned int) T1) env->psr |= PSR_CARRY; env->psr |= PSR_ZERO;
if ((int) T0 < (int) T1) env->psr |= PSR_OVF; if ((int) T0 < 0)
if ((int) T0 < 0) env->psr |= PSR_NEG; env->psr |= PSR_NEG;
if (T1)
env->psr |= PSR_OVF;
FORCE_RET();
} }
void OPPROTO op_sll (void) void OPPROTO op_subx_T1_T0(void)
{
T0 -= T1 + ((env->psr & PSR_CARRY) ? 1 : 0);
}
void OPPROTO op_logic_T0_cc(void)
{
env->psr = 0;
if (!T0)
env->psr |= PSR_ZERO;
if ((int) T0 < 0)
env->psr |= PSR_NEG;
FORCE_RET();
}
void OPPROTO op_set_flags(void)
{
env->psr = 0;
if (!T0)
env->psr |= PSR_ZERO;
if ((unsigned int) T0 < (unsigned int) T1)
env->psr |= PSR_CARRY;
if ((int) T0 < (int) T1)
env->psr |= PSR_OVF;
if ((int) T0 < 0)
env->psr |= PSR_NEG;
FORCE_RET();
}
void OPPROTO op_sll(void)
{ {
T0 <<= T1; T0 <<= T1;
} }
void OPPROTO op_srl (void) void OPPROTO op_srl(void)
{ {
T0 >>= T1; T0 >>= T1;
} }
void OPPROTO op_sra (void) void OPPROTO op_sra(void)
{ {
int x = T0 >> T1; T0 = ((int32_t) T0) >> T1;
T0 = x;
} }
void OPPROTO op_st (void) void OPPROTO op_st(void)
{ {
stl ((void *) T0, T1); stl((void *) T0, T1);
} }
void OPPROTO op_stb (void) void OPPROTO op_stb(void)
{ {
stb ((void *) T0, T1); stb((void *) T0, T1);
} }
void OPPROTO op_sth (void) void OPPROTO op_sth(void)
{ {
stw ((void *) T0, T1); stw((void *) T0, T1);
} }
void OPPROTO op_ld (void) void OPPROTO op_std(void)
{ {
T1 = ldl ((void *) T0); stl((void *) T0, T1);
stl((void *) (T0 + 4), T2);
} }
void OPPROTO op_ldub (void) void OPPROTO op_ld(void)
{ {
T1 = ldub ((void *) T0); T1 = ldl((void *) T0);
} }
void OPPROTO op_lduh (void) void OPPROTO op_ldub(void)
{ {
T1 = lduw ((void *) T0); T1 = ldub((void *) T0);
} }
void OPPROTO op_ldsb (void) void OPPROTO op_lduh(void)
{ {
T1 = ldsb ((void *) T0); T1 = lduw((void *) T0);
} }
void OPPROTO op_ldsh (void) void OPPROTO op_ldsb(void)
{ {
T1 = ldsw ((void *) T0); T1 = ldsb((void *) T0);
} }
void OPPROTO op_ldstub (void) void OPPROTO op_ldsh(void)
{ {
T1 = ldub ((void *) T0); T1 = ldsw((void *) T0);
stb ((void *) T0, 0xff); /* XXX: Should be Atomically */
} }
void OPPROTO op_swap (void) void OPPROTO op_ldstub(void)
{ {
unsigned int tmp = ldl ((void *) T0); T1 = ldub((void *) T0);
stl ((void *) T0, T1); /* XXX: Should be Atomically */ stb((void *) T0, 0xff); /* XXX: Should be Atomically */
}
void OPPROTO op_swap(void)
{
unsigned int tmp = ldl((void *) T0);
stl((void *) T0, T1); /* XXX: Should be Atomically */
T1 = tmp; T1 = tmp;
} }
void OPPROTO op_ldd (void) void OPPROTO op_ldd(void)
{ {
T1 = ldl ((void *) T0); T1 = ldl((void *) T0);
T0 = ldl ((void *) T0+4); T0 = ldl((void *) (T0 + 4));
} }
void OPPROTO op_wry (void) void OPPROTO op_wry(void)
{ {
env->y = T0^T1; env->y = T0;
} }
void OPPROTO op_rdy (void) void OPPROTO op_rdy(void)
{ {
T0 = env->y; T0 = env->y;
} }
#define regwptr (env->regwptr) void raise_exception(int tt)
void OPPROTO op_save (void)
{ {
regwptr -= 16; env->exception_index = tt;
cpu_loop_exit();
} }
void OPPROTO op_restore (void) void memcpy32(uint32_t *dst, const uint32_t *src)
{ {
regwptr += 16; dst[0] = src[0];
dst[1] = src[1];
dst[2] = src[2];
dst[3] = src[3];
dst[4] = src[4];
dst[5] = src[5];
dst[6] = src[6];
dst[7] = src[7];
} }
void OPPROTO op_trap (void) static inline void set_cwp(int new_cwp)
{
/* put the modified wrap registers at their proper location */
if (env->cwp == (NWINDOWS - 1))
memcpy32(env->regbase, env->regbase + NWINDOWS * 16);
env->cwp = new_cwp;
/* put the wrap registers at their temporary location */
if (new_cwp == (NWINDOWS - 1))
memcpy32(env->regbase + NWINDOWS * 16, env->regbase);
env->regwptr = env->regbase + (new_cwp * 16);
}
/* XXX: use another pointer for %iN registers to avoid slow wrapping
handling ? */
void OPPROTO op_save(void)
{
int cwp;
cwp = (env->cwp - 1) & (NWINDOWS - 1);
if (env->wim & (1 << cwp)) {
raise_exception(TT_WIN_OVF);
}
set_cwp(cwp);
FORCE_RET();
}
void OPPROTO op_restore(void)
{
int cwp;
cwp = (env->cwp + 1) & (NWINDOWS - 1);
if (env->wim & (1 << cwp)) {
raise_exception(TT_WIN_UNF);
}
set_cwp(cwp);
FORCE_RET();
}
void OPPROTO op_exception(void)
{ {
env->exception_index = PARAM1; env->exception_index = PARAM1;
cpu_loop_exit (); cpu_loop_exit();
} }
void OPPROTO op_exit_tb (void) void OPPROTO op_trap_T0(void)
{ {
EXIT_TB (); env->exception_index = TT_TRAP + (T0 & 0x7f);
cpu_loop_exit();
} }
void OPPROTO op_eval_be (void) void OPPROTO op_trapcc_T0(void)
{ {
T0 = (env->psr & PSR_ZERO); if (T2) {
env->exception_index = TT_TRAP + (T0 & 0x7f);
cpu_loop_exit();
}
FORCE_RET();
} }
#define FLAG_SET(x) (env->psr&x)?1:0 void OPPROTO op_exit_tb(void)
#define GET_FLAGS unsigned int Z = FLAG_SET(PSR_ZERO), N = FLAG_SET(PSR_NEG), V = FLAG_SET(PSR_OVF), C = FLAG_SET(PSR_CARRY) {
EXIT_TB();
}
void OPPROTO op_eval_ble (void) void OPPROTO op_eval_be(void)
{
T2 = (env->psr & PSR_ZERO);
}
void OPPROTO op_eval_ble(void)
{ {
GET_FLAGS; GET_FLAGS;
T0 = Z | (N^V); T2 = Z | (N ^ V);
} }
void OPPROTO op_eval_bl (void) void OPPROTO op_eval_bl(void)
{ {
GET_FLAGS; GET_FLAGS;
T0 = N^V; T2 = N ^ V;
} }
void OPPROTO op_eval_bleu (void) void OPPROTO op_eval_bleu(void)
{ {
GET_FLAGS; GET_FLAGS;
T0 = C|Z; T2 = C | Z;
} }
void OPPROTO op_eval_bcs (void) void OPPROTO op_eval_bcs(void)
{ {
T0 = (env->psr & PSR_CARRY); T2 = (env->psr & PSR_CARRY);
} }
void OPPROTO op_eval_bvs (void) void OPPROTO op_eval_bvs(void)
{ {
T0 = (env->psr & PSR_OVF); T2 = (env->psr & PSR_OVF);
} }
void OPPROTO op_eval_bneg (void) void OPPROTO op_eval_bneg(void)
{ {
T0 = (env->psr & PSR_NEG); T2 = (env->psr & PSR_NEG);
} }
void OPPROTO op_eval_bne (void) void OPPROTO op_eval_bne(void)
{ {
T0 = !(env->psr & PSR_ZERO); T2 = !(env->psr & PSR_ZERO);
} }
void OPPROTO op_eval_bg (void) void OPPROTO op_eval_bg(void)
{ {
GET_FLAGS; GET_FLAGS;
T0 = !(Z | (N^V)); T2 = !(Z | (N ^ V));
} }
/*XXX: This seems to be documented wrong in the SPARC V8 Manual void OPPROTO op_eval_bge(void)
The manual states: !(N^V)
but I assume Z | !(N^V) to be correct */
void OPPROTO op_eval_bge (void)
{ {
GET_FLAGS; GET_FLAGS;
T0 = Z | !(N^V); T2 = !(N ^ V);
} }
void OPPROTO op_eval_bgu (void) void OPPROTO op_eval_bgu(void)
{ {
GET_FLAGS; GET_FLAGS;
T0 = !(C | Z); T2 = !(C | Z);
} }
void OPPROTO op_eval_bcc (void) void OPPROTO op_eval_bcc(void)
{ {
T0 = !(env->psr & PSR_CARRY); T2 = !(env->psr & PSR_CARRY);
} }
void OPPROTO op_eval_bpos (void) void OPPROTO op_eval_bpos(void)
{ {
T0 = !(env->psr & PSR_NEG); T2 = !(env->psr & PSR_NEG);
} }
void OPPROTO op_eval_bvc (void) void OPPROTO op_eval_bvc(void)
{ {
T0 = !(env->psr & PSR_OVF); T2 = !(env->psr & PSR_OVF);
} }
void OPPROTO op_jmp_im (void) void OPPROTO op_movl_T2_0(void)
{
T2 = 0;
}
void OPPROTO op_movl_T2_1(void)
{
T2 = 1;
}
void OPPROTO op_jmp_im(void)
{ {
env->pc = PARAM1; env->pc = PARAM1;
} }
void OPPROTO op_call (void) void OPPROTO op_movl_npc_im(void)
{ {
regwptr[7] = PARAM1-4; env->npc = PARAM1;
env->pc = PARAM1+PARAM2;
} }
void OPPROTO op_jmpl (void) void OPPROTO op_movl_npc_T0(void)
{ {
env->npc = T0; env->npc = T0;
} }
void OPPROTO op_generic_jmp_1 (void) void OPPROTO op_next_insn(void)
{ {
T1 = PARAM1;
env->pc = PARAM1+PARAM2;
}
void OPPROTO op_generic_jmp_2 (void)
{
T1 = PARAM1;
env->pc = env->npc; env->pc = env->npc;
env->npc = env->npc + 4;
} }
unsigned long old_T0; void OPPROTO op_generic_branch(void)
void OPPROTO op_save_T0 (void)
{ {
old_T0 = T0; if (T2) {
env->npc = PARAM1;
} else {
env->npc = PARAM2;
}
FORCE_RET();
} }
void OPPROTO op_restore_T0 (void) void OPPROTO op_generic_branch_a(void)
{ {
T0 = old_T0; if (T2) {
} env->pc = PARAM2;
env->npc = PARAM1;
void OPPROTO op_generic_branch (void) } else {
{ env->pc = PARAM2 + 4;
if (T0) env->npc = PARAM2 + 8;
JUMP_TB (op_generic_branch, PARAM1, 0, PARAM2); }
else FORCE_RET();
JUMP_TB (op_generic_branch, PARAM1, 1, PARAM3);
FORCE_RET ();
}
void OPPROTO op_generic_branch_a (void)
{
if (T0)
env->npc = PARAM3;
else
JUMP_TB (op_generic_branch_a, PARAM1, 0, PARAM2);
FORCE_RET ();
} }

View File

@ -34,18 +34,13 @@
and the 'anull' bit in the branch instruction opcode is set. This is and the 'anull' bit in the branch instruction opcode is set. This is
currently solved by doing a jump after the delay slot instruction. currently solved by doing a jump after the delay slot instruction.
There is also one big (currently unsolved) bug in the branch code:
If a delay slot modifies the condition codes then the new condition
codes, instead of the old ones will be used.
TODO-list: TODO-list:
Register window overflow/underflow check
FPU-Instructions FPU-Instructions
Coprocessor-Instructions Coprocessor-Instructions
Fix above bug
Check signedness issues Check signedness issues
Privileged instructions Privileged instructions
Register window overflow/underflow check
Optimize synthetic instructions Optimize synthetic instructions
Optional alignment and privileged instruction check Optional alignment and privileged instruction check
@ -65,12 +60,8 @@
#define DEBUG_DISAS #define DEBUG_DISAS
typedef struct DisasContext { typedef struct DisasContext {
uint8_t *pc; uint8_t *pc; /* NULL means dynamic value */
uint8_t *npc; uint8_t *npc; /* NULL means dynamic value */
void (*branch) (struct DisasContext *, uint32_t, uint32_t);
unsigned int delay_slot:2;
uint32_t insn;
uint32_t target;
int is_br; int is_br;
struct TranslationBlock *tb; struct TranslationBlock *tb;
} DisasContext; } DisasContext;
@ -94,12 +85,12 @@ enum {
#define IS_IMM (insn & (1<<13)) #define IS_IMM (insn & (1<<13))
static void disas_sparc_insn (DisasContext *dc); static void disas_sparc_insn(DisasContext * dc);
typedef void (GenOpFunc)(void); typedef void (GenOpFunc) (void);
typedef void (GenOpFunc1)(long); typedef void (GenOpFunc1) (long);
typedef void (GenOpFunc2)(long, long); typedef void (GenOpFunc2) (long, long);
typedef void (GenOpFunc3)(long, long, long); typedef void (GenOpFunc3) (long, long, long);
static GenOpFunc *gen_op_movl_TN_reg[2][32] = { static GenOpFunc *gen_op_movl_TN_reg[2][32] = {
{ {
@ -283,399 +274,528 @@ static GenOpFunc1 *gen_op_movl_TN_im[3] = {
gen_op_movl_T2_im gen_op_movl_T2_im
}; };
static inline void gen_movl_imm_TN (int reg, int imm) static inline void gen_movl_imm_TN(int reg, int imm)
{ {
gen_op_movl_TN_im[reg](imm); gen_op_movl_TN_im[reg] (imm);
} }
static inline void gen_movl_imm_T1 (int val) static inline void gen_movl_imm_T1(int val)
{ {
gen_movl_imm_TN (1, val); gen_movl_imm_TN(1, val);
} }
static inline void gen_movl_imm_T0 (int val) static inline void gen_movl_imm_T0(int val)
{ {
gen_movl_imm_TN (0, val); gen_movl_imm_TN(0, val);
} }
static inline void gen_movl_reg_TN (int reg, int t) static inline void gen_movl_reg_TN(int reg, int t)
{ {
if (reg) gen_op_movl_reg_TN[t][reg](); if (reg)
else gen_movl_imm_TN (t, 0); gen_op_movl_reg_TN[t][reg] ();
else
gen_movl_imm_TN(t, 0);
} }
static inline void gen_movl_reg_T0 (int reg) static inline void gen_movl_reg_T0(int reg)
{ {
gen_movl_reg_TN (reg, 0); gen_movl_reg_TN(reg, 0);
} }
static inline void gen_movl_reg_T1 (int reg) static inline void gen_movl_reg_T1(int reg)
{ {
gen_movl_reg_TN (reg, 1); gen_movl_reg_TN(reg, 1);
} }
static inline void gen_movl_reg_T2 (int reg) static inline void gen_movl_reg_T2(int reg)
{ {
gen_movl_reg_TN (reg, 2); gen_movl_reg_TN(reg, 2);
} }
static inline void gen_movl_TN_reg (int reg, int t) static inline void gen_movl_TN_reg(int reg, int t)
{ {
if (reg) gen_op_movl_TN_reg[t][reg](); if (reg)
gen_op_movl_TN_reg[t][reg] ();
} }
static inline void gen_movl_T0_reg (int reg) static inline void gen_movl_T0_reg(int reg)
{ {
gen_movl_TN_reg (reg, 0); gen_movl_TN_reg(reg, 0);
} }
static inline void gen_movl_T1_reg (int reg) static inline void gen_movl_T1_reg(int reg)
{ {
gen_movl_TN_reg (reg, 1); gen_movl_TN_reg(reg, 1);
} }
static void do_branch (DisasContext *dc, uint32_t target, uint32_t insn) static void gen_cond(int cond)
{ {
unsigned int cond = GET_FIELD (insn, 3, 6), a = (insn & (1<<29)), ib = 0;
target += (uint32_t) dc->pc-4;
if (!a) disas_sparc_insn (dc);
switch (cond) { switch (cond) {
case 0x0: gen_op_movl_T0_0 (); break; case 0x0:
case 0x1: gen_op_eval_be (); break; gen_op_movl_T2_0();
case 0x2: gen_op_eval_ble (); break; break;
case 0x3: gen_op_eval_bl (); break; case 0x1:
case 0x4: gen_op_eval_bleu (); break; gen_op_eval_be();
case 0x5: gen_op_eval_bcs (); break; break;
case 0x6: gen_op_eval_bneg (); break; case 0x2:
case 0x7: gen_op_eval_bvs (); break; gen_op_eval_ble();
case 0x8: gen_op_movl_T0_1 (); break; break;
case 0x9: gen_op_eval_bne (); break; case 0x3:
case 0xa: gen_op_eval_bg (); break; gen_op_eval_bl();
case 0xb: gen_op_eval_bge (); break; break;
case 0xc: gen_op_eval_bgu (); break; case 0x4:
case 0xd: gen_op_eval_bcc (); break; gen_op_eval_bleu();
case 0xe: gen_op_eval_bpos (); break; break;
case 0xf: gen_op_eval_bvc (); break; case 0x5:
gen_op_eval_bcs();
break;
case 0x6:
gen_op_eval_bneg();
break;
case 0x7:
gen_op_eval_bvs();
break;
case 0x8:
gen_op_movl_T2_1();
break;
case 0x9:
gen_op_eval_bne();
break;
case 0xa:
gen_op_eval_bg();
break;
case 0xb:
gen_op_eval_bge();
break;
case 0xc:
gen_op_eval_bgu();
break;
case 0xd:
gen_op_eval_bcc();
break;
case 0xe:
gen_op_eval_bpos();
break;
default:
case 0xf:
gen_op_eval_bvc();
break;
} }
if (a && ((cond|0x8) != 0x8)) {
gen_op_generic_branch_a ((uint32_t) dc->tb,
(uint32_t) dc->pc+4, target);
disas_sparc_insn (dc);
ib = 1;
}
else
if (cond && !a) {
gen_op_generic_branch ((uint32_t) dc->tb, (uint32_t) target,
(uint32_t) dc->pc);
ib = 1;
}
if (ib) dc->is_br = DISAS_JUMP;
} }
/* target == 0x1 means CALL- else JMPL-instruction */
static void do_jump (DisasContext *dc, uint32_t target, uint32_t rd) static void do_branch(DisasContext * dc, uint32_t target, uint32_t insn)
{ {
uint32_t orig_pc = (uint32_t) dc->pc-8; unsigned int cond = GET_FIELD(insn, 3, 6), a = (insn & (1 << 29));
if (target != 0x1) target += (uint32_t) dc->pc;
gen_op_generic_jmp_1 (orig_pc, target); if (cond == 0x0) {
else /* unconditional not taken */
gen_op_generic_jmp_2 (orig_pc); if (a) {
gen_movl_T1_reg (rd); dc->pc = dc->npc + 4;
dc->is_br = DISAS_JUMP; dc->npc = dc->pc + 4;
gen_op_movl_T0_0 (); } else {
dc->pc = dc->npc;
dc->npc = dc->pc + 4;
}
} else if (cond == 0x8) {
/* unconditional taken */
if (a) {
dc->pc = (uint8_t *) target;
dc->npc = dc->pc + 4;
} else {
dc->pc = dc->npc;
dc->npc = (uint8_t *) target;
}
} else {
gen_cond(cond);
if (a) {
gen_op_generic_branch_a((uint32_t) target,
(uint32_t) (dc->npc));
dc->is_br = 1;
dc->pc = NULL;
dc->npc = NULL;
} else {
dc->pc = dc->npc;
gen_op_generic_branch((uint32_t) target,
(uint32_t) (dc->npc + 4));
dc->npc = NULL;
}
}
} }
#define GET_FIELDs(x,a,b) sign_extend (GET_FIELD(x,a,b), b-a) #define GET_FIELDs(x,a,b) sign_extend (GET_FIELD(x,a,b), (b) - (a) + 1)
static int static int sign_extend(int x, int len)
sign_extend (x, len)
int x, len;
{ {
int signbit = (1 << (len - 1)); len = 32 - len;
int mask = (signbit << 1) - 1; return (x << len) >> len;
return ((x & mask) ^ signbit) - signbit;
} }
static void disas_sparc_insn (DisasContext *dc) static inline void save_state(DisasContext * dc)
{
gen_op_jmp_im((uint32_t)dc->pc);
if (dc->npc != NULL)
gen_op_movl_npc_im((long) dc->npc);
}
static void disas_sparc_insn(DisasContext * dc)
{ {
unsigned int insn, opc, rs1, rs2, rd; unsigned int insn, opc, rs1, rs2, rd;
if (dc->delay_slot == 1) { insn = ldl_code(dc->pc);
insn = dc->insn; opc = GET_FIELD(insn, 0, 1);
} else {
if (dc->delay_slot) dc->delay_slot--;
insn = htonl (*(unsigned int *) (dc->pc));
dc->pc += 4;
}
opc = GET_FIELD (insn, 0, 1); rd = GET_FIELD(insn, 2, 6);
rd = GET_FIELD (insn, 2, 6);
switch (opc) { switch (opc) {
case 0: /* branches/sethi */ case 0: /* branches/sethi */
{ {
unsigned int xop = GET_FIELD (insn, 7, 9); unsigned int xop = GET_FIELD(insn, 7, 9);
int target; int target;
target = GET_FIELD (insn, 10, 31); target = GET_FIELD(insn, 10, 31);
switch (xop) { switch (xop) {
case 0x0: case 0x1: /* UNIMPL */ case 0x0:
printf ("UNIMPLEMENTED: %p\n", dc->pc-4); case 0x1: /* UNIMPL */
exit (23); goto illegal_insn;
break;
case 0x2: /* BN+x */ case 0x2: /* BN+x */
{ {
target <<= 2; target <<= 2;
target = sign_extend (target, 22); target = sign_extend(target, 22);
do_branch (dc, target, insn); do_branch(dc, target, insn);
break; goto jmp_insn;
} }
case 0x3: /* FBN+x */ case 0x3: /* FBN+x */
break; break;
case 0x4: /* SETHI */ case 0x4: /* SETHI */
gen_movl_imm_T0 (target<<10); gen_movl_imm_T0(target << 10);
gen_movl_T0_reg (rd); gen_movl_T0_reg(rd);
break; break;
case 0x5: /*CBN+x*/ case 0x5: /*CBN+x */
break; break;
} }
break; break;
} }
case 1: /*CALL*/ case 1:
{ /*CALL*/ {
unsigned int target = GET_FIELDs (insn, 2, 31) << 2; unsigned int target = GET_FIELDs(insn, 2, 31) << 2;
if (dc->delay_slot) {
do_jump (dc, target, 15); gen_op_movl_T0_im((long) (dc->pc));
dc->delay_slot = 0; gen_movl_T0_reg(15);
} else { target = (long) dc->pc + target;
dc->insn = insn; dc->pc = dc->npc;
dc->delay_slot = 2; dc->npc = (uint8_t *) target;
}
break;
} }
goto jmp_insn;
case 2: /* FPU & Logical Operations */ case 2: /* FPU & Logical Operations */
{ {
unsigned int xop = GET_FIELD (insn, 7, 12); unsigned int xop = GET_FIELD(insn, 7, 12);
if (xop == 58) { /* generate trap */ if (xop == 0x3a) { /* generate trap */
dc->is_br = DISAS_JUMP; int cond;
gen_op_jmp_im ((uint32_t) dc->pc); rs1 = GET_FIELD(insn, 13, 17);
if (IS_IMM) gen_op_trap (GET_FIELD (insn, 25, 31)); gen_movl_reg_T0(rs1);
/* else XXX*/ if (IS_IMM) {
gen_op_movl_T0_0 (); gen_movl_imm_T1(GET_FIELD(insn, 25, 31));
break; } else {
rs2 = GET_FIELD(insn, 27, 31);
gen_movl_reg_T1(rs2);
} }
if (xop == 0x34 || xop == 0x35) { /* FPU Operations */ gen_op_add_T1_T0();
exit (33); save_state(dc);
cond = GET_FIELD(insn, 3, 6);
if (cond == 0x8) {
gen_op_trap_T0();
dc->is_br = 1;
goto jmp_insn;
} else {
gen_op_trapcc_T0();
} }
rs1 = GET_FIELD (insn, 13, 17); } else if (xop == 0x28) {
gen_movl_reg_T0 (rs1); rs1 = GET_FIELD(insn, 13, 17);
if (IS_IMM) { /* immediate */ switch(rs1) {
rs2 = GET_FIELDs (insn, 20, 31); case 0: /* rdy */
gen_movl_imm_T1 (rs2); gen_op_rdy();
} else { /* register */ gen_movl_T0_reg(rd);
rs2 = GET_FIELD (insn, 27, 31);
gen_movl_reg_T1 (rs2);
}
if (xop < 0x20) {
switch (xop &~ 0x10) {
case 0x0:
gen_op_add_T1_T0 ();
break;
case 0x1:
gen_op_and_T1_T0 ();
break;
case 0x2:
gen_op_or_T1_T0 ();
break;
case 0x3:
gen_op_xor_T1_T0 ();
break;
case 0x4:
gen_op_sub_T1_T0 ();
break;
case 0x5:
gen_op_andn_T1_T0 ();
break;
case 0x6:
gen_op_orn_T1_T0 ();
break;
case 0x7:
gen_op_xnor_T1_T0 ();
break;
case 0x8:
gen_op_addx_T1_T0 ();
break;
case 0xa:
gen_op_umul_T1_T0 ();
break;
case 0xb:
gen_op_smul_T1_T0 ();
break;
case 0xc:
gen_op_subx_T1_T0 ();
break;
case 0xe:
gen_op_udiv_T1_T0 ();
break;
case 0xf:
gen_op_sdiv_T1_T0 ();
break; break;
default: default:
exit (17); goto illegal_insn;
}
} else if (xop == 0x34 || xop == 0x35) { /* FPU Operations */
goto illegal_insn;
} else {
rs1 = GET_FIELD(insn, 13, 17);
gen_movl_reg_T0(rs1);
if (IS_IMM) { /* immediate */
rs2 = GET_FIELDs(insn, 19, 31);
gen_movl_imm_T1(rs2);
} else { /* register */
rs2 = GET_FIELD(insn, 27, 31);
gen_movl_reg_T1(rs2);
}
if (xop < 0x20) {
switch (xop & ~0x10) {
case 0x0:
if (xop & 0x10)
gen_op_add_T1_T0_cc();
else
gen_op_add_T1_T0();
break; break;
case 0x1:
gen_op_and_T1_T0();
if (xop & 0x10)
gen_op_logic_T0_cc();
break;
case 0x2:
gen_op_or_T1_T0();
if (xop & 0x10)
gen_op_logic_T0_cc();
break;
case 0x3:
gen_op_xor_T1_T0();
if (xop & 0x10)
gen_op_logic_T0_cc();
break;
case 0x4:
if (xop & 0x10)
gen_op_sub_T1_T0_cc();
else
gen_op_sub_T1_T0();
break;
case 0x5:
gen_op_andn_T1_T0();
if (xop & 0x10)
gen_op_logic_T0_cc();
break;
case 0x6:
gen_op_orn_T1_T0();
if (xop & 0x10)
gen_op_logic_T0_cc();
break;
case 0x7:
gen_op_xnor_T1_T0();
if (xop & 0x10)
gen_op_logic_T0_cc();
break;
case 0x8:
gen_op_addx_T1_T0();
if (xop & 0x10)
gen_op_set_flags();
break;
case 0xa:
gen_op_umul_T1_T0();
if (xop & 0x10)
gen_op_logic_T0_cc();
break;
case 0xb:
gen_op_smul_T1_T0();
if (xop & 0x10)
gen_op_logic_T0_cc();
break;
case 0xc:
gen_op_subx_T1_T0();
if (xop & 0x10)
gen_op_set_flags();
break;
case 0xe:
gen_op_udiv_T1_T0();
if (xop & 0x10)
gen_op_div_cc();
break;
case 0xf:
gen_op_sdiv_T1_T0();
if (xop & 0x10)
gen_op_div_cc();
break;
default:
goto illegal_insn;
} }
gen_movl_T0_reg (rd); gen_movl_T0_reg(rd);
if (xop & 0x10) {
gen_op_set_flags ();
}
} else { } else {
switch (xop) { switch (xop) {
case 0x24: /* mulscc */
gen_op_mulscc_T1_T0();
gen_movl_T0_reg(rd);
break;
case 0x25: /* SLL */ case 0x25: /* SLL */
gen_op_sll (); gen_op_sll();
gen_movl_T0_reg(rd);
break; break;
case 0x26: case 0x26:
gen_op_srl (); gen_op_srl();
gen_movl_T0_reg(rd);
break; break;
case 0x27: case 0x27:
gen_op_sra (); gen_op_sra();
gen_movl_T0_reg(rd);
break; break;
case 0x28: case 0x30: case 0x30:
{ {
unsigned int rdi = GET_FIELD (insn, 13, 17); gen_op_xor_T1_T0();
if (!rdi) (xop==0x28?gen_op_rdy ():gen_op_wry()); switch(rd) {
/* else gen_op_su_trap (); */ case 0:
gen_op_wry();
break; break;
default:
goto illegal_insn;
} }
/* Problem with jmpl: if restore is executed in the delay }
slot, then the wrong registers are beeing used */ break;
case 0x38: /* jmpl */ case 0x38: /* jmpl */
{ {
if (dc->delay_slot) { gen_op_add_T1_T0();
gen_op_add_T1_T0 (); gen_op_movl_npc_T0();
do_jump (dc, 1, rd); if (rd != 0) {
dc->delay_slot = 0; gen_op_movl_T0_im((long) (dc->pc));
} else { gen_movl_T0_reg(rd);
gen_op_add_T1_T0 ();
gen_op_jmpl ();
dc->insn = insn;
dc->delay_slot = 2;
} }
dc->pc = dc->npc;
dc->npc = NULL;
}
goto jmp_insn;
case 0x3b: /* flush */
/* nothing to do */
break; break;
}
case 0x3c: /* save */ case 0x3c: /* save */
gen_op_add_T1_T0 (); save_state(dc);
gen_op_save (); gen_op_add_T1_T0();
gen_movl_T0_reg (rd); gen_op_save();
gen_movl_T0_reg(rd);
break; break;
case 0x3d: /* restore */ case 0x3d: /* restore */
gen_op_add_T1_T0 (); save_state(dc);
gen_op_restore (); gen_op_add_T1_T0();
gen_movl_T0_reg (rd); gen_op_restore();
gen_movl_T0_reg(rd);
break; break;
default:
goto illegal_insn;
}
} }
} }
break; break;
} }
case 3: /* load/store instructions */ case 3: /* load/store instructions */
{ {
unsigned int xop = GET_FIELD (insn, 7, 12); unsigned int xop = GET_FIELD(insn, 7, 12);
rs1 = GET_FIELD (insn, 13, 17); rs1 = GET_FIELD(insn, 13, 17);
gen_movl_reg_T0 (rs1); gen_movl_reg_T0(rs1);
if (IS_IMM) { /* immediate */ if (IS_IMM) { /* immediate */
rs2 = GET_FIELDs (insn, 20, 31); rs2 = GET_FIELDs(insn, 19, 31);
gen_movl_imm_T1 (rs2); gen_movl_imm_T1(rs2);
} else { /* register */ } else { /* register */
rs2 = GET_FIELD (insn, 27, 31); rs2 = GET_FIELD(insn, 27, 31);
gen_movl_reg_T1 (rs2); gen_movl_reg_T1(rs2);
} }
gen_op_add_T1_T0 (); gen_op_add_T1_T0();
if (xop < 4 || xop > 7) { if (xop < 4 || xop > 7) {
switch (xop) { switch (xop) {
case 0x0: /* load word */ case 0x0: /* load word */
gen_op_ld (); gen_op_ld();
break; break;
case 0x1: /* load unsigned byte */ case 0x1: /* load unsigned byte */
gen_op_ldub (); gen_op_ldub();
break; break;
case 0x2: /* load unsigned halfword */ case 0x2: /* load unsigned halfword */
gen_op_lduh (); gen_op_lduh();
break; break;
case 0x3: /* load double word */ case 0x3: /* load double word */
gen_op_ldd (); gen_op_ldd();
gen_movl_T0_reg (rd+1); gen_movl_T0_reg(rd + 1);
break; break;
case 0x9: /* load signed byte */ case 0x9: /* load signed byte */
gen_op_ldsb (); gen_op_ldsb();
break; break;
case 0xa: /* load signed halfword */ case 0xa: /* load signed halfword */
gen_op_ldsh (); gen_op_ldsh();
break; break;
case 0xd: /* ldstub -- XXX: should be atomically */ case 0xd: /* ldstub -- XXX: should be atomically */
gen_op_ldstub (); gen_op_ldstub();
break; break;
case 0x0f: /* swap register with memory. Also atomically */ case 0x0f: /* swap register with memory. Also atomically */
gen_op_swap (); gen_op_swap();
break; break;
} }
gen_movl_T1_reg (rd); gen_movl_T1_reg(rd);
} else if (xop < 8) { } else if (xop < 8) {
gen_movl_reg_T1 (rd); gen_movl_reg_T1(rd);
switch (xop) { switch (xop) {
case 0x4: case 0x4:
gen_op_st (); gen_op_st();
break; break;
case 0x5: case 0x5:
gen_op_stb (); gen_op_stb();
break; break;
case 0x6: case 0x6:
gen_op_sth (); gen_op_sth();
break; break;
case 0x7: case 0x7:
gen_op_st (); gen_movl_reg_T2(rd + 1);
gen_movl_reg_T1 (rd+1); gen_op_std();
gen_op_st ();
break; break;
} }
} }
} }
} }
/* default case for non jump instructions */
if (dc->npc != NULL) {
dc->pc = dc->npc;
dc->npc = dc->npc + 4;
} else {
dc->pc = NULL;
gen_op_next_insn();
}
jmp_insn:;
return;
illegal_insn:
gen_op_jmp_im((uint32_t)dc->pc);
if (dc->npc != NULL)
gen_op_movl_npc_im((long) dc->npc);
gen_op_exception(TT_ILL_INSN);
dc->is_br = 1;
} }
static inline int gen_intermediate_code_internal (TranslationBlock *tb, int spc) static inline int gen_intermediate_code_internal(TranslationBlock * tb,
int spc)
{ {
uint8_t *pc_start = (uint8_t *) tb->pc; uint8_t *pc_start, *last_pc;
uint16_t *gen_opc_end; uint16_t *gen_opc_end;
DisasContext dc; DisasContext dc1, *dc = &dc1;
memset (&dc, 0, sizeof (dc)); memset(dc, 0, sizeof(DisasContext));
if (spc) { if (spc) {
printf ("SearchPC not yet supported\n"); printf("SearchPC not yet supported\n");
exit (0); exit(0);
} }
dc.tb = tb; dc->tb = tb;
dc.pc = pc_start; pc_start = (uint8_t *) tb->pc;
dc->pc = pc_start;
dc->npc = (uint8_t *) tb->cs_base;
gen_opc_ptr = gen_opc_buf; gen_opc_ptr = gen_opc_buf;
gen_opc_end = gen_opc_buf + OPC_MAX_SIZE; gen_opc_end = gen_opc_buf + OPC_MAX_SIZE;
gen_opparam_ptr = gen_opparam_buf; gen_opparam_ptr = gen_opparam_buf;
do { do {
disas_sparc_insn (&dc); last_pc = dc->pc;
} while (!dc.is_br && (gen_opc_ptr < gen_opc_end) && disas_sparc_insn(dc);
(dc.pc - pc_start) < (TARGET_PAGE_SIZE - 32)); if (dc->is_br)
switch (dc.is_br) {
case DISAS_JUMP:
case DISAS_TB_JUMP:
gen_op_exit_tb ();
break; break;
} /* if the next PC is different, we abort now */
if (dc->pc != (last_pc + 4))
break;
} while ((gen_opc_ptr < gen_opc_end) &&
(dc->pc - pc_start) < (TARGET_PAGE_SIZE - 32));
if (dc->pc != NULL)
gen_op_jmp_im((long) dc->pc);
if (dc->npc != NULL)
gen_op_movl_npc_im((long) dc->npc);
gen_op_movl_T0_0();
gen_op_exit_tb();
*gen_opc_ptr = INDEX_op_end; *gen_opc_ptr = INDEX_op_end;
#ifdef DEBUG_DISAS #ifdef DEBUG_DISAS
if (loglevel) { if (loglevel) {
fprintf (logfile, "--------------\n"); fprintf(logfile, "--------------\n");
fprintf (logfile, "IN: %s\n", lookup_symbol (pc_start)); fprintf(logfile, "IN: %s\n", lookup_symbol(pc_start));
disas(logfile, pc_start, dc.pc - pc_start, 0, 0); disas(logfile, pc_start, last_pc + 4 - pc_start, 0, 0);
fprintf(logfile, "\n"); fprintf(logfile, "\n");
fprintf(logfile, "OP:\n"); fprintf(logfile, "OP:\n");
dump_ops(gen_opc_buf, gen_opparam_buf); dump_ops(gen_opc_buf, gen_opparam_buf);
@ -686,59 +806,60 @@ static inline int gen_intermediate_code_internal (TranslationBlock *tb, int spc)
return 0; return 0;
} }
int gen_intermediate_code (CPUSPARCState *env, TranslationBlock *tb) int gen_intermediate_code(CPUSPARCState * env, TranslationBlock * tb)
{ {
return gen_intermediate_code_internal(tb, 0); return gen_intermediate_code_internal(tb, 0);
} }
int gen_intermediate_code_pc (CPUSPARCState *env, TranslationBlock *tb) int gen_intermediate_code_pc(CPUSPARCState * env, TranslationBlock * tb)
{ {
return gen_intermediate_code_internal(tb, 1); return gen_intermediate_code_internal(tb, 1);
} }
void *mycpu; CPUSPARCState *cpu_sparc_init(void)
CPUSPARCState *cpu_sparc_init (void)
{ {
CPUSPARCState *env; CPUSPARCState *env;
cpu_exec_init (); cpu_exec_init();
if (!(env = malloc (sizeof(CPUSPARCState)))) if (!(env = malloc(sizeof(CPUSPARCState))))
return (NULL); return (NULL);
memset (env, 0, sizeof (*env)); memset(env, 0, sizeof(*env));
if (!(env->regwptr = malloc (0x2000))) env->cwp = 0;
return (NULL); env->wim = 1;
memset (env->regwptr, 0, 0x2000); env->regwptr = env->regbase + (env->cwp * 16);
env->regwptr += 127;
env->user_mode_only = 1; env->user_mode_only = 1;
mycpu = env;
return (env); return (env);
} }
#define GET_FLAG(a,b) ((env->psr & a)?b:'-') #define GET_FLAG(a,b) ((env->psr & a)?b:'-')
void cpu_sparc_dump_state (CPUSPARCState *env, FILE *f, int flags) void cpu_sparc_dump_state(CPUSPARCState * env, FILE * f, int flags)
{ {
int i, x; int i, x;
fprintf (f, "@PC: %p\n", (void *) env->pc); fprintf(f, "pc: 0x%08x npc: 0x%08x\n", (int) env->pc, (int) env->npc);
fprintf (f, "General Registers:\n"); fprintf(f, "General Registers:\n");
for (i=0;i<4;i++) for (i = 0; i < 4; i++)
fprintf (f, "%%g%c: %%%08x\t", i+'0', env->gregs[i]); fprintf(f, "%%g%c: 0x%08x\t", i + '0', env->gregs[i]);
fprintf (f, "\n"); fprintf(f, "\n");
for (;i<8;i++) for (; i < 8; i++)
fprintf (f, "%%g%c: %%%08x\t", i+'0', env->gregs[i]); fprintf(f, "%%g%c: 0x%08x\t", i + '0', env->gregs[i]);
fprintf (f, "\nCurrent Register Window:\n"); fprintf(f, "\nCurrent Register Window:\n");
for (x=0;x<3;x++) { for (x = 0; x < 3; x++) {
for (i=0;i<4;i++) for (i = 0; i < 4; i++)
fprintf (f, "%%%c%d: %%%08x\t", (x==0?'o':(x==1?'l':'i')), i, env->regwptr[i+x*8]); fprintf(f, "%%%c%d: 0x%08x\t",
fprintf (f, "\n"); (x == 0 ? 'o' : (x == 1 ? 'l' : 'i')), i,
for (;i<8;i++) env->regwptr[i + x * 8]);
fprintf (f, "%%%c%d: %%%08x\t", (x==0?'o':x==1?'l':'i'), i, env->regwptr[i+x*8]); fprintf(f, "\n");
fprintf (f, "\n"); for (; i < 8; i++)
fprintf(f, "%%%c%d: 0x%08x\t",
(x == 0 ? 'o' : x == 1 ? 'l' : 'i'), i,
env->regwptr[i + x * 8]);
fprintf(f, "\n");
} }
fprintf (f, "PSR: %x -> %c%c%c%c\n", env->psr, fprintf(f, "psr: 0x%08x -> %c%c%c%c wim: 0x%08x\n", env->psr | env->cwp,
GET_FLAG(PSR_ZERO, 'Z'), GET_FLAG(PSR_OVF, 'V'), GET_FLAG(PSR_ZERO, 'Z'), GET_FLAG(PSR_OVF, 'V'),
GET_FLAG(PSR_NEG, 'N'), GET_FLAG(PSR_CARRY, 'C')); GET_FLAG(PSR_NEG, 'N'), GET_FLAG(PSR_CARRY, 'C'),
env->wim);
} }