From patchwork Wed Aug 28 19:04:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172452 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1213269ily; Wed, 28 Aug 2019 12:46:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXGy2T7Mx7t0ePNr05ujxZGq9hRpYgcdCpxIZg8IZLPXlUVMLWz51LntsZXQVCIf3eVP+I X-Received: by 2002:ac8:397c:: with SMTP id t57mr6175332qtb.21.1567021566643; Wed, 28 Aug 2019 12:46:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567021566; cv=none; d=google.com; s=arc-20160816; b=h4/088ETNZ6WpE5E9jyEMLolQne5NmaBwS8+hLPv17c2G2Gghztvg7S7OPvBTPRiSj VypJRtaYIOYOzVuSEcurH315mmFHNULTmDCz0673fD/Pa2EEUp3Z6/MNQJ2YaaW1hsAs JWubfP1wNbHI4nrtHz7972T6Qx/BQHaHXMBD9YSk3pl62uYqLuCC4lS8se5ufG5iYA0k IO+NkCr8pakAtwgczS2ON9PNQD/apD2vQrtEe+ItjjhyN4tP9XXWjMUS4g6Z1PUDg32U TrTuafJlYO8VouPcJhHPlR4xnUAlFex9d1/io29BZNk5x9zsVbOqy2rITRHsqU4+lk9b RKXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=l58FUNN+MerXiKJ010yMrqx8XR2Kx9uSnwDhJ/Yfh7g=; b=JrkEHliMDh4WOYsDI2ii5P9O5ZxbO4fbGtQY571VN0JyH+aJfHitDGeI5ZV0ahgkmr 8p5H48OQ00Zb7fUOMGNIDlReZcvq6FaH6SQ6EeLVJzuCDqMAGEqPWlG9DsfWt2Qd3Vp9 eiMbtpah71pul7AzCCtn8f0JZ/mVyCFrGWIdy5hTFa5099MhfD1073pctDhPhpuQUHPN qNZ77+4Su+4X0xKG6KSAyEleWGOMzTFuGYx+qtBbZ/gR/Hn4SsHHJK3akl83dIsrVR/Y sbC2suvWCY/cY7tHLp5N6nYOb/AvSOrLKYYaDBr9+teHU+ZpH5WJNZWM3JYpvFbmLpLp 2MwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vhWsf6ZY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r60si132215qtd.7.2019.08.28.12.46.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 12:46:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vhWsf6ZY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33tN-0000pM-I6 for patch@linaro.org; Wed, 28 Aug 2019 15:46:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38191) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33GS-0003lM-OV for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33GO-0000MV-Fq for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:52 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:40504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33GK-0000Il-Ky for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:46 -0400 Received: by mail-pl1-x643.google.com with SMTP id h3so393428pls.7 for ; Wed, 28 Aug 2019 12:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l58FUNN+MerXiKJ010yMrqx8XR2Kx9uSnwDhJ/Yfh7g=; b=vhWsf6ZYPt12s0Om+XQwtwmO5xZsu0M6Fj/Sa2yvivWAemIFS5lEwrNu7jA6HMvDf5 DDm08yS76M24Y83HXBJw0lBC5MJJBGssLgoP/DWXfofzVyiij7eg4rWBX4gU6q3FxXKG OkMV6phlUKBKkF93N2gp9sxVWleHT/SAyLGlr/tzd/+B/8/nlsQ9hdH9CSQ7QFzLnYsT s5TH/cefXfq/tS9zo9CDM1KViHjvbxWvMuCj2F+rXlEfpJI8Pr4w9gwEIdif30k908at P5XZSpfCExWcGxGvzlpiW/fqUrBx1irPosC6i/UpYD2uJu9p5zojNP0iYsNxgSQVW930 U3cw== 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:mime-version:content-transfer-encoding; bh=l58FUNN+MerXiKJ010yMrqx8XR2Kx9uSnwDhJ/Yfh7g=; b=apdbfo8oGYl65exLrxsMR7eVNIR4SIOL5vKAX46/mFjayvMjS6DhtF+nuOJogH7QNK 4oYvZZjibrY91SGExNIif93H1n3Ye0tuqY0b4dJFdwu2AQ2fRSjK15IWUJo92j8pLMyJ xZL257cwhYQvYmPmUo/h/D92GzUdcR6Z0KXvzxPWQXHoae4LXukz/6+eWgx3d/iNlaPY uGMvyT2nmjVL337QbDnM+Bkghn8sdhII22CXPP70AXb/B3yTPKj1cnvM5BUfhHAPpt+e uiWBtNX7USlsdP0ClxleHsOSkL4cKrVwdWJIfyzVrtuWEuw4BXsgmAx2PY0R0G0woriu cBUg== X-Gm-Message-State: APjAAAUhUl6xQBuWHbnucTVCPQPxHQiIrZBdijY+J95JCh6jqiUNDWY+ d6Qn0pCp0zLrJmvcybVeS9XeIDHyVu8= X-Received: by 2002:a17:902:b704:: with SMTP id d4mr6022572pls.261.1567019142379; Wed, 28 Aug 2019 12:05:42 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id f27sm2967944pgm.60.2019.08.28.12.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:05:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:20 -0700 Message-Id: <20190828190456.30315-34-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828190456.30315-1-richard.henderson@linaro.org> References: <20190828190456.30315-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 Subject: [Qemu-devel] [PATCH v3 33/69] target/arm: Convert SVC X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/arm/translate.c | 19 +++++++++++++------ target/arm/a32.decode | 4 ++++ 2 files changed, 17 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index fb0e875917..eb4384618c 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10048,6 +10048,18 @@ static bool trans_BLX_i(DisasContext *s, arg_BLX_i *a) return true; } +/* + * Supervisor call + */ + +static bool trans_SVC(DisasContext *s, arg_SVC *a) +{ + gen_set_pc_im(s, s->base.pc_next); + s->svc_imm = a->imm; + s->base.is_jmp = DISAS_SWI; + return true; +} + /* * Legacy decoder. */ @@ -10315,6 +10327,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) case 0x09: case 0xa: case 0xb: + case 0xf: /* All done in decodetree. Reach here for illegal ops. */ goto illegal_op; case 0xc: @@ -10330,12 +10343,6 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) goto illegal_op; } break; - case 0xf: - /* swi */ - gen_set_pc_im(s, s->base.pc_next); - s->svc_imm = extract32(insn, 0, 24); - s->base.is_jmp = DISAS_SWI; - break; default: illegal_op: unallocated_encoding(s); diff --git a/target/arm/a32.decode b/target/arm/a32.decode index 62c6f8562e..0bd952c069 100644 --- a/target/arm/a32.decode +++ b/target/arm/a32.decode @@ -528,3 +528,7 @@ LDM_a32 ---- 100 b:1 i:1 u:1 w:1 1 rn:4 list:16 &ldst_block B .... 1010 ........................ @branch BL .... 1011 ........................ @branch + +# Supervisor call + +SVC ---- 1111 imm:24 &i