[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 2/7] cpu-exec: simplify icount code
From: |
Paolo Bonzini |
Subject: |
[Qemu-trivial] [PATCH 2/7] cpu-exec: simplify icount code |
Date: |
Mon, 26 Jan 2015 12:12:22 +0100 |
Use MIN instead of an "if" statement. Move "tb" assignment where
the value is actually used.
Signed-off-by: Paolo Bonzini <address@hidden>
---
cpu-exec.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index 7aab86d..af56a34 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -502,22 +502,17 @@ int cpu_exec(CPUArchState *env)
case TB_EXIT_ICOUNT_EXPIRED:
{
/* Instruction counter expired. */
- int insns_left;
- tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK);
- insns_left = cpu->icount_decr.u32;
+ int insns_left = cpu->icount_decr.u32;
if (cpu->icount_extra && insns_left >= 0) {
/* Refill decrementer and continue execution. */
cpu->icount_extra += insns_left;
- if (cpu->icount_extra > 0xffff) {
- insns_left = 0xffff;
- } else {
- insns_left = cpu->icount_extra;
- }
+ insns_left = MIN(0xffff, cpu->icount_extra);
cpu->icount_extra -= insns_left;
cpu->icount_decr.u16.low = insns_left;
} else {
if (insns_left > 0) {
/* Execute remaining instructions. */
+ tb = (TranslationBlock *)(next_tb &
~TB_EXIT_MASK);
cpu_exec_nocache(env, insns_left, tb);
align_clocks(&sc, cpu);
}
--
1.8.3.1
- [Qemu-trivial] [PATCH 0/7] Six coverity fixes and a cleanup, Paolo Bonzini, 2015/01/26
- [Qemu-trivial] [PATCH 2/7] cpu-exec: simplify icount code,
Paolo Bonzini <=
- [Qemu-trivial] [PATCH 5/7] cutils: refine strtol error handling in parse_debug_env, Paolo Bonzini, 2015/01/26
- [Qemu-trivial] [PATCH 3/7] uri: avoid NULL arguments to strcmp, Paolo Bonzini, 2015/01/26
- [Qemu-trivial] [PATCH 4/7] qemu-sockets: improve error reporting in unix_listen_opts, Paolo Bonzini, 2015/01/26
- [Qemu-trivial] [PATCH 6/7] aes: remove a dead return statement, Paolo Bonzini, 2015/01/26
- [Qemu-trivial] [PATCH 1/7] cpu-exec: drop dead assignment, Paolo Bonzini, 2015/01/26
- [Qemu-trivial] [PATCH 7/7] migration: do floating-point division, Paolo Bonzini, 2015/01/26