From nobody Wed Nov 5 08:20:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535848657243867.292161838299; Sat, 1 Sep 2018 17:37:37 -0700 (PDT) Received: from localhost ([::1]:38895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwGOW-0004dU-5W for importer@patchew.org; Sat, 01 Sep 2018 20:37:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwGLB-0001l4-OR for qemu-devel@nongnu.org; Sat, 01 Sep 2018 20:34:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fwGLA-0003eB-EE for qemu-devel@nongnu.org; Sat, 01 Sep 2018 20:34:09 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35091) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fwGLA-0003d8-8r; Sat, 01 Sep 2018 20:34:08 -0400 Received: by mail-qt0-x242.google.com with SMTP id j7-v6so18526638qtp.2; Sat, 01 Sep 2018 17:34:08 -0700 (PDT) Received: from WAL-L-PZ01.rocketsoftware.com (inet-64-112-177-9.bos.netblazr.com. [64.112.177.9]) by smtp.gmail.com with ESMTPSA id i125-v6sm8426810qke.36.2018.09.01.17.34.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Sep 2018 17:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mFtggaIrCvtMyBtJ9IMfHPfn7xlEpZrtwv9SPnx1zGk=; b=pifpRwpCxTRi1pPzc6hFdkVIxrV0YC9kzRnELFS44afdfqZVWjGogoG0pEPchw6znt faGsp+hb+KtSftnjMHLwX+hDZV+d4Q5iIBsYdtlZmsW+j0cF72nlAaq59UZilqacrHpP J5xkyZbr4CpubQdK0P5eealc9aPNGffdDNOIRVb80rE+1M6VGi/T2I0RFmEwU6cc88xP /ynsUMt7UloyPQNUM8HVtW8Mhh+6Vp5Y/2wmP+jEe2K4Q4E+dxOCX+YkzSTORjb2HAMC u0BPRrSUzfJ9gyH3QdWn+4pnyab3boZsNmiohdcK+yQVPOMTDEqoQV99DU9zuh+n5CB9 IJxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mFtggaIrCvtMyBtJ9IMfHPfn7xlEpZrtwv9SPnx1zGk=; b=NA8efIec3hGGqqp8/jj8X2s+KgtVTGtQUfpL+CPYP+XRFH1Mi2Heima14VOz0MQQ6h JFryZBSFb/0qv5C+P8Nci1P7Z5etbwifXR+JR3hPWt6OV2ypt8+QEP6KsMlnFDyhviLU qpSHloeTFLsspWXmzz/473SxnuzBO3AhVGdZFyl7Vep7ZgHR9Ypy23QlFYWBWkz6CXln +hbDjUxALpKOhKPbKk8Qf1qZcDrRwW/Cg4gIuh4lefzvwiOGXo4tjywsEURRGvM3XCjO LC4jsHVY4wLiSU9UWIQ+pTNPEbpeeOH/ObCMJYtayVWHPDYTQelWJRonv7nEHviJ05kG AWNw== X-Gm-Message-State: APzg51AuST7iJQrRoPuLRBV5gbP2LWm0Ksx31Dx01aMFwaB4tr1oi5Ox AVWr/+mUdIf2Pf09MTEsEkkEcKEbLGg= X-Google-Smtp-Source: ANB0VdYBaTj6jlMAw2inWSjmcP3UV4Mkl8nH5UILvwnY8Enk49O82N3XoQ0gU4bUncV125WniRtEwg== X-Received: by 2002:ac8:2278:: with SMTP id p53-v6mr20493213qtp.200.1535848447669; Sat, 01 Sep 2018 17:34:07 -0700 (PDT) From: Pavel Zbitskiy To: qemu-devel@nongnu.org Date: Sat, 1 Sep 2018 20:33:22 -0400 Message-Id: <20180902003322.3428-4-pavel.zbitskiy@gmail.com> In-Reply-To: <20180902003322.3428-1-pavel.zbitskiy@gmail.com> References: <20180902003322.3428-1-pavel.zbitskiy@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v5 3/3] target/s390x: implement CVB, CVBY and CVBG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pavel Zbitskiy , david@redhat.com, cohuck@redhat.com, richard.henderson@linaro.org, Alexander Graf , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Convert to Binary - counterparts of the already implemented Convert to Decimal (CVD*) instructions. Example from the Principles of Operation: 25594C becomes 63FA. Signed-off-by: Pavel Zbitskiy --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 4 +++ target/s390x/int_helper.c | 52 +++++++++++++++++++++++++++++++++ target/s390x/translate.c | 11 +++++++ tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/cvb.c | 18 ++++++++++++ 6 files changed, 87 insertions(+) create mode 100644 tests/tcg/s390x/cvb.c diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 97c60ca7bc..46baaee0ab 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -88,6 +88,7 @@ DEF_HELPER_FLAGS_4(tcxb, TCG_CALL_NO_RWG_SE, i32, env, i6= 4, i64, i64) DEF_HELPER_FLAGS_2(sqeb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_2(sqdb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_3(sqxb, TCG_CALL_NO_WG, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(cvb, TCG_CALL_NO_WG, i64, env, i64, i32) DEF_HELPER_FLAGS_1(cvd, TCG_CALL_NO_RWG_SE, i64, s32) DEF_HELPER_FLAGS_4(pack, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(pka, TCG_CALL_NO_WG, void, env, i64, i64, i32) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 9c7b434fca..0911180ca6 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -284,6 +284,10 @@ D(0xec73, CLFIT, RIE_a, GIE, r1_32u, i2_32u, 0, 0, ct, 0, 1) D(0xec71, CLGIT, RIE_a, GIE, r1_o, i2_32u, 0, 0, ct, 0, 1) =20 +/* CONVERT TO BINARY */ + C(0x4f00, CVB, RX_a, Z, la2, 0, new, r1_32, cvb, 0) + C(0xe306, CVBY, RXY_a, LD, la2, 0, new, r1_32, cvb, 0) + C(0xe30e, CVBG, RXY_a, Z, la2, 0, r1, 0, cvb, 0) /* CONVERT TO DECIMAL */ C(0x4e00, CVD, RX_a, Z, r1_o, a2, 0, 0, cvd, 0) C(0xe326, CVDY, RXY_a, LD, r1_o, a2, 0, 0, cvd, 0) diff --git a/target/s390x/int_helper.c b/target/s390x/int_helper.c index abf77a94e6..3b12c11cee 100644 --- a/target/s390x/int_helper.c +++ b/target/s390x/int_helper.c @@ -24,6 +24,7 @@ #include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" +#include "exec/cpu_ldst.h" =20 /* #define DEBUG_HELPER */ #ifdef DEBUG_HELPER @@ -118,6 +119,57 @@ uint64_t HELPER(divu64)(CPUS390XState *env, uint64_t a= h, uint64_t al, return ret; } =20 +static void general_operand_exception(CPUS390XState *env, uintptr_t ra) +{ +#ifndef CONFIG_USER_ONLY + LowCore *lowcore; + + lowcore =3D cpu_map_lowcore(env); + lowcore->data_exc_code =3D 0; + cpu_unmap_lowcore(lowcore); +#endif + s390_program_interrupt(env, PGM_DATA, ILEN_AUTO, ra); +} + +uint64_t HELPER(cvb)(CPUS390XState *env, uint64_t src, uint32_t n) +{ + int i, j; + uint64_t tmpsrc; + const uintptr_t ra =3D GETPC(); + int64_t dec, sign =3D 0, digit, val =3D 0, pow10 =3D 0; + + for (i =3D 0; i < n; i++) { + tmpsrc =3D wrap_address(env, src + (n - i - 1) * 8); + dec =3D cpu_ldq_data_ra(env, tmpsrc, ra); + for (j =3D 0; j < 16; j++, dec >>=3D 4) { + if (i =3D=3D 0 && j =3D=3D 0) { + sign =3D dec & 0xf; + if (sign < 0xa) { + general_operand_exception(env, ra); + } + continue; + } + digit =3D dec & 0xf; + if (digit > 0x9) { + general_operand_exception(env, ra); + } + if (i =3D=3D 0 && j =3D=3D 1) { + if (sign =3D=3D 0xb || sign =3D=3D 0xd) { + val =3D -digit; + pow10 =3D -10; + } else { + val =3D digit; + pow10 =3D 10; + } + } else { + val +=3D digit * pow10; + pow10 *=3D 10; + } + } + } + return val; +} + uint64_t HELPER(cvd)(int32_t reg) { /* positive 0 */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 59b1e5893c..c709184a03 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2114,6 +2114,17 @@ static DisasJumpType op_csp(DisasContext *s, DisasOp= s *o) } #endif =20 +static DisasJumpType op_cvb(DisasContext *s, DisasOps *o) +{ + bool g =3D (s->fields->op =3D=3D 0xE3) && (s->fields->op2 =3D=3D 0x0E); + int32_t n =3D g ? 2 /* CVBG */ : 1 /* CVB, CVBY */; + TCGv_i32 tmp =3D tcg_const_i32(n); + + gen_helper_cvb(o->out, cpu_env, o->addr1, tmp); + tcg_temp_free_i32(tmp); + return DISAS_NEXT; +} + static DisasJumpType op_cvd(DisasContext *s, DisasOps *o) { TCGv_i64 t1 =3D tcg_temp_new_i64(); diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index 151dc075aa..990dfb26ff 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -6,3 +6,4 @@ TESTS+=3Dipm TESTS+=3Dexrl-trt TESTS+=3Dexrl-trtr TESTS+=3Dpack +TESTS+=3Dcvb diff --git a/tests/tcg/s390x/cvb.c b/tests/tcg/s390x/cvb.c new file mode 100644 index 0000000000..3a72e132aa --- /dev/null +++ b/tests/tcg/s390x/cvb.c @@ -0,0 +1,18 @@ +#include +#include + +int main(void) +{ + uint64_t data =3D 0x000000000025594cull; + uint64_t result =3D 0; + + asm volatile( + " cvb %[result],%[data]\n" + : [result] "+r" (result) + : [data] "m" (data)); + if (result !=3D 0x63fa) { + write(1, "bad result\n", 11); + return 1; + } + return 0; +} --=20 2.18.0