From patchwork Wed Sep 4 19:30:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 173000 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp384013ilq; Wed, 4 Sep 2019 13:07:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqzYUxY97xWVOUixf36uLtv+4ayPZZ5QWFg9TYgLq9Qjg5HsBaWw6Fn8bfLsSgY0dnmBqz5s X-Received: by 2002:a17:906:edca:: with SMTP id sb10mr3191998ejb.1.1567627670645; Wed, 04 Sep 2019 13:07:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567627670; cv=none; d=google.com; s=arc-20160816; b=hm2LlJr/f63pV05fV3nV8nwUHPYi6xxadltqwirw/mlq0ajjGXwV1uqR59UsEfeueL GdKx5BcJqWxWAd9YfTn13dN7h8Ds/DxJpXKrLid8x5BtC87KqTq0ydkLgQ5iTCSlHn2t 3WRXRWjkjDhbY9Xxr0uDG3btMGnZnWsiqDTU+U2w9ncWC/oucAwZbfP3fKaoQ4ioji+o 5dP94Gw5mJ509xr5JTTGHYfoa9u8vJuTNYoGW4nKcVn/fote/W/q5hMNEMJTTuIq/hrP Fstg9LTcXLwIBSIP4XBPm4S5h9KkXk92e2Ml3pWXN1UzwTblvXvqYXi18GT+XKhIsu/d LTag== 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=jCLx5wbUWyoQFBTJtKxHJZzHzglyCub6PkVD7Xy998w=; b=l/1C33WFZvM4n5/qOEK5jGJHRcssQS8PCaE5i0SoYpR1/DChACFqRnVUnWAaYvhRDv wz3/vWxUfwowRUvEVomy4TKZY6lvxAX21y2eWSanCd+mT3U9ByYu6kPiV5JiBdmM2u0/ GhLc50wmXuUsWKdJ5E/hda+YYqI0teBUoWiyFqhhJJ+hxLcnsynz6S42NIrVmELb2kCO 76UnAnZ4R/aHM8+8fdFs9QNsSvLIeLgEiEACNj5xNYVdEROiJoeiFvDb7VBCEfypeqM+ YT2NSMpXs2ADVNZPHHf88NH+rAoZ6lf59hh6AhRDoXv8FrvrQnfyg8D28AXlrYeJ/sCa li8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XXT+tIT+; 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 m44si10515699edm.286.2019.09.04.13.07.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:07:50 -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=XXT+tIT+; 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]:38406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bZF-0001lw-08 for patch@linaro.org; Wed, 04 Sep 2019 16:07:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40536) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5b0O-0004zw-H4 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:31:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5b0L-0002er-PE for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:31:48 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:47066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5b0L-0002e3-EQ for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:31:45 -0400 Received: by mail-pg1-x534.google.com with SMTP id m3so11750369pgv.13 for ; Wed, 04 Sep 2019 12:31:45 -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=jCLx5wbUWyoQFBTJtKxHJZzHzglyCub6PkVD7Xy998w=; b=XXT+tIT+OLPZofonDRatHFWp9c7dSQdPlo3AJsyJSzP5Kl/f/7+p8eHm/rSBpy4mZ5 DNAsUCgfcE8B0vhr3//i+Jp6rvUIvNX1h7lo/X5TGHcS67MYWNIH/Z+rz6vWC6fGdaqA H49fHr+ExAH+fmPuwiP8NwsTjNGeHb6qwGzKrp16TEzpbdVcCMId/m5gF6FDi54VmGSD pbbaUUiMNdK2ZJC/3fY8Ew5yMnKhEe/2kCIdVJc6BT8zmkjVXzVUUqaXy2Bk3sARuJxq tmHssq9btZMFfYq6wXGfwOHeg6gsyr0/t7GzO7XhyRtRBjZ2nbenmrwscxx16ojAy7UI mlSA== 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=jCLx5wbUWyoQFBTJtKxHJZzHzglyCub6PkVD7Xy998w=; b=tV9/bP5iVHf6Nxq2Bxye+7+3/2lrjDYSpJrFe/f65AgbauI2XESH7eI/+fJzUQKQka 9HbTToqmcy0GVjey0Qna3SfBec9OnlfXRMG+iZhdUM9G/sbUao6sthvS6rSte8QxZx7g m7VVwNyfXRsZvFN0m8pARckSBELqOGwQy02lltBU76yW1U99BHlwjkEKTi80OaKqFsTR Tdzk9+FY17eJPZCEjd2I1ZuWzYHUjC+fAcPil59dvlzzJCp/HiHJ2rqL6xlpjqlcghMP lHrGPWEOsFH5bKpkmGcQG6IP1u9uZQxK+1AloFLDofZY3AXSv5qBwR+qimFvnsylQz4r YpSQ== X-Gm-Message-State: APjAAAWbg2wQclqsYGI2P1EjaWw2skiBMohPbYgEz7V1aoZRQmU99Xwq RGTMKUzoDISoBE5XmpuNepFFdcWJqjM= X-Received: by 2002:a62:d143:: with SMTP id t3mr44321762pfl.213.1567625504065; Wed, 04 Sep 2019 12:31:44 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id f6sm18999174pga.50.2019.09.04.12.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 12:31:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:30:23 -0700 Message-Id: <20190904193059.26202-34-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190904193059.26202-1-richard.henderson@linaro.org> References: <20190904193059.26202-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::534 Subject: [Qemu-devel] [PATCH v4 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 72e4708e61..208021181f 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10081,6 +10081,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. */ @@ -10348,6 +10360,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: @@ -10363,12 +10376,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