Introduce a set of new runtime helpers do handle exclusive instructions. This helpers are used as hooks to call the respective LL/SC helpers in softmmu_llsc_template.h from TCG code.
Suggested-by: Jani Kokkonen <jani.kokko...@huawei.com> Suggested-by: Claudio Fontana <claudio.font...@huawei.com> Signed-off-by: Alvise Rigo <a.r...@virtualopensystems.com> --- Makefile.target | 2 +- include/exec/helper-gen.h | 1 + include/exec/helper-proto.h | 1 + include/exec/helper-tcg.h | 1 + tcg-llsc-helper.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ tcg-llsc-helper.h | 35 ++++++++++++++ tcg/tcg-llsc-gen-helper.h | 32 +++++++++++++ 7 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 tcg-llsc-helper.c create mode 100644 tcg-llsc-helper.h create mode 100644 tcg/tcg-llsc-gen-helper.h diff --git a/Makefile.target b/Makefile.target index 962d004..e9fbcdc 100644 --- a/Makefile.target +++ b/Makefile.target @@ -135,7 +135,7 @@ obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o obj-y += qtest.o bootdevice.o obj-y += hw/ obj-$(CONFIG_KVM) += kvm-all.o -obj-y += memory.o cputlb.o +obj-y += memory.o cputlb.o tcg-llsc-helper.o obj-y += memory_mapping.o obj-y += dump.o obj-y += migration/ram.o migration/savevm.o diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index 0d0da3a..d45cdad2 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -60,6 +60,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ #include "trace/generated-helpers.h" #include "trace/generated-helpers-wrappers.h" #include "tcg-runtime.h" +#include "tcg-llsc-gen-helper.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index effdd43..90be2fd 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -29,6 +29,7 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \ #include "helper.h" #include "trace/generated-helpers.h" #include "tcg-runtime.h" +#include "tcg/tcg-llsc-gen-helper.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 79fa3c8..0c0dc71 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -38,6 +38,7 @@ #include "helper.h" #include "trace/generated-helpers.h" #include "tcg-runtime.h" +#include "tcg-llsc-gen-helper.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/tcg-llsc-helper.c b/tcg-llsc-helper.c new file mode 100644 index 0000000..04cc8b1 --- /dev/null +++ b/tcg-llsc-helper.c @@ -0,0 +1,109 @@ +/* + * Runtime helpers for atomic istruction emulation + * + * Copyright (c) 2015 Virtual Open Systems + * + * Authors: + * Alvise Rigo <a.r...@virtualopensystems.com> + * + * 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/>. + */ + +#include "exec/cpu_ldst.h" +#include "exec/helper-head.h" +#include "tcg-llsc-helper.h" + +#define LDEX_HELPER(SUFF, OPC, FUNC) \ +uint32_t HELPER(ldlink_aa32_i##SUFF)(CPUArchState *env, uint32_t addr, \ + uint32_t index) \ +{ \ + CPUArchState *state = env; \ + TCGMemOpIdx op; \ + \ + op = make_memop_idx(OPC, index); \ + \ + return (uint32_t)FUNC(state, addr, op, GETRA()); \ +} + +LDEX_HELPER(8, MO_UB, helper_ret_ldlinkub_mmu) + +LDEX_HELPER(16_be, MO_BEUW, helper_be_ldlinkuw_mmu) +LDEX_HELPER(32_be, MO_BEUL, helper_be_ldlinkul_mmu) + +uint64_t HELPER(ldlink_aa32_i64_be)(CPUArchState *env, uint32_t addr, + uint32_t index) +{ + CPUArchState *state = env; + TCGMemOpIdx op; + + op = make_memop_idx(MO_BEQ, index); + + return helper_be_ldlinkq_mmu(state, addr, op, GETRA()); +} + +LDEX_HELPER(16_le, MO_LEUW, helper_le_ldlinkuw_mmu) +LDEX_HELPER(32_le, MO_LEUL, helper_le_ldlinkq_mmu) + +uint64_t HELPER(ldlink_aa32_i64_le)(CPUArchState *env, uint32_t addr, + uint32_t index) +{ + CPUArchState *state = env; + TCGMemOpIdx op; + + op = make_memop_idx(MO_LEQ, index); + + return helper_le_ldlinkq_mmu(state, addr, op, GETRA()); +} + +#define STEX_HELPER(SUFF, DATA_TYPE, OPC, FUNC) \ +uint32_t HELPER(stcond_aa32_i##SUFF)(CPUArchState *env, uint32_t addr, \ + uint32_t val, uint32_t index) \ +{ \ + CPUArchState *state = env; \ + TCGMemOpIdx op; \ + \ + op = make_memop_idx(OPC, index); \ + \ + return (uint32_t)FUNC(state, addr, val, op, GETRA()); \ +} + +STEX_HELPER(8, uint8_t, MO_UB, helper_ret_stcondb_mmu) + +STEX_HELPER(16_be, uint16_t, MO_BEUW, helper_be_stcondw_mmu) +STEX_HELPER(32_be, uint32_t, MO_BEUL, helper_be_stcondl_mmu) + +uint32_t HELPER(stcond_aa32_i64_be)(CPUArchState *env, uint32_t addr, + uint64_t val, uint32_t index) +{ + CPUArchState *state = env; + TCGMemOpIdx op; + + op = make_memop_idx(MO_BEQ, index); + + return (uint32_t)helper_be_stcondq_mmu(state, addr, val, op, GETRA()); +} + +STEX_HELPER(16_le, uint16_t, MO_LEUW, helper_le_stcondw_mmu) +STEX_HELPER(32_le, uint32_t, MO_LEUL, helper_le_stcondl_mmu) + +uint32_t HELPER(stcond_aa32_i64_le)(CPUArchState *env, uint32_t addr, + uint64_t val, uint32_t index) +{ + CPUArchState *state = env; + TCGMemOpIdx op; + + op = make_memop_idx(MO_LEQ, index); + + return (uint32_t)helper_le_stcondq_mmu(state, addr, val, op, GETRA()); +} diff --git a/tcg-llsc-helper.h b/tcg-llsc-helper.h new file mode 100644 index 0000000..bbe42c3 --- /dev/null +++ b/tcg-llsc-helper.h @@ -0,0 +1,35 @@ +#ifndef HELPER_LLSC_HEAD_H +#define HELPER_LLSC_HEAD_H 1 + +uint32_t HELPER(ldlink_aa32_i8)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint32_t HELPER(ldlink_aa32_i16_be)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint32_t HELPER(ldlink_aa32_i32_be)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint64_t HELPER(ldlink_aa32_i64_be)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint32_t HELPER(ldlink_aa32_i16_le)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint32_t HELPER(ldlink_aa32_i32_le)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint64_t HELPER(ldlink_aa32_i64_le)(CPUArchState *env, uint32_t addr, + uint32_t index); + + +uint32_t HELPER(stcond_aa32_i8)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i16_be)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i32_be)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i64_be)(CPUArchState *env, uint32_t addr, + uint64_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i16_le)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i32_le)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i64_le)(CPUArchState *env, uint32_t addr, + uint64_t val, uint32_t index); + +#endif diff --git a/tcg/tcg-llsc-gen-helper.h b/tcg/tcg-llsc-gen-helper.h new file mode 100644 index 0000000..2b647cd --- /dev/null +++ b/tcg/tcg-llsc-gen-helper.h @@ -0,0 +1,32 @@ +DEF_HELPER_3(ldlink_aa32_i8, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i16_be, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i32_be, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i64_be, i64, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i16_le, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i32_le, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i64_le, i64, env, i32, i32) + +DEF_HELPER_4(stcond_aa32_i8, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i16_be, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i32_be, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i64_be, i32, env, i32, i64, i32) +DEF_HELPER_4(stcond_aa32_i16_le, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i32_le, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i64_le, i32, env, i32, i64, i32) + +/* Convenient aliases */ +#ifdef TARGET_WORDS_BIGENDIAN +#define gen_helper_stcond_aa32_i16 gen_helper_stcond_aa32_i16_be +#define gen_helper_stcond_aa32_i32 gen_helper_stcond_aa32_i32_be +#define gen_helper_stcond_aa32_i64 gen_helper_stcond_aa32_i64_be +#define gen_helper_ldlink_aa32_i16 gen_helper_ldlink_aa32_i16_be +#define gen_helper_ldlink_aa32_i32 gen_helper_ldlink_aa32_i32_be +#define gen_helper_ldlink_aa32_i64 gen_helper_ldlink_aa32_i64_be +#else +#define gen_helper_stcond_aa32_i16 gen_helper_stcond_aa32_i16_le +#define gen_helper_stcond_aa32_i32 gen_helper_stcond_aa32_i32_le +#define gen_helper_stcond_aa32_i64 gen_helper_stcond_aa32_i64_le +#define gen_helper_ldlink_aa32_i16 gen_helper_ldlink_aa32_i16_le +#define gen_helper_ldlink_aa32_i32 gen_helper_ldlink_aa32_i32_le +#define gen_helper_ldlink_aa32_i64 gen_helper_ldlink_aa32_i64_le +#endif -- 2.6.4
