david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target/hppa: Tidy do_cbranch

Browse Source 
Removes some dead code detected by Covarity.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2017-01-26 13:35:05 -08:00
parent 3d96995dec
commit a881c8e73f
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/hppa/translate.c
View File

@ -1433,7 +1433,6 @@ static ExitStatus do_cbranch(DisasContext *ctx, target_long disp, bool is_n,
target_ulong dest = iaoq_dest(ctx, disp); target_ulong dest = iaoq_dest(ctx, disp);
TCGLabel *taken = NULL; TCGLabel *taken = NULL;
TCGCond c = cond->c; TCGCond c = cond->c;
int which = 0;
bool n; bool n;
assert(ctx->null_cond.c == TCG_COND_NEVER); assert(ctx->null_cond.c == TCG_COND_NEVER);
@ -1455,14 +1454,14 @@ static ExitStatus do_cbranch(DisasContext *ctx, target_long disp, bool is_n,
n = is_n && disp < 0; n = is_n && disp < 0;
if (n && use_nullify_skip(ctx)) { if (n && use_nullify_skip(ctx)) {
nullify_set(ctx, 0); nullify_set(ctx, 0);
gen_goto_tb(ctx, which++, ctx->iaoq_n, ctx->iaoq_n + 4); gen_goto_tb(ctx, 0, ctx->iaoq_n, ctx->iaoq_n + 4);
} else { } else {
if (!n && ctx->null_lab) { if (!n && ctx->null_lab) {
gen_set_label(ctx->null_lab); gen_set_label(ctx->null_lab);
ctx->null_lab = NULL; ctx->null_lab = NULL;
} }
nullify_set(ctx, n); nullify_set(ctx, n);
gen_goto_tb(ctx, which++, ctx->iaoq_b, ctx->iaoq_n); gen_goto_tb(ctx, 0, ctx->iaoq_b, ctx->iaoq_n);
} }
gen_set_label(taken); gen_set_label(taken);
@ -1471,23 +1470,17 @@ static ExitStatus do_cbranch(DisasContext *ctx, target_long disp, bool is_n,
n = is_n && disp >= 0; n = is_n && disp >= 0;
if (n && use_nullify_skip(ctx)) { if (n && use_nullify_skip(ctx)) {
nullify_set(ctx, 0); nullify_set(ctx, 0);
gen_goto_tb(ctx, which++, dest, dest + 4); gen_goto_tb(ctx, 1, dest, dest + 4);
} else { } else {
nullify_set(ctx, n); nullify_set(ctx, n);
gen_goto_tb(ctx, which++, ctx->iaoq_b, dest); gen_goto_tb(ctx, 1, ctx->iaoq_b, dest);
} }
/* Not taken: the branch itself was nullified. */ /* Not taken: the branch itself was nullified. */
if (ctx->null_lab) { if (ctx->null_lab) {
gen_set_label(ctx->null_lab); gen_set_label(ctx->null_lab);
ctx->null_lab = NULL; ctx->null_lab = NULL;
if (which < 2) {
nullify_set(ctx, 0);
gen_goto_tb(ctx, which, ctx->iaoq_b, ctx->iaoq_n);
return EXIT_GOTO_TB;
} else {
return EXIT_IAQ_N_STALE; return EXIT_IAQ_N_STALE;
}
} else { } else {
return EXIT_GOTO_TB; return EXIT_GOTO_TB;
} }