mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 17:23:56 -06:00
target/cris: Reindent op_helper.c
Fix all of the coding style errors in this file at once. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
parent
81ff3de728
commit
ac4df09f91
1 changed files with 398 additions and 419 deletions
|
|
@ -49,8 +49,9 @@ void helper_tlb_flush_pid(CPUCRISState *env, uint32_t pid)
|
|||
{
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
pid &= 0xff;
|
||||
if (pid != (env->pregs[PR_PID] & 0xff))
|
||||
if (pid != (env->pregs[PR_PID] & 0xff)) {
|
||||
cris_mmu_flush_pid(env, env->pregs[PR_PID]);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -82,12 +83,10 @@ void helper_movl_sreg_reg(CPUCRISState *env, uint32_t sreg, uint32_t reg)
|
|||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (srs == 1 || srs == 2) {
|
||||
if (sreg == 6) {
|
||||
/* Writes to tlb-hi write to mm_cause as a side
|
||||
effect. */
|
||||
/* Writes to tlb-hi write to mm_cause as a side effect. */
|
||||
env->sregs[SFR_RW_MM_TLB_HI] = env->regs[reg];
|
||||
env->sregs[SFR_R_MM_CAUSE] = env->regs[reg];
|
||||
}
|
||||
else if (sreg == 5) {
|
||||
} else if (sreg == 5) {
|
||||
uint32_t set;
|
||||
uint32_t idx;
|
||||
uint32_t lo, hi;
|
||||
|
|
@ -104,11 +103,9 @@ void helper_movl_sreg_reg(CPUCRISState *env, uint32_t sreg, uint32_t reg)
|
|||
/* Writes are done via r_mm_cause. */
|
||||
hi = env->sregs[SFR_R_MM_CAUSE];
|
||||
|
||||
vaddr = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].hi,
|
||||
13, 31);
|
||||
vaddr = EXTRACT_FIELD(env->tlbsets[srs - 1][set][idx].hi, 13, 31);
|
||||
vaddr <<= TARGET_PAGE_BITS;
|
||||
tlb_v = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo,
|
||||
3, 3);
|
||||
tlb_v = EXTRACT_FIELD(env->tlbsets[srs - 1][set][idx].lo, 3, 3);
|
||||
env->tlbsets[srs - 1][set][idx].lo = lo;
|
||||
env->tlbsets[srs - 1][set][idx].hi = hi;
|
||||
|
||||
|
|
@ -129,8 +126,7 @@ void helper_movl_reg_sreg(CPUCRISState *env, uint32_t reg, uint32_t sreg)
|
|||
srs = env->pregs[PR_SRS];
|
||||
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
if (srs == 1 || srs == 2)
|
||||
{
|
||||
if (srs == 1 || srs == 2) {
|
||||
uint32_t set;
|
||||
uint32_t idx;
|
||||
uint32_t lo, hi;
|
||||
|
|
@ -157,8 +153,7 @@ static void cris_ccs_rshift(CPUCRISState *env)
|
|||
/* Apply the ccs shift. */
|
||||
ccs = env->pregs[PR_CCS];
|
||||
ccs = (ccs & 0xc0000000) | ((ccs & 0x0fffffff) >> 10);
|
||||
if (ccs & U_FLAG)
|
||||
{
|
||||
if (ccs & U_FLAG) {
|
||||
/* Enter user mode. */
|
||||
env->ksp = env->regs[R_SP];
|
||||
env->regs[R_SP] = env->pregs[PR_USP];
|
||||
|
|
@ -179,9 +174,10 @@ void helper_rfe(CPUCRISState *env)
|
|||
cris_ccs_rshift(env);
|
||||
|
||||
/* RFE sets the P_FLAG only if the R_FLAG is not set. */
|
||||
if (!rflag)
|
||||
if (!rflag) {
|
||||
env->pregs[PR_CCS] |= P_FLAG;
|
||||
}
|
||||
}
|
||||
|
||||
void helper_rfn(CPUCRISState *env)
|
||||
{
|
||||
|
|
@ -195,8 +191,9 @@ void helper_rfn(CPUCRISState *env)
|
|||
cris_ccs_rshift(env);
|
||||
|
||||
/* Set the P_FLAG only if the R_FLAG is not set. */
|
||||
if (!rflag)
|
||||
if (!rflag) {
|
||||
env->pregs[PR_CCS] |= P_FLAG;
|
||||
}
|
||||
|
||||
/* Always set the M flag. */
|
||||
env->pregs[PR_CCS] |= M_FLAG_V32;
|
||||
|
|
@ -206,13 +203,15 @@ uint32_t helper_btst(CPUCRISState *env, uint32_t t0, uint32_t t1, uint32_t ccs)
|
|||
{
|
||||
/* FIXME: clean this up. */
|
||||
|
||||
/* des ref:
|
||||
The N flag is set according to the selected bit in the dest reg.
|
||||
The Z flag is set if the selected bit and all bits to the right are
|
||||
zero.
|
||||
The X flag is cleared.
|
||||
Other flags are left untouched.
|
||||
The destination reg is not affected.*/
|
||||
/*
|
||||
* des ref:
|
||||
* The N flag is set according to the selected bit in the dest reg.
|
||||
* The Z flag is set if the selected bit and all bits to the right are
|
||||
* zero.
|
||||
* The X flag is cleared.
|
||||
* Other flags are left untouched.
|
||||
* The destination reg is not affected.
|
||||
*/
|
||||
unsigned int fz, sbit, bset, mask, masked_t0;
|
||||
|
||||
sbit = t1 & 31;
|
||||
|
|
@ -223,8 +222,9 @@ uint32_t helper_btst(CPUCRISState *env, uint32_t t0, uint32_t t1, uint32_t ccs)
|
|||
|
||||
/* Clear the X, N and Z flags. */
|
||||
ccs = ccs & ~(X_FLAG | N_FLAG | Z_FLAG);
|
||||
if (env->pregs[PR_VR] < 32)
|
||||
if (env->pregs[PR_VR] < 32) {
|
||||
ccs &= ~(V_FLAG | C_FLAG);
|
||||
}
|
||||
/* Set the N and Z flags accordingly. */
|
||||
ccs |= (bset << 3) | (fz << 2);
|
||||
return ccs;
|
||||
|
|
@ -262,13 +262,14 @@ uint32_t helper_evaluate_flags_muls(CPUCRISState *env,
|
|||
tmp = mof;
|
||||
tmp <<= 32;
|
||||
tmp |= res;
|
||||
if (tmp == 0)
|
||||
if (tmp == 0) {
|
||||
flags |= Z_FLAG;
|
||||
else if (tmp < 0)
|
||||
} else if (tmp < 0) {
|
||||
flags |= N_FLAG;
|
||||
if ((dneg && mof != -1)
|
||||
|| (!dneg && mof != 0))
|
||||
}
|
||||
if ((dneg && mof != -1) || (!dneg && mof != 0)) {
|
||||
flags |= V_FLAG;
|
||||
}
|
||||
return evaluate_flags_writeback(env, flags, ccs);
|
||||
}
|
||||
|
||||
|
|
@ -281,12 +282,14 @@ uint32_t helper_evaluate_flags_mulu(CPUCRISState *env,
|
|||
tmp = mof;
|
||||
tmp <<= 32;
|
||||
tmp |= res;
|
||||
if (tmp == 0)
|
||||
if (tmp == 0) {
|
||||
flags |= Z_FLAG;
|
||||
else if (tmp >> 63)
|
||||
} else if (tmp >> 63) {
|
||||
flags |= N_FLAG;
|
||||
if (mof)
|
||||
}
|
||||
if (mof) {
|
||||
flags |= V_FLAG;
|
||||
}
|
||||
|
||||
return evaluate_flags_writeback(env, flags, ccs);
|
||||
}
|
||||
|
|
@ -299,23 +302,24 @@ uint32_t helper_evaluate_flags_mcp(CPUCRISState *env, uint32_t ccs,
|
|||
src = src & 0x80000000;
|
||||
dst = dst & 0x80000000;
|
||||
|
||||
if ((res & 0x80000000L) != 0L)
|
||||
{
|
||||
if ((res & 0x80000000L) != 0L) {
|
||||
flags |= N_FLAG;
|
||||
if (!src && !dst)
|
||||
if (!src && !dst) {
|
||||
flags |= V_FLAG;
|
||||
else if (src & dst)
|
||||
} else if (src & dst) {
|
||||
flags |= R_FLAG;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (res == 0L)
|
||||
} else {
|
||||
if (res == 0L) {
|
||||
flags |= Z_FLAG;
|
||||
if (src & dst)
|
||||
}
|
||||
if (src & dst) {
|
||||
flags |= V_FLAG;
|
||||
if (dst | src)
|
||||
}
|
||||
if (dst | src) {
|
||||
flags |= R_FLAG;
|
||||
}
|
||||
}
|
||||
|
||||
return evaluate_flags_writeback(env, flags, ccs);
|
||||
}
|
||||
|
|
@ -328,23 +332,24 @@ uint32_t helper_evaluate_flags_alu_4(CPUCRISState *env, uint32_t ccs,
|
|||
src = src & 0x80000000;
|
||||
dst = dst & 0x80000000;
|
||||
|
||||
if ((res & 0x80000000L) != 0L)
|
||||
{
|
||||
if ((res & 0x80000000L) != 0L) {
|
||||
flags |= N_FLAG;
|
||||
if (!src && !dst)
|
||||
if (!src && !dst) {
|
||||
flags |= V_FLAG;
|
||||
else if (src & dst)
|
||||
} else if (src & dst) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (res == 0L)
|
||||
} else {
|
||||
if (res == 0L) {
|
||||
flags |= Z_FLAG;
|
||||
if (src & dst)
|
||||
}
|
||||
if (src & dst) {
|
||||
flags |= V_FLAG;
|
||||
if (dst | src)
|
||||
}
|
||||
if (dst | src) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
}
|
||||
|
||||
return evaluate_flags_writeback(env, flags, ccs);
|
||||
}
|
||||
|
|
@ -357,23 +362,24 @@ uint32_t helper_evaluate_flags_sub_4(CPUCRISState *env, uint32_t ccs,
|
|||
src = (~src) & 0x80000000;
|
||||
dst = dst & 0x80000000;
|
||||
|
||||
if ((res & 0x80000000L) != 0L)
|
||||
{
|
||||
if ((res & 0x80000000L) != 0L) {
|
||||
flags |= N_FLAG;
|
||||
if (!src && !dst)
|
||||
if (!src && !dst) {
|
||||
flags |= V_FLAG;
|
||||
else if (src & dst)
|
||||
} else if (src & dst) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (res == 0L)
|
||||
} else {
|
||||
if (res == 0L) {
|
||||
flags |= Z_FLAG;
|
||||
if (src & dst)
|
||||
}
|
||||
if (src & dst) {
|
||||
flags |= V_FLAG;
|
||||
if (dst | src)
|
||||
}
|
||||
if (dst | src) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
}
|
||||
|
||||
flags ^= C_FLAG;
|
||||
return evaluate_flags_writeback(env, flags, ccs);
|
||||
|
|
@ -384,28 +390,33 @@ uint32_t helper_evaluate_flags_move_4(CPUCRISState *env,
|
|||
{
|
||||
uint32_t flags = 0;
|
||||
|
||||
if ((int32_t)res < 0)
|
||||
if ((int32_t)res < 0) {
|
||||
flags |= N_FLAG;
|
||||
else if (res == 0L)
|
||||
} else if (res == 0L) {
|
||||
flags |= Z_FLAG;
|
||||
}
|
||||
|
||||
return evaluate_flags_writeback(env, flags, ccs);
|
||||
}
|
||||
|
||||
uint32_t helper_evaluate_flags_move_2(CPUCRISState *env,
|
||||
uint32_t ccs, uint32_t res)
|
||||
{
|
||||
uint32_t flags = 0;
|
||||
|
||||
if ((int16_t)res < 0L)
|
||||
if ((int16_t)res < 0L) {
|
||||
flags |= N_FLAG;
|
||||
else if (res == 0)
|
||||
} else if (res == 0) {
|
||||
flags |= Z_FLAG;
|
||||
}
|
||||
|
||||
return evaluate_flags_writeback(env, flags, ccs);
|
||||
}
|
||||
|
||||
/* TODO: This is expensive. We could split things up and only evaluate part of
|
||||
CCR on a need to know basis. For now, we simply re-evaluate everything. */
|
||||
/*
|
||||
* TODO: This is expensive. We could split things up and only evaluate part of
|
||||
* CCR on a need to know basis. For now, we simply re-evaluate everything.
|
||||
*/
|
||||
void helper_evaluate_flags(CPUCRISState *env)
|
||||
{
|
||||
uint32_t src, dst, res;
|
||||
|
|
@ -415,112 +426,83 @@ void helper_evaluate_flags(CPUCRISState *env)
|
|||
dst = env->cc_dest;
|
||||
res = env->cc_result;
|
||||
|
||||
if (env->cc_op == CC_OP_SUB || env->cc_op == CC_OP_CMP)
|
||||
if (env->cc_op == CC_OP_SUB || env->cc_op == CC_OP_CMP) {
|
||||
src = ~src;
|
||||
|
||||
/* Now, evaluate the flags. This stuff is based on
|
||||
Per Zander's CRISv10 simulator. */
|
||||
switch (env->cc_size)
|
||||
{
|
||||
case 1:
|
||||
if ((res & 0x80L) != 0L)
|
||||
{
|
||||
flags |= N_FLAG;
|
||||
if (((src & 0x80L) == 0L)
|
||||
&& ((dst & 0x80L) == 0L))
|
||||
{
|
||||
flags |= V_FLAG;
|
||||
}
|
||||
else if (((src & 0x80L) != 0L)
|
||||
&& ((dst & 0x80L) != 0L))
|
||||
{
|
||||
|
||||
/*
|
||||
* Now, evaluate the flags. This stuff is based on
|
||||
* Per Zander's CRISv10 simulator.
|
||||
*/
|
||||
switch (env->cc_size) {
|
||||
case 1:
|
||||
if ((res & 0x80L) != 0L) {
|
||||
flags |= N_FLAG;
|
||||
if (((src & 0x80L) == 0L) && ((dst & 0x80L) == 0L)) {
|
||||
flags |= V_FLAG;
|
||||
} else if (((src & 0x80L) != 0L) && ((dst & 0x80L) != 0L)) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((res & 0xFFL) == 0L)
|
||||
{
|
||||
} else {
|
||||
if ((res & 0xFFL) == 0L) {
|
||||
flags |= Z_FLAG;
|
||||
}
|
||||
if (((src & 0x80L) != 0L)
|
||||
&& ((dst & 0x80L) != 0L))
|
||||
{
|
||||
if (((src & 0x80L) != 0L) && ((dst & 0x80L) != 0L)) {
|
||||
flags |= V_FLAG;
|
||||
}
|
||||
if ((dst & 0x80L) != 0L
|
||||
|| (src & 0x80L) != 0L)
|
||||
{
|
||||
if ((dst & 0x80L) != 0L || (src & 0x80L) != 0L) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if ((res & 0x8000L) != 0L)
|
||||
{
|
||||
if ((res & 0x8000L) != 0L) {
|
||||
flags |= N_FLAG;
|
||||
if (((src & 0x8000L) == 0L)
|
||||
&& ((dst & 0x8000L) == 0L))
|
||||
{
|
||||
if (((src & 0x8000L) == 0L) && ((dst & 0x8000L) == 0L)) {
|
||||
flags |= V_FLAG;
|
||||
}
|
||||
else if (((src & 0x8000L) != 0L)
|
||||
&& ((dst & 0x8000L) != 0L))
|
||||
{
|
||||
} else if (((src & 0x8000L) != 0L) && ((dst & 0x8000L) != 0L)) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((res & 0xFFFFL) == 0L)
|
||||
{
|
||||
} else {
|
||||
if ((res & 0xFFFFL) == 0L) {
|
||||
flags |= Z_FLAG;
|
||||
}
|
||||
if (((src & 0x8000L) != 0L)
|
||||
&& ((dst & 0x8000L) != 0L))
|
||||
{
|
||||
if (((src & 0x8000L) != 0L) && ((dst & 0x8000L) != 0L)) {
|
||||
flags |= V_FLAG;
|
||||
}
|
||||
if ((dst & 0x8000L) != 0L
|
||||
|| (src & 0x8000L) != 0L)
|
||||
{
|
||||
if ((dst & 0x8000L) != 0L || (src & 0x8000L) != 0L) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
if ((res & 0x80000000L) != 0L)
|
||||
{
|
||||
if ((res & 0x80000000L) != 0L) {
|
||||
flags |= N_FLAG;
|
||||
if (((src & 0x80000000L) == 0L)
|
||||
&& ((dst & 0x80000000L) == 0L))
|
||||
{
|
||||
if (((src & 0x80000000L) == 0L) && ((dst & 0x80000000L) == 0L)) {
|
||||
flags |= V_FLAG;
|
||||
}
|
||||
else if (((src & 0x80000000L) != 0L) &&
|
||||
((dst & 0x80000000L) != 0L))
|
||||
{
|
||||
} else if (((src & 0x80000000L) != 0L) &&
|
||||
((dst & 0x80000000L) != 0L)) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (res == 0L)
|
||||
} else {
|
||||
if (res == 0L) {
|
||||
flags |= Z_FLAG;
|
||||
if (((src & 0x80000000L) != 0L)
|
||||
&& ((dst & 0x80000000L) != 0L))
|
||||
}
|
||||
if (((src & 0x80000000L) != 0L) && ((dst & 0x80000000L) != 0L)) {
|
||||
flags |= V_FLAG;
|
||||
if ((dst & 0x80000000L) != 0L
|
||||
|| (src & 0x80000000L) != 0L)
|
||||
}
|
||||
if ((dst & 0x80000000L) != 0L || (src & 0x80000000L) != 0L) {
|
||||
flags |= C_FLAG;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (env->cc_op == CC_OP_SUB || env->cc_op == CC_OP_CMP)
|
||||
if (env->cc_op == CC_OP_SUB || env->cc_op == CC_OP_CMP) {
|
||||
flags ^= C_FLAG;
|
||||
}
|
||||
|
||||
env->pregs[PR_CCS] = evaluate_flags_writeback(env, flags,
|
||||
env->pregs[PR_CCS]);
|
||||
|
|
@ -528,22 +510,22 @@ void helper_evaluate_flags(CPUCRISState *env)
|
|||
|
||||
void helper_top_evaluate_flags(CPUCRISState *env)
|
||||
{
|
||||
switch (env->cc_op)
|
||||
{
|
||||
switch (env->cc_op) {
|
||||
case CC_OP_MCP:
|
||||
env->pregs[PR_CCS] = helper_evaluate_flags_mcp(env,
|
||||
env->pregs[PR_CCS], env->cc_src,
|
||||
env->cc_dest, env->cc_result);
|
||||
env->pregs[PR_CCS]
|
||||
= helper_evaluate_flags_mcp(env, env->pregs[PR_CCS],
|
||||
env->cc_src, env->cc_dest,
|
||||
env->cc_result);
|
||||
break;
|
||||
case CC_OP_MULS:
|
||||
env->pregs[PR_CCS] = helper_evaluate_flags_muls(env,
|
||||
env->pregs[PR_CCS], env->cc_result,
|
||||
env->pregs[PR_MOF]);
|
||||
env->pregs[PR_CCS]
|
||||
= helper_evaluate_flags_muls(env, env->pregs[PR_CCS],
|
||||
env->cc_result, env->pregs[PR_MOF]);
|
||||
break;
|
||||
case CC_OP_MULU:
|
||||
env->pregs[PR_CCS] = helper_evaluate_flags_mulu(env,
|
||||
env->pregs[PR_CCS], env->cc_result,
|
||||
env->pregs[PR_MOF]);
|
||||
env->pregs[PR_CCS]
|
||||
= helper_evaluate_flags_mulu(env, env->pregs[PR_CCS],
|
||||
env->cc_result, env->pregs[PR_MOF]);
|
||||
break;
|
||||
case CC_OP_MOVE:
|
||||
case CC_OP_AND:
|
||||
|
|
@ -552,8 +534,7 @@ void helper_top_evaluate_flags(CPUCRISState *env)
|
|||
case CC_OP_ASR:
|
||||
case CC_OP_LSR:
|
||||
case CC_OP_LSL:
|
||||
switch (env->cc_size)
|
||||
{
|
||||
switch (env->cc_size) {
|
||||
case 4:
|
||||
env->pregs[PR_CCS] =
|
||||
helper_evaluate_flags_move_4(env,
|
||||
|
|
@ -576,19 +557,18 @@ void helper_top_evaluate_flags(CPUCRISState *env)
|
|||
break;
|
||||
case CC_OP_SUB:
|
||||
case CC_OP_CMP:
|
||||
if (env->cc_size == 4)
|
||||
if (env->cc_size == 4) {
|
||||
env->pregs[PR_CCS] =
|
||||
helper_evaluate_flags_sub_4(env,
|
||||
env->pregs[PR_CCS],
|
||||
env->cc_src, env->cc_dest,
|
||||
env->cc_result);
|
||||
else
|
||||
} else {
|
||||
helper_evaluate_flags(env);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
{
|
||||
switch (env->cc_size)
|
||||
{
|
||||
switch (env->cc_size) {
|
||||
case 4:
|
||||
env->pregs[PR_CCS] =
|
||||
helper_evaluate_flags_alu_4(env,
|
||||
|
|
@ -600,7 +580,6 @@ void helper_top_evaluate_flags(CPUCRISState *env)
|
|||
helper_evaluate_flags(env);
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue