Skip to content

Commit

Permalink
tcg: Delete unused cpu_pc_from_tb()
Browse files Browse the repository at this point in the history
No code uses the cpu_pc_from_tb() function. Delete from tricore and
arm which each provide an unused implementation. Update the comment
in tcg.h to reflect that this is obsoleted by synchronize_from_tb.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
pcrost authored and Michael Tokarev committed Apr 30, 2015
1 parent 2ed0c3d commit fee068e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 16 deletions.
9 changes: 0 additions & 9 deletions target-arm/cpu.h
Expand Up @@ -1874,15 +1874,6 @@ static inline void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,

#include "exec/exec-all.h"

static inline void cpu_pc_from_tb(CPUARMState *env, TranslationBlock *tb)
{
if (ARM_TBFLAG_AARCH64_STATE(tb->flags)) {
env->pc = tb->pc;
} else {
env->regs[15] = tb->pc;
}
}

enum {
QEMU_PSCI_CONDUIT_DISABLED = 0,
QEMU_PSCI_CONDUIT_SMC = 1,
Expand Down
5 changes: 0 additions & 5 deletions target-tricore/cpu.h
Expand Up @@ -395,9 +395,4 @@ int cpu_tricore_handle_mmu_fault(CPUState *cpu, target_ulong address,

#include "exec/exec-all.h"

static inline void cpu_pc_from_tb(CPUTriCoreState *env, TranslationBlock *tb)
{
env->PC = tb->pc;
}

#endif /*__TRICORE_CPU_H__ */
6 changes: 4 additions & 2 deletions tcg/tcg.h
Expand Up @@ -859,8 +859,10 @@ static inline size_t tcg_current_code_size(TCGContext *s)
* state is correctly synchronised and ready for execution of the next
* TB (and in particular the guest PC is the address to execute next).
* Otherwise, we gave up on execution of this TB before it started, and
* the caller must fix up the CPU state by calling cpu_pc_from_tb()
* with the next-TB pointer we return.
* the caller must fix up the CPU state by calling the CPU's
* synchronize_from_tb() method with the next-TB pointer we return (falling
* back to calling the CPU's set_pc method with tb->pb if no
* synchronize_from_tb() method exists).
*
* Note that TCG targets may use a different definition of tcg_qemu_tb_exec
* to this default (which just calls the prologue.code emitted by
Expand Down

0 comments on commit fee068e

Please sign in to comment.