From patchwork Fri Aug 10 03:01:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Zbitskiy X-Patchwork-Id: 955926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hsHzQQRZ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41mqqY4hrmz9s2P for ; Fri, 10 Aug 2018 13:10:01 +1000 (AEST) Received: from localhost ([::1]:54032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnxoN-0003fr-BT for incoming@patchwork.ozlabs.org; Thu, 09 Aug 2018 23:09:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnxiS-0006BO-Io for qemu-devel@nongnu.org; Thu, 09 Aug 2018 23:03:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnxiR-0004FA-4m for qemu-devel@nongnu.org; Thu, 09 Aug 2018 23:03:52 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnxiQ-0004Dw-V5; Thu, 09 Aug 2018 23:03:51 -0400 Received: by mail-qt0-x243.google.com with SMTP id m13-v6so8930961qth.1; Thu, 09 Aug 2018 20:03:50 -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=TuuTw94Y/4LM5XkeW6FZDljgYSKceVD4X/P9zPlq/N8=; b=hsHzQQRZRVgw6RxObaAXRS3tshNLu42tEQJXSAbgBiqOMMkHb55YJKZ9ROjPmzJA36 yVVAuphAwHponAquURt6zpmMyWBaUbVM1w+pXfiqwXEbzU6dJD4waHO+fZfcyBo0aIDp CUfRnKc+LZl4tJWwxNmKrjzvDcooMmQ18NfDgD8xVmhz5cVJqw7TDx3rylwFx3Wf0hbz stCzv799sBVehJS0JShRM18f49Th3r6tmM9Z9UjK5teP5oD8m7x4jSYYy0+TBrEqYsjb unU5xcJ6lnkQAwLm567CmH+5bZWJta91ZfVadI9WB+g/ICqc8j60AN8wMVYbBCI5BenY cfDg== 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=TuuTw94Y/4LM5XkeW6FZDljgYSKceVD4X/P9zPlq/N8=; b=DuixvFM1T4hmTgcR3a07cFjF21KfVK159z26eThzxGYeswgALuvOjg9Vdgtxx7Q0Mw w1P4MS2+qR1snhy66TBX+RjOkpUk2MQTKgUL1gwq47ifYFmZx9qH1DseKCeDd1I1XOXx JMTFtgda40SYnrry4kVjcL7n4s37WVvI3RQnvzQ4zHU8ymU1BWBd1rAoqp1G7tLu2g0c MAdaAWW0UPOCDqU02iGGeAIr4AEUWyWFCRptExYqwpianR9vRsSIgQX6RDmdeoy+sSni mNW8CYPjFtOscXmPyzY9QRSydG264MRmJmyfxANyMJ9tSdPt1QNbfjfPxqHczj/1UkPa Um5A== X-Gm-Message-State: AOUpUlHQXn8/RSdpv2m3G8zQRdG2liWNRcL4sZxnJLBPn1VqufxDpp5F E44Kw/fLfe9IdoAbXKystC1vM75EiNw= X-Google-Smtp-Source: AA+uWPx8/8FllUnSCwH/6z9qV0TpSYysSaZGvjsOxUgFjOqRObCD2Gn9bDHKWTWcdM/Z8th7KWfI3w== X-Received: by 2002:aed:22e9:: with SMTP id q38-v6mr4853780qtc.179.1533870229978; Thu, 09 Aug 2018 20:03:49 -0700 (PDT) Received: from WAL-L-PZ01.rocketsoftware.com ([2620:117:0:a::c]) by smtp.gmail.com with ESMTPSA id i1-v6sm4457425qtj.65.2018.08.09.20.03.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 20:03:49 -0700 (PDT) From: Pavel Zbitskiy To: qemu-devel@nongnu.org Date: Thu, 9 Aug 2018 23:01:39 -0400 Message-Id: <20180810030139.25916-8-pavel.zbitskiy@gmail.com> In-Reply-To: <20180810030139.25916-1-pavel.zbitskiy@gmail.com> References: <20180810030139.25916-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::243 Subject: [Qemu-devel] [PATCH 7/7] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 | 50 +++++++++++++++++++++++++++++++++ target/s390x/translate.c | 10 +++++++ tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/cvb.c | 18 ++++++++++++ 6 files changed, 84 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, i64, 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..1b29a5e044 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) +/* CONVERT TO BINARY */ + C(0x4f00, CVB, RX_a, Z, 0, a2, new, r1_32, cvb, 0) + C(0xe306, CVBY, RXY_a, LD, 0, a2, new, r1_32, cvb, 0) + C(0xe30e, CVBG, RXY_a, Z, 0, a2, 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..66c6dc8b3a 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" /* #define DEBUG_HELPER */ #ifdef DEBUG_HELPER @@ -118,6 +119,55 @@ uint64_t HELPER(divu64)(CPUS390XState *env, uint64_t ah, uint64_t al, return ret; } +static void general_operand_exception(CPUS390XState *env, uintptr_t ra) +{ +#ifndef CONFIG_USER_ONLY + LowCore *lowcore; + + lowcore = cpu_map_lowcore(env); + lowcore->data_exc_code = 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; + uintptr_t ra = GETPC(); + int64_t dec, sign = 0, digit, val = 0, pow10 = 0; + + for (i = 0; i < n; i++) { + dec = cpu_ldq_data_ra(env, src + (n - i - 1) * 8, ra); + for (j = 0; j < 16; j++, dec >>= 4) { + if (i == 0 && j == 0) { + sign = dec & 0xf; + if (sign < 0xa) { + general_operand_exception(env, ra); + } + continue; + } + digit = dec & 0xf; + if (digit > 0x9) { + general_operand_exception(env, ra); + } + if (i == 0 && j == 1) { + if (sign == 0xb || sign == 0xd) { + val = -digit; + pow10 = -10; + } else { + val = digit; + pow10 = 10; + } + } else { + val += digit * pow10; + pow10 *= 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 6f8fbda222..48a97a37ff 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2107,6 +2107,16 @@ static DisasJumpType op_csp(DisasContext *s, DisasOps *o) } #endif +static DisasJumpType op_cvb(DisasContext *s, DisasOps *o) +{ + uint64_t n = ((s->fields->op == 0xE3) && (s->fields->op2 == 0x0E)) ? + /* CVBG */ 2 : + /* CVB, CVBY */ 1; + + gen_helper_cvb(o->out, cpu_env, o->in2, tcg_const_i32(n)); + return DISAS_NEXT; +} + static DisasJumpType op_cvd(DisasContext *s, DisasOps *o) { TCGv_i64 t1 = tcg_temp_new_i64(); diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index 151dc075aa..990dfb26ff 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -6,3 +6,4 @@ TESTS+=ipm TESTS+=exrl-trt TESTS+=exrl-trtr TESTS+=pack +TESTS+=cvb 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 = 0x000000000025594cull; + uint64_t result = 0; + + asm volatile( + " cvb %[result],%[data]\n" + : [result] "+r" (result) + : [data] "m" (data)); + if (result != 0x63fa) { + write(1, "bad result\n", 11); + return 1; + } + return 0; +}