From patchwork Fri May 27 16:48:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 576515 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8607:0:0:0:0 with SMTP id bb7csp810217mab; Fri, 27 May 2022 09:57:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqADswdBuT/Ar7vPBd9ECjJ1CBM29OjnfN+ttsiy73/38oOfpbFkrVI/VeUhNuaMujbtoR X-Received: by 2002:a05:622a:15c4:b0:2f3:bd4b:80fa with SMTP id d4-20020a05622a15c400b002f3bd4b80famr33855540qty.21.1653670667612; Fri, 27 May 2022 09:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653670667; cv=none; d=google.com; s=arc-20160816; b=eUB0rVY2s1+vLXuIJ2ROkx50zKOEhD23vlXateXDbS6yifUwvZQCEIAs6G3bRLBUdh l0ccTcBoYXmlzkcntxpc5ZqxkSwkdQ3/THbRPXTX4QnUc5SzIUjH17YqsmcgS4lzunDs t4RoWfB6IFXkUl22AagJpH7ta+ySKDhQaKUQ3w6GlYjg4q13lT7oGtF8ADrYPhetNism YyRa0N8gCFYqniMaFe2ZDEfwF+etjLWyjHR3MbvPqTGMtCCz3Vdga3qnCPuzgcjGkV5i 5XtXyZEYF2zEk7zliSAIWR3jBPgm2KIPW8gUMWkvjqbUc8MDqGEF4pVTcR2DCMkRoQ9w GkFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mJfzlbqqWQ9fRdLvn4vq10zAIiL+VAhrCO0+lipHHC8=; b=dxkNG/1tg57rstzHTfV9iDboZoNW7EHWcD4o4SALm+cPEc+6f8pYSFlNzOP66wki8S htvigxUo3ebwzACPVhITrp9kbyVkMAQ/IS6KSR2FpgpMt5OA9MASgGy4VVSyMIQGPai1 louluAZPBdGhf9OQInobHwDQCvJJCOSyixPv+458IBQZOFMs9UDL1coGBcA6XhAzyTjl mcT0xo3rVbtf6ijgkzR+kH19dYeVXmqmOp5iQTDZTpqvIuV2+J3bwQ4nlkWgd4TjrJs6 gmedes2KyuhQkupIpEHvnsGOVgZyzcYGmHuPrHL4g+2uB841OMQixugBjFA0WHO2RV1h rCBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vOtEP5OK; 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=pass (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 v11-20020a05620a0f0b00b006a5ed89baa0si840779qkl.533.2022.05.27.09.57.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 May 2022 09:57:47 -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=pass header.i=@linaro.org header.s=google header.b=vOtEP5OK; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nudHX-0004D2-2j for patch@linaro.org; Fri, 27 May 2022 12:57:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nud8Q-0001cp-DX for qemu-devel@nongnu.org; Fri, 27 May 2022 12:48:22 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:38699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nud8O-0005On-Pq for qemu-devel@nongnu.org; Fri, 27 May 2022 12:48:22 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 90-20020a17090a0fe300b001e292e2b81bso584587pjz.3 for ; Fri, 27 May 2022 09:48:20 -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=mJfzlbqqWQ9fRdLvn4vq10zAIiL+VAhrCO0+lipHHC8=; b=vOtEP5OKy6LpEaQ2O3JgroyNu6zj/b7wakakRmvyOw42YnZMF4/WmRSWvUxcC+V2HR ZCJ7rjqNq9l+cXc7gvL3XMwo860o0wqBnuNNM+d68U3hMPvNuAEclXsUOjDbHm1lNrks Z/drQIUdPvNLHoLZ9N3hfh0EfzGAA7a7RE73NahGyFdAogTTI7v85ZIu1ifkAU8jbvjQ 1h0CeKizvyQGi3hlsDsR+0ykTc/JUx5FCa+f7P6xYnPuothyWepM5k7e6AcGy341RR22 kgsPLNSXa3HD2m4sWM/H55PuuKlspx75kjOhUgwVgV3q7ZGr4YWG/5vDxL2iM3VlVUwa vFuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mJfzlbqqWQ9fRdLvn4vq10zAIiL+VAhrCO0+lipHHC8=; b=j1+eHpZzwbVfgGg7AaGxXNTCC2jgf5yHpuk44P7fspmUS/DqsJgrHHEbCJdziS63Rw 2uK3scuFa419XNqwQ1iTOh/BP0t9a5OLxusTg/C+Pc/wLzJX82yOchSF8YtpZ3IIAs+V M7buh5GfUPc6e5S91jzgOF1xWq1s0FhOw2SD1+AmGtpTywKrDxJypnNkznrkRZBiqkHp WJDSP7eLxb0+BNc/wojkR1KsV8TsNOmE5oQOChQs6NdCpC46SVEOZNsDxwq/vi5Grbom 6up9narxmKyzDyFggB+Z/gRG+sshlsBrLCHwPmul3iy88csPL/sQh3eJnkM5tJFhaAsp LaoQ== X-Gm-Message-State: AOAM5326q84WypxsxCw2Nl4xGX0WSkkmxvoGYIMplnLhJe7EmTECARWn JgW7RjlZF4xLyyUO0OmYPhN3RlIVkY1RUw== X-Received: by 2002:a17:90b:350b:b0:1df:a236:370 with SMTP id ls11-20020a17090b350b00b001dfa2360370mr9338957pjb.245.1653670100066; Fri, 27 May 2022 09:48:20 -0700 (PDT) Received: from stoup.. (174-21-71-225.tukw.qwest.net. [174.21.71.225]) by smtp.gmail.com with ESMTPSA id j11-20020aa7928b000000b0050dc7628133sm3861420pfa.13.2022.05.27.09.48.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 09:48:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 11/17] target/m68k: Implement TPF in terms of TRAPcc Date: Fri, 27 May 2022 09:48:01 -0700 Message-Id: <20220527164807.135038-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220527164807.135038-1-richard.henderson@linaro.org> References: <20220527164807.135038-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" TPF stands for "trap false", and is a long-form nop for ColdFire. Re-use the immediate consumption code from trapcc; the insn will already expand to a nop because of the TCG_COND_NEVER test within do_trapcc. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson --- target/m68k/translate.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index c4fe8abc03..bb5ed1b7b1 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -3075,22 +3075,6 @@ DISAS_INSN(addsubq) tcg_temp_free(dest); } -DISAS_INSN(tpf) -{ - switch (insn & 7) { - case 2: /* One extension word. */ - s->pc += 2; - break; - case 3: /* Two extension words. */ - s->pc += 4; - break; - case 4: /* No extension words. */ - break; - default: - disas_undef(env, s, insn); - } -} - DISAS_INSN(branch) { int32_t offset; @@ -6099,7 +6083,7 @@ void register_m68k_insns (CPUM68KState *env) INSN(scc, 50c0, f0c0, M68000); /* Scc.B */ INSN(dbcc, 50c8, f0f8, M68000); INSN(trapcc, 50f8, f0f8, TRAPCC); - INSN(tpf, 51f8, fff8, CF_ISA_A); + INSN(trapcc, 51f8, fff8, CF_ISA_A); /* TPF (trapf) */ /* Branch instructions. */ BASE(branch, 6000, f000);