3e23de1523
sparc32plus has 64bit long type but only 32bit virtual address space. For instance, "apt-get upgrade" failed because of a mmap()/msync() sequence. mmap() returned 0xff252000 but msync() used g2h(0xffffffffff252000) to find the host address. The "(target_ulong)" in g2h() doesn't fix the address because it is 64bit long. This patch introduces an "abi_ptr" that is set to uint32_t if the virtual address space is addressed using 32bit in the linux-user case. It stays set to target_ulong with softmmu case. Signed-off-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20180814171217.14680-1-laurent@vivier.eu> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> [lv: added "%" in TARGET_ABI_FMT_ptr "%"PRIx64]
144 lines
3.8 KiB
C
144 lines
3.8 KiB
C
/*
|
|
* User-only accessor function support
|
|
*
|
|
* Generate inline load/store functions for one data size.
|
|
*
|
|
* Generate a store function as well as signed and unsigned loads.
|
|
*
|
|
* Not used directly but included from cpu_ldst.h.
|
|
*
|
|
* Copyright (c) 2015 Linaro Limited
|
|
*
|
|
* 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/>.
|
|
*/
|
|
|
|
#if !defined(CODE_ACCESS)
|
|
#include "trace-root.h"
|
|
#endif
|
|
|
|
#include "trace/mem.h"
|
|
|
|
#if DATA_SIZE == 8
|
|
#define SUFFIX q
|
|
#define USUFFIX q
|
|
#define DATA_TYPE uint64_t
|
|
#define SHIFT 3
|
|
#elif DATA_SIZE == 4
|
|
#define SUFFIX l
|
|
#define USUFFIX l
|
|
#define DATA_TYPE uint32_t
|
|
#define SHIFT 2
|
|
#elif DATA_SIZE == 2
|
|
#define SUFFIX w
|
|
#define USUFFIX uw
|
|
#define DATA_TYPE uint16_t
|
|
#define DATA_STYPE int16_t
|
|
#define SHIFT 1
|
|
#elif DATA_SIZE == 1
|
|
#define SUFFIX b
|
|
#define USUFFIX ub
|
|
#define DATA_TYPE uint8_t
|
|
#define DATA_STYPE int8_t
|
|
#define SHIFT 0
|
|
#else
|
|
#error unsupported data size
|
|
#endif
|
|
|
|
#if DATA_SIZE == 8
|
|
#define RES_TYPE uint64_t
|
|
#else
|
|
#define RES_TYPE uint32_t
|
|
#endif
|
|
|
|
static inline RES_TYPE
|
|
glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr)
|
|
{
|
|
#if !defined(CODE_ACCESS)
|
|
trace_guest_mem_before_exec(
|
|
ENV_GET_CPU(env), ptr,
|
|
trace_mem_build_info(SHIFT, false, MO_TE, false));
|
|
#endif
|
|
return glue(glue(ld, USUFFIX), _p)(g2h(ptr));
|
|
}
|
|
|
|
static inline RES_TYPE
|
|
glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
|
|
abi_ptr ptr,
|
|
uintptr_t retaddr)
|
|
{
|
|
RES_TYPE ret;
|
|
helper_retaddr = retaddr;
|
|
ret = glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(env, ptr);
|
|
helper_retaddr = 0;
|
|
return ret;
|
|
}
|
|
|
|
#if DATA_SIZE <= 2
|
|
static inline int
|
|
glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr)
|
|
{
|
|
#if !defined(CODE_ACCESS)
|
|
trace_guest_mem_before_exec(
|
|
ENV_GET_CPU(env), ptr,
|
|
trace_mem_build_info(SHIFT, true, MO_TE, false));
|
|
#endif
|
|
return glue(glue(lds, SUFFIX), _p)(g2h(ptr));
|
|
}
|
|
|
|
static inline int
|
|
glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
|
|
abi_ptr ptr,
|
|
uintptr_t retaddr)
|
|
{
|
|
int ret;
|
|
helper_retaddr = retaddr;
|
|
ret = glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(env, ptr);
|
|
helper_retaddr = 0;
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
#ifndef CODE_ACCESS
|
|
static inline void
|
|
glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr,
|
|
RES_TYPE v)
|
|
{
|
|
#if !defined(CODE_ACCESS)
|
|
trace_guest_mem_before_exec(
|
|
ENV_GET_CPU(env), ptr,
|
|
trace_mem_build_info(SHIFT, false, MO_TE, true));
|
|
#endif
|
|
glue(glue(st, SUFFIX), _p)(g2h(ptr), v);
|
|
}
|
|
|
|
static inline void
|
|
glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
|
|
abi_ptr ptr,
|
|
RES_TYPE v,
|
|
uintptr_t retaddr)
|
|
{
|
|
helper_retaddr = retaddr;
|
|
glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(env, ptr, v);
|
|
helper_retaddr = 0;
|
|
}
|
|
#endif
|
|
|
|
#undef RES_TYPE
|
|
#undef DATA_TYPE
|
|
#undef DATA_STYPE
|
|
#undef SUFFIX
|
|
#undef USUFFIX
|
|
#undef DATA_SIZE
|
|
#undef SHIFT
|