Commit 5010e5c4 authored by Sven Schnelle's avatar Sven Schnelle Committed by Richard Henderson
Browse files

target/hppa: move GETPC to HELPER() functions 



When QEMU is compiled with -O0, these functions are inlined
which will cause a wrong restart address generated for the TB.

Signed-off-by: default avatarSven Schnelle <svens@stackframe.org>
Message-Id: <20190211181907.2219-2-svens@stackframe.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 31274b46

target/hppa/op_helper.c

+6 −10
Original line number Diff line number Diff line
@@ -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,