This implements deposit, sextract and extract operations. The
tcg_out_[s]extract functions are used by several other functions
(e.g. tcg_out_ext*) and are intended to emit TCI code. So they have been
renamed to tcg_tci_out_[s]extract.
Signed-off-by: Kohei Tokunaga <ktokunaga.m...@gmail.com>
---
tcg/wasm32/tcg-target.c.inc | 122 ++++++++++++++++++++++++++++++++----
1 file changed, 109 insertions(+), 13 deletions(-)
diff --git a/tcg/wasm32/tcg-target.c.inc b/tcg/wasm32/tcg-target.c.inc
index b1ed16ad7a..d732d2f3c0 100644
--- a/tcg/wasm32/tcg-target.c.inc
+++ b/tcg/wasm32/tcg-target.c.inc
@@ -231,6 +231,20 @@ static void tcg_wasm_out_op_i64_extend_i32_u(TCGContext *s)
{
tcg_wasm_out8(s, 0xad);
}
+
+static void tcg_wasm_out_op_i32_and(TCGContext *s)
+{
+ tcg_wasm_out8(s, 0x71);
+}
+static void tcg_wasm_out_op_i32_or(TCGContext *s)
+{
+ tcg_wasm_out8(s, 0x72);
+}
+static void tcg_wasm_out_op_i32_shl(TCGContext *s)
+{
+ tcg_wasm_out8(s, 0x74);
+}
+
static void tcg_wasm_out_op_if_ret_i64(TCGContext *s)
{
tcg_wasm_out8(s, 0x04);
@@ -318,6 +332,23 @@ static void tcg_wasm_out_op_cond_i32(
tcg_wasm_out8(s, op);
}
+static void tcg_wasm_out_leb128_sint32_t(TCGContext *s, int32_t v)
+{
+ bool more = true;
+ uint8_t b;
+ while (more) {
+ b = v & 0x7f;
+ v >>= 7;
+ if (((v == 0) && ((b & 0x40) == 0)) ||
+ ((v == -1) && ((b & 0x40) != 0))) {
+ more = false;
+ } else {
+ b |= 0x80;
+ }
+ tcg_wasm_out8(s, b);
+ }
+}
+
static void tcg_wasm_out_leb128_sint64_t(TCGContext *s, int64_t v)
{
bool more = true;
@@ -335,6 +366,12 @@ static void tcg_wasm_out_leb128_sint64_t(TCGContext *s,
int64_t v)
}
}
+static void tcg_wasm_out_op_i32_const(TCGContext *s, int32_t v)
+{
+ tcg_wasm_out8(s, 0x41);
+ tcg_wasm_out_leb128_sint32_t(s, v);
+}
+
static void tcg_wasm_out_op_i64_const(TCGContext *s, int64_t v)
{
tcg_wasm_out8(s, 0x42);
@@ -466,6 +503,50 @@ static void tcg_wasm_out_movcond(TCGContext *s, TCGType
type, TCGReg ret,
tcg_wasm_out_op_global_set_r(s, ret);
}
+static void tcg_wasm_out_deposit(TCGContext *s,
+ TCGReg dest, TCGReg arg1, TCGReg arg2,
+ int pos, int len)
+{
+ int64_t mask = (((int64_t)1 << len) - 1) << pos;
+ tcg_wasm_out_op_global_get_r(s, arg1);
+ tcg_wasm_out_op_i64_const(s, ~mask);
+ tcg_wasm_out_op_i64_and(s);
+ tcg_wasm_out_op_global_get_r(s, arg2);
+ tcg_wasm_out_op_i64_const(s, pos);
+ tcg_wasm_out_op_i64_shl(s);
+ tcg_wasm_out_op_i64_const(s, mask);
+ tcg_wasm_out_op_i64_and(s);
+ tcg_wasm_out_op_i64_or(s);
+ tcg_wasm_out_op_global_set_r(s, dest);
+}
+
+static void tcg_wasm_out_extract(TCGContext *s, TCGReg dest, TCGReg arg1,
+ int pos, int len)
+{
+ int64_t mask = ~0ULL >> (64 - len);
+ tcg_wasm_out_op_global_get_r(s, arg1);
+ tcg_wasm_out_op_i64_const(s, pos);
+ tcg_wasm_out_op_i64_shr_u(s);
+ tcg_wasm_out_op_i64_const(s, mask);
+ tcg_wasm_out_op_i64_and(s);
+ tcg_wasm_out_op_global_set_r(s, dest);
+}
+
+static void tcg_wasm_out_sextract(TCGContext *s, TCGReg dest, TCGReg arg1,
+ int pos, int len)
+{
+ int rs = 64 - len;
+ int sl = rs - pos;
+ tcg_wasm_out_op_global_get_r(s, arg1);
+ if (sl > 0) {
+ tcg_wasm_out_op_i64_const(s, sl);
+ tcg_wasm_out_op_i64_shl(s);
+ }
+ tcg_wasm_out_op_i64_const(s, rs);
+ tcg_wasm_out_op_i64_shr_s(s);
+ tcg_wasm_out_op_global_set_r(s, dest);
+}
+
static bool patch_reloc(tcg_insn_unit *code_ptr_i, int type,
intptr_t value, intptr_t addend)
{
@@ -677,6 +758,12 @@ static void tcg_out_op_rrrrrc(TCGContext *s, TCGOpcode op,
tcg_out32(s, insn);
}
+static void tcg_tci_out_extract(TCGContext *s, TCGType type, TCGReg rd,
+ TCGReg rs, unsigned pos, unsigned len)
+{
+ tcg_out_op_rrbb(s, INDEX_op_extract, rd, rs, pos, len);
+}
+
static void tcg_out_ldst(TCGContext *s, TCGOpcode op, TCGReg val,
TCGReg base, intptr_t offset)
{
@@ -737,7 +824,8 @@ static void tcg_out_movi(TCGContext *s, TCGType type,
static void tcg_out_extract(TCGContext *s, TCGType type, TCGReg rd,
TCGReg rs, unsigned pos, unsigned len)
{
- tcg_out_op_rrbb(s, INDEX_op_extract, rd, rs, pos, len);
+ tcg_tci_out_extract(s, type, rd, rs, pos, len);
+ tcg_wasm_out_extract(s, rd, rs, pos, len);
}
static const TCGOutOpExtract outop_extract = {
@@ -745,10 +833,17 @@ static const TCGOutOpExtract outop_extract = {
.out_rr = tcg_out_extract,
};
+static void tcg_tci_out_sextract(TCGContext *s, TCGType type, TCGReg rd,
+ TCGReg rs, unsigned pos, unsigned len)
+{
+ tcg_out_op_rrbb(s, INDEX_op_sextract, rd, rs, pos, len);
+}
+
static void tcg_out_sextract(TCGContext *s, TCGType type, TCGReg rd,
TCGReg rs, unsigned pos, unsigned len)
{
- tcg_out_op_rrbb(s, INDEX_op_sextract, rd, rs, pos, len);
+ tcg_tci_out_sextract(s, type, rd, rs, pos, len);
+ tcg_wasm_out_sextract(s, rd, rs, pos, len);
}
static const TCGOutOpExtract outop_sextract = {
@@ -762,34 +857,34 @@ static const TCGOutOpExtract2 outop_extract2 = {
static void tcg_out_ext8s(TCGContext *s, TCGType type, TCGReg rd, TCGReg rs)
{
- tcg_out_sextract(s, type, rd, rs, 0, 8);
+ tcg_tci_out_sextract(s, type, rd, rs, 0, 8);
}
static void tcg_out_ext8u(TCGContext *s, TCGReg rd, TCGReg rs)
{
- tcg_out_extract(s, TCG_TYPE_REG, rd, rs, 0, 8);
+ tcg_tci_out_extract(s, TCG_TYPE_REG, rd, rs, 0, 8);
}
static void tcg_out_ext16s(TCGContext *s, TCGType type, TCGReg rd, TCGReg rs)
{
- tcg_out_sextract(s, type, rd, rs, 0, 16);
+ tcg_tci_out_sextract(s, type, rd, rs, 0, 16);
}
static void tcg_out_ext16u(TCGContext *s, TCGReg rd, TCGReg rs)
{
- tcg_out_extract(s, TCG_TYPE_REG, rd, rs, 0, 16);
+ tcg_tci_out_extract(s, TCG_TYPE_REG, rd, rs, 0, 16);
}
static void tcg_out_ext32s(TCGContext *s, TCGReg rd, TCGReg rs)
{
tcg_debug_assert(TCG_TARGET_REG_BITS == 64);
- tcg_out_sextract(s, TCG_TYPE_I64, rd, rs, 0, 32);
+ tcg_tci_out_sextract(s, TCG_TYPE_I64, rd, rs, 0, 32);
}
static void tcg_out_ext32u(TCGContext *s, TCGReg rd, TCGReg rs)
{
tcg_debug_assert(TCG_TARGET_REG_BITS == 64);
- tcg_out_extract(s, TCG_TYPE_I64, rd, rs, 0, 32);
+ tcg_tci_out_extract(s, TCG_TYPE_I64, rd, rs, 0, 32);
}
static void tcg_out_exts_i32_i64(TCGContext *s, TCGReg rd, TCGReg rs)
@@ -977,6 +1072,7 @@ static void tgen_deposit(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1,
TCGReg a2, unsigned ofs, unsigned len)
{
tcg_out_op_rrrbb(s, INDEX_op_deposit, a0, a1, a2, ofs, len);
+ tcg_wasm_out_deposit(s, a0, a1, a2, ofs, len);
}
static const TCGOutOpDeposit outop_deposit = {
@@ -1034,7 +1130,7 @@ static const TCGOutOpBinary outop_eqv = {
#if TCG_TARGET_REG_BITS == 64
static void tgen_extrh_i64_i32(TCGContext *s, TCGType t, TCGReg a0, TCGReg a1)
{
- tcg_out_extract(s, TCG_TYPE_I64, a0, a1, 32, 32);
+ tcg_tci_out_extract(s, TCG_TYPE_I64, a0, a1, 32, 32);
}
static const TCGOutOpUnary outop_extrh_i64_i32 = {
@@ -1198,7 +1294,7 @@ static void tgen_sar(TCGContext *s, TCGType type,
{
TCGReg orig_a1 = a1;
if (type < TCG_TYPE_REG) {
- tcg_out_ext32s(s, TCG_REG_TMP, a1);
+ tcg_tci_out_sextract(s, TCG_TYPE_I64, TCG_REG_TMP, a1, 0, 32);
a1 = TCG_REG_TMP;
}
tcg_out_op_rrr(s, INDEX_op_sar, a0, a1, a2);
@@ -1227,7 +1323,7 @@ static void tgen_shr(TCGContext *s, TCGType type,
{
TCGReg orig_a1 = a1;
if (type < TCG_TYPE_REG) {
- tcg_out_ext32u(s, TCG_REG_TMP, a1);
+ tcg_tci_out_extract(s, TCG_TYPE_I64, TCG_REG_TMP, a1, 0, 32);
a1 = TCG_REG_TMP;
}
tcg_out_op_rrr(s, INDEX_op_shr, a0, a1, a2);
@@ -1325,7 +1421,7 @@ static void tgen_bswap16(TCGContext *s, TCGType type,
{
tcg_out_op_rr(s, INDEX_op_bswap16, a0, a1);
if (flags & TCG_BSWAP_OS) {
- tcg_out_sextract(s, TCG_TYPE_REG, a0, a0, 0, 16);
+ tcg_tci_out_sextract(s, TCG_TYPE_REG, a0, a0, 0, 16);
}
}
@@ -1339,7 +1435,7 @@ static void tgen_bswap32(TCGContext *s, TCGType type,
{
tcg_out_op_rr(s, INDEX_op_bswap32, a0, a1);
if (flags & TCG_BSWAP_OS) {
- tcg_out_sextract(s, TCG_TYPE_REG, a0, a0, 0, 32);
+ tcg_tci_out_sextract(s, TCG_TYPE_REG, a0, a0, 0, 32);
}
}
--
2.43.0
