[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] target/hppa: move GETPC to HELPER() functions
From: |
Sven Schnelle |
Subject: |
[Qemu-devel] [PATCH 1/5] target/hppa: move GETPC to HELPER() functions |
Date: |
Mon, 11 Feb 2019 19:19:03 +0100 |
When QEMU is compiled with -O0, these functions are inlined
which will cause a wrong restart address generated for the TB.
Signed-off-by: Sven Schnelle <address@hidden>
---
target/hppa/op_helper.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c
index 6bf478e7b0..268caaaa20 100644
--- a/target/hppa/op_helper.c
+++ b/target/hppa/op_helper.c
@@ -81,10 +81,8 @@ static void atomic_store_3(CPUHPPAState *env, target_ulong
addr, uint32_t val,
}
static void do_stby_b(CPUHPPAState *env, target_ulong addr, target_ureg val,
- bool parallel)
+ bool parallel, uintptr_t ra)
{
- uintptr_t ra = GETPC();
-
switch (addr & 3) {
case 3:
cpu_stb_data_ra(env, addr, val, ra);
@@ -109,20 +107,18 @@ static void do_stby_b(CPUHPPAState *env, target_ulong
addr, target_ureg val,
void HELPER(stby_b)(CPUHPPAState *env, target_ulong addr, target_ureg val)
{
- do_stby_b(env, addr, val, false);
+ do_stby_b(env, addr, val, false, GETPC());
}
void HELPER(stby_b_parallel)(CPUHPPAState *env, target_ulong addr,
target_ureg val)
{
- do_stby_b(env, addr, val, true);
+ do_stby_b(env, addr, val, true, GETPC());
}
static void do_stby_e(CPUHPPAState *env, target_ulong addr, target_ureg val,
- bool parallel)
+ bool parallel, uintptr_t ra)
{
- uintptr_t ra = GETPC();
-
switch (addr & 3) {
case 3:
/* The 3 byte store must appear atomic. */
@@ -151,13 +147,13 @@ static void do_stby_e(CPUHPPAState *env, target_ulong
addr, target_ureg val,
void HELPER(stby_e)(CPUHPPAState *env, target_ulong addr, target_ureg val)
{
- do_stby_e(env, addr, val, false);
+ do_stby_e(env, addr, val, false, GETPC());
}
void HELPER(stby_e_parallel)(CPUHPPAState *env, target_ulong addr,
target_ureg val)
{
- do_stby_e(env, addr, val, true);
+ do_stby_e(env, addr, val, true, GETPC());
}
target_ureg HELPER(probe)(CPUHPPAState *env, target_ulong addr,
--
2.20.1
- [Qemu-devel] [PATCH 1/5] target/hppa: move GETPC to HELPER() functions,
Sven Schnelle <=
- [Qemu-devel] [PATCH 5/5] target/hppa: fix dcor instruction, Sven Schnelle, 2019/02/11
- [Qemu-devel] [PATCH 4/5] target/hppa: fix sed conditions, Sven Schnelle, 2019/02/11
- [Qemu-devel] [PATCH 3/5] target/hppa: fix log conditions, Sven Schnelle, 2019/02/11
- [Qemu-devel] [PATCH 2/5] target/hppa: fix '</<=' conditions, Sven Schnelle, 2019/02/11
- Re: [Qemu-devel] [PATCH 1/5] target/hppa: move GETPC to HELPER() functions, Richard Henderson, 2019/02/11