Skip to content

Commit

Permalink
linux-user/sparc: Use WREG constants in sparc/target_cpu.h
Browse files Browse the repository at this point in the history
This fixes a naming bug wherein we used "UREG_FP" to access the
stack pointer.  OTOH, the "UREG_FP" constant was also defined
incorrectly such that it *did* reference the stack pointer.

Note that the kernel legitimately uses the name "FP", because it
utilizes the rolled stack window in processing the system call.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20191106113318.10226-5-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
  • Loading branch information
rth7680 authored and vivier committed Nov 6, 2019
1 parent f8a7459 commit 083244d
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions linux-user/sparc/target_cpu.h
Expand Up @@ -41,15 +41,9 @@ static inline void cpu_set_tls(CPUSPARCState *env, target_ulong newtls)
env->gregs[7] = newtls;
}

#ifndef UREG_I6
#define UREG_I6 6
#endif
#ifndef UREG_FP
#define UREG_FP UREG_I6
#endif

static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state)
{
return state->regwptr[UREG_FP];
return state->regwptr[WREG_SP];
}

#endif

0 comments on commit 083244d

Please sign in to comment.