b8d43285a4
When support was added for TrustZone to ARM CPU emulation, we failed to correctly update the support for the linux-user implementation of the get/set_tls syscalls. This meant that accesses to the TPIDRURO register via the syscalls were always using the non-secure copy of the register even if native MRC/MCR accesses were using the secure register. This inconsistency caused most binaries to segfault on startup if the CPU type was explicitly set to one of the TZ-enabled ones like cortex-a15. (The default "any" CPU doesn't have TZ enabled and so is not affected.) Use access_secure_reg() to determine whether we should be using the secure or the nonsecure copy of TPIDRURO when emulating these syscalls. Signed-off-by: Mikhail Ilyin <m.ilin@samsung.com> Message-id: 1426505198-2411-1-git-send-email-m.ilin@samsung.com [PMM: rewrote commit message to more clearly explain the issue and its consequences.] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
49 lines
1.3 KiB
C
49 lines
1.3 KiB
C
/*
|
|
* ARM specific CPU ABI and functions for linux-user
|
|
*
|
|
* Copyright (c) 2003 Fabrice Bellard
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef TARGET_CPU_H
|
|
#define TARGET_CPU_H
|
|
|
|
static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp)
|
|
{
|
|
if (newsp) {
|
|
env->regs[13] = newsp;
|
|
}
|
|
env->regs[0] = 0;
|
|
}
|
|
|
|
static inline void cpu_set_tls(CPUARMState *env, target_ulong newtls)
|
|
{
|
|
if (access_secure_reg(env)) {
|
|
env->cp15.tpidruro_s = newtls;
|
|
} else {
|
|
env->cp15.tpidrro_el[0] = newtls;
|
|
}
|
|
}
|
|
|
|
static inline target_ulong cpu_get_tls(CPUARMState *env)
|
|
{
|
|
if (access_secure_reg(env)) {
|
|
return env->cp15.tpidruro_s;
|
|
} else {
|
|
return env->cp15.tpidrro_el[0];
|
|
}
|
|
}
|
|
|
|
#endif
|