Revision 10eb0cc0

b/target-alpha/cpu.h
512 512
void call_pal (CPUState *env);
513 513
#endif
514 514

  
515
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
516
{
517
    env->pc = tb->pc;
518
}
519

  
520 515
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
521 516
                                        target_ulong *cs_base, int *flags)
522 517
{
b/target-alpha/exec.h
53 53
    return EXCP_HALTED;
54 54
}
55 55

  
56
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
57
{
58
    env->pc = tb->pc;
59
}
60

  
56 61
#endif /* !defined (__ALPHA_EXEC_H__) */
b/target-arm/cpu.h
437 437
#include "cpu-all.h"
438 438
#include "exec-all.h"
439 439

  
440
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
441
{
442
    env->regs[15] = tb->pc;
443
}
444

  
445 440
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
446 441
                                        target_ulong *cs_base, int *flags)
447 442
{
b/target-arm/exec.h
50 50
#endif
51 51

  
52 52
void raise_exception(int);
53

  
54
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
55
{
56
    env->regs[15] = tb->pc;
57
}
58

  
b/target-cris/cpu.h
252 252
#include "cpu-all.h"
253 253
#include "exec-all.h"
254 254

  
255
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
256
{
257
    env->pc = tb->pc;
258
}
259

  
260 255
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
261 256
                                        target_ulong *cs_base, int *flags)
262 257
{
b/target-cris/exec.h
45 45
	}
46 46
	return EXCP_HALTED;
47 47
}
48

  
49
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
50
{
51
    env->pc = tb->pc;
52
}
53

  
b/target-i386/cpu.h
941 941
#include "hw/apic.h"
942 942
#endif
943 943

  
944
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
945
{
946
    env->eip = tb->pc - tb->cs_base;
947
}
948

  
949 944
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
950 945
                                        target_ulong *cs_base, int *flags)
951 946
{
b/target-i386/exec.h
327 327
    if (env->efer & MSR_EFER_SVME)
328 328
        env->hflags |= HF_SVME_MASK;
329 329
}
330

  
331
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
332
{
333
    env->eip = tb->pc - tb->cs_base;
334
}
335

  
b/target-m68k/cpu.h
244 244
#include "cpu-all.h"
245 245
#include "exec-all.h"
246 246

  
247
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
248
{
249
    env->pc = tb->pc;
250
}
251

  
252 247
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
253 248
                                        target_ulong *cs_base, int *flags)
254 249
{
b/target-m68k/exec.h
42 42
    }
43 43
    return EXCP_HALTED;
44 44
}
45

  
46
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
47
{
48
    env->pc = tb->pc;
49
}
50

  
b/target-microblaze/cpu.h
307 307
#include "cpu-all.h"
308 308
#include "exec-all.h"
309 309

  
310
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
311
{
312
    env->sregs[SR_PC] = tb->pc;
313
}
314

  
315 310
static inline target_ulong cpu_get_pc(CPUState *env)
316 311
{
317 312
    return env->sregs[SR_PC];
b/target-microblaze/exec.h
44 44
	}
45 45
	return EXCP_HALTED;
46 46
}
47

  
48
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
49
{
50
    env->sregs[SR_PC] = tb->pc;
51
}
52

  
b/target-mips/cpu.h
612 612
		                               int rw);
613 613
#endif
614 614

  
615
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
616
{
617
    env->active_tc.PC = tb->pc;
618
    env->hflags &= ~MIPS_HFLAG_BMASK;
619
    env->hflags |= tb->flags & MIPS_HFLAG_BMASK;
620
}
621

  
622 615
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
623 616
                                        target_ulong *cs_base, int *flags)
624 617
{
b/target-mips/exec.h
76 76
    }
77 77
}
78 78

  
79
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
80
{
81
    env->active_tc.PC = tb->pc;
82
    env->hflags &= ~MIPS_HFLAG_BMASK;
83
    env->hflags |= tb->flags & MIPS_HFLAG_BMASK;
84
}
85

  
79 86
#endif /* !defined(__QEMU_MIPS_EXEC_H__) */
b/target-ppc/cpu.h
1601 1601

  
1602 1602
/*****************************************************************************/
1603 1603

  
1604
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
1605
{
1606
    env->nip = tb->pc;
1607
}
1608

  
1609 1604
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
1610 1605
                                        target_ulong *cs_base, int *flags)
1611 1606
{
b/target-ppc/exec.h
52 52
    return EXCP_HALTED;
53 53
}
54 54

  
55
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
56
{
57
    env->nip = tb->pc;
58
}
59

  
55 60
#endif /* !defined (__PPC_H__) */
b/target-s390x/cpu.h
123 123
#define EXCP_ADDR 5 /* addressing exception */
124 124
#define EXCP_EXECUTE_SVC 0xff00000 /* supervisor call via execute insn */
125 125

  
126
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock* tb)
127
{
128
    env->psw.addr = tb->pc;
129
}
130

  
131 126
static inline void cpu_get_tb_cpu_state(CPUState* env, target_ulong *pc,
132 127
                                        target_ulong *cs_base, int *flags)
133 128
{
b/target-s390x/exec.h
45 45
    }
46 46
    return EXCP_HALTED;
47 47
}
48

  
49
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock* tb)
50
{
51
    env->psw.addr = tb->pc;
52
}
53

  
b/target-sh4/cpu.h
303 303
#define PTEA_TC        (1 << 3)
304 304
#define cpu_ptea_tc(ptea) (((ptea) & PTEA_TC) >> 3)
305 305

  
306
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
307
{
308
    env->pc = tb->pc;
309
    env->flags = tb->flags;
310
}
311

  
312 306
#define TB_FLAG_PENDING_MOVCA  (1 << 4)
313 307

  
314 308
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
b/target-sh4/exec.h
47 47
#include "softmmu_exec.h"
48 48
#endif
49 49

  
50
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
51
{
52
    env->pc = tb->pc;
53
    env->flags = tb->flags;
54
}
55

  
50 56
#endif				/* _EXEC_SH4_H */
b/target-sparc/cpu.h
625 625
trap_state* cpu_tsptr(CPUState* env);
626 626
#endif
627 627

  
628
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
629
{
630
    env->pc = tb->pc;
631
    env->npc = tb->cs_base;
632
}
633

  
634 628
static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
635 629
                                        target_ulong *cs_base, int *flags)
636 630
{
b/target-sparc/exec.h
32 32
    return EXCP_HALTED;
33 33
}
34 34

  
35
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
36
{
37
    env->pc = tb->pc;
38
    env->npc = tb->cs_base;
39
}
40

  
35 41
#endif

Also available in: Unified diff