From nobody Wed Oct 22 04:24:25 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151991993838147.91785421569034; Thu, 1 Mar 2018 07:58:58 -0800 (PST) Received: from localhost ([::1]:57772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQbh-0002bz-BD for importer@patchew.org; Thu, 01 Mar 2018 10:58:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQZn-0001O7-Dr for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erQZm-0002Ju-E5 for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:56:59 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:60189) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erQZm-0002JP-43 for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:56:58 -0500 Received: from localhost.localdomain ([178.239.76.114]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MMsCl-1emmXw2RmZ-008cLy; Thu, 01 Mar 2018 16:56:55 +0100 From: David Brenken To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 16:56:16 +0100 Message-Id: <20180301155619.8640-2-david.brenken@efs-auto.org> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20180301155619.8640-1-david.brenken@efs-auto.org> References: <20180301155619.8640-1-david.brenken@efs-auto.org> X-Provags-ID: V03:K0:oN1z1OAMHlWgu49tTxbnFXYMkfJJTrFAbnd5vMbqEoeqIdr/ULO 7UGjH2tMW9OepiUK2IgWfw/UidXL1ZyGv1n9LPl9VQh4zGXBTdR+WSsTvyQFBPGTCr1+vHt 6aRz71AdMGSK0Sx8zQShBpUx6nrgnqapbsyBF+JZ3MglSlyaJXDXUIFe5FhWQNAlf1yXS9O H1jGK0XYPkLwEsd6vqFwg== X-UI-Out-Filterresults: notjunk:1;V01:K0:YLO65Bb0baM=:7Trw1u1F/s/kV/F28iGf+P QNrVPYSFXNHoI1FQA3YBJuWDPBrs0Z298LzjyY0OMQ5j2tPVuL18VYkiNgmkcXxd6ff/oIwDe qknWh8/GlTcLynAX04q/BwnSuJlSF59irPdykrZgGi6XUWFte8TbFOrGvL9bPwHvxl1WfAm2m wsK2hz4pV+NNEesc0cEiGDsIpwc8j7CwOiJJl3Zoih16TwDTFbahMOAsz9xm8+KtDVBDntD8C DFFRRbijbtoD0Eac3NRUiMI0efJTqhxjWK1GoGyZ44OMYadfP7cIOl9bcF/4DqM3tLXhkPQWv ffC57Cun3IdmWX1IBuTRRkGdnP8wZEm8MvaeUVlOyi4htCSN3uTkGtcWZvwY8ELxUCSNIazoC 9AGFRPwf3mdW0mEHUofpA+lRcKwNRnqjKjb0A2Lz25gXENfdiqmiJrF8DAOJXph/YieX+RPUE rzuSEFRumXeBcYgWIIcmjsTa1y1zsvyKF14ijFgcW+KoZvF+aInZg6JLzT509oMgeRkJu4VV+ OjCtlLzdN4Rik65z8zmxYCUWBGIaZi4wGzdQ89+B8mcF0EayqpUX5T1ruX0zMAba4MLz26qn1 1NKDm91R99H9sq/rg+um1/+qbu76/w3xa/Y7mvwWfj/X09tCwKRAgiqdBxBK+SvlFmALuxZqF +MUjLCYqBz67IAbJT8bnV75mtuCOFFXiZ4net4AzvPa3NDnt4Fn7yuqJa/1NBAY59XidonlHS zQaevYkFCno/hQDfDVnyqMGSLtjSiuXEogv5+g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH v2 1/4] tricore: added some missing cpu instructions 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: kbastian@mail.uni-paderborn.de, Florian Artmeier , David Brenken , Georg Hofstetter Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Brenken Signed-off-by: David Brenken Signed-off-by: Florian Artmeier Signed-off-by: Georg Hofstetter --- target/tricore/translate.c | 27 +++++++++++++++++++++++++++ target/tricore/tricore-opcodes.h | 3 +++ 2 files changed, 30 insertions(+) diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 4e5b083..54de0dd 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -3389,10 +3389,18 @@ static void gen_compute_branch(DisasContext *ctx, u= int32_t opc, int r1, gen_branch_cond(ctx, TCG_COND_EQ, cpu_gpr_d[r1], cpu_gpr_d[15], offset); break; + case OPC1_16_SBR_JEQ2: + gen_branch_cond(ctx, TCG_COND_EQ, cpu_gpr_d[r1], cpu_gpr_d[15], + offset + 16); + break; case OPC1_16_SBR_JNE: gen_branch_cond(ctx, TCG_COND_NE, cpu_gpr_d[r1], cpu_gpr_d[15], offset); break; + case OPC1_16_SBR_JNE2: + gen_branch_cond(ctx, TCG_COND_NE, cpu_gpr_d[r1], cpu_gpr_d[15], + offset + 16); + break; case OPC1_16_SBR_JNZ: gen_branch_condi(ctx, TCG_COND_NE, cpu_gpr_d[r1], 0, offset); break; @@ -4121,6 +4129,16 @@ static void decode_16Bit_opc(CPUTriCoreState *env, D= isasContext *ctx) gen_compute_branch(ctx, op1, 0, 0, const16, address); break; /* SBR-format */ + case OPC1_16_SBR_JEQ2: + case OPC1_16_SBR_JNE2: + if (tricore_feature(env, TRICORE_FEATURE_16)) { + r1 =3D MASK_OP_SBR_S2(ctx->opcode); + address =3D MASK_OP_SBR_DISP4(ctx->opcode); + gen_compute_branch(ctx, op1, r1, 0, 0, address); + } else { + generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC); + } + break; case OPC1_16_SBR_JEQ: case OPC1_16_SBR_JGEZ: case OPC1_16_SBR_JGTZ: @@ -6256,6 +6274,15 @@ static void decode_rr_accumulator(CPUTriCoreState *e= nv, DisasContext *ctx) generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC); } break; + case OPC2_32_RR_MOVS_64: + if (tricore_feature(env, TRICORE_FEATURE_16)) { + CHECK_REG_PAIR(r3); + tcg_gen_mov_tl(cpu_gpr_d[r3], cpu_gpr_d[r2]); + tcg_gen_sari_tl(cpu_gpr_d[r3 + 1], cpu_gpr_d[r2], 31); + } else { + generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC); + } + break; case OPC2_32_RR_NE: tcg_gen_setcond_tl(TCG_COND_NE, cpu_gpr_d[r3], cpu_gpr_d[r1], cpu_gpr_d[r2]); diff --git a/target/tricore/tricore-opcodes.h b/target/tricore/tricore-opco= des.h index 08394b8..2c3baab 100644 --- a/target/tricore/tricore-opcodes.h +++ b/target/tricore/tricore-opcodes.h @@ -313,6 +313,7 @@ enum { OPC1_16_SBC_JEQ =3D 0x1e, OPC1_16_SBC_JEQ2 =3D 0x9e, OPC1_16_SBR_JEQ =3D 0x3e, + OPC1_16_SBR_JEQ2 =3D 0xbe, OPC1_16_SBR_JGEZ =3D 0xce, OPC1_16_SBR_JGTZ =3D 0x4e, OPC1_16_SR_JI =3D 0xdc, @@ -321,6 +322,7 @@ enum { OPC1_16_SBC_JNE =3D 0x5e, OPC1_16_SBC_JNE2 =3D 0xde, OPC1_16_SBR_JNE =3D 0x7e, + OPC1_16_SBR_JNE2 =3D 0xfe, OPC1_16_SB_JNZ =3D 0xee, OPC1_16_SBR_JNZ =3D 0xf6, OPC1_16_SBR_JNZ_A =3D 0x7c, @@ -1064,6 +1066,7 @@ enum { OPC2_32_RR_MIN_H =3D 0x78, OPC2_32_RR_MIN_HU =3D 0x79, OPC2_32_RR_MOV =3D 0x1f, + OPC2_32_RR_MOVS_64 =3D 0x80, OPC2_32_RR_MOV_64 =3D 0x81, OPC2_32_RR_NE =3D 0x11, OPC2_32_RR_OR_EQ =3D 0x27, --=20 2.7.4 From nobody Wed Oct 22 04:24:25 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519919947724960.5596184299103; Thu, 1 Mar 2018 07:59:07 -0800 (PST) Received: from localhost ([::1]:57773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQbq-0002kr-JT for importer@patchew.org; Thu, 01 Mar 2018 10:59:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQZw-0001Xl-Fh for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erQZs-0002OK-Jj for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:08 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:44925) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erQZs-0002O2-9F for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:04 -0500 Received: from localhost.localdomain ([178.239.76.114]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LqZms-1eEX3n3o3e-00eNfT; Thu, 01 Mar 2018 16:57:02 +0100 From: David Brenken To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 16:56:17 +0100 Message-Id: <20180301155619.8640-3-david.brenken@efs-auto.org> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20180301155619.8640-1-david.brenken@efs-auto.org> References: <20180301155619.8640-1-david.brenken@efs-auto.org> X-Provags-ID: V03:K0:o0ob77LvWokQxRjU33AV4Tn7IZKEYUDsq6iyV4Qy/lVnuw+ir4a ANykdfVW6/i8Y3lb6/B7rwokFwyp2bFujT3BQvIj3mpctbrQdUEdmKOr7Q5ZHB5VA33iqs0 BdxO6BwT6QEXNT8g9t3Dgnwuta23emEjywPCEdbxHQteZMMdkiPwftZ8ANeeomv8xOz/37r VhvJ1GYj1WGIffxwypA6w== X-UI-Out-Filterresults: notjunk:1;V01:K0:wD5v4iFUP78=:C7EMBPAreKLL5+9d9EOO5d kVxP3/ZBMxgQi7tWI16HS+hfr+imk36TM1inzwZ9ZyeKT7vGHp2KOHmo3qgHbLu1TtuRGRADs cuv+/x/FtKk4rWy+MFyZjcrgugnxpTGX95wHElfL3PLbBo8lBpSI0QGpaQge9KTMZLQC79Xj5 ly8WriWbfxQsHSLywCS/IsgVvjXe2rMhUBfcKcvsjX4o7RyjhY6ivh4zoDJEtc82BcDjT0Tk1 YX/UaNTH+e6hGIXMuIrPFGmOAN9h7PzVniARsJrEc6/cxJ0hIQLWa+XiDGLckZ6NWwWfqFw5n vl6ujLlJnhW9tUKsoVq4HouoKuYg3bLvbClHTBzwWKjBcd94hRcaoPC+OwWDMAuBsaUkhejkS MIi354RrCu2+Gku77GdYj7FiXGfh7hlBY40HSV3ipPuDv0r4exSQXKPPP7bNetGh/q4HqBDn7 +NoxirXwbBCnyAMKDi3/oopWBDoQMZuAYg+eOZTaoQmIN9SUnfcBuG5wqyCqzvyllrpOsz9Mu 2kjG8D3VxRO/fYxMkl+V1vpndJkzVwLagMS/idFk3RmuLGcD1VSngCJDtywumScOcEsMWX4pY 98g0998sKuX3uXy9ofZWI3RVJLVMy53DEaxyeFPmsb+ekmnZjjdfi29LpT+Psk6HVyEubaclj E945o9CaEAOMtIkMyGkrpHJjiTeGgX8TM4mugSSITifVCthKc77JX0+TF6UP00zJ6uX/qOe5F ky8PU9Uce+9bQXiA6DWJMjn/Sxaj+6xhFcw+Bg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v2 2/4] tricore: added CORE_ID 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: kbastian@mail.uni-paderborn.de, Florian Artmeier , David Brenken , Georg Hofstetter Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Brenken Signed-off-by: David Brenken Signed-off-by: Florian Artmeier Signed-off-by: Georg Hofstetter --- target/tricore/cpu.h | 1 + target/tricore/csfr.def | 1 + 2 files changed, 2 insertions(+) diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index f41d2ce..c295763 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -59,6 +59,7 @@ struct CPUTriCoreState { uint32_t PC; uint32_t SYSCON; uint32_t CPU_ID; + uint32_t CORE_ID; uint32_t BIV; uint32_t BTV; uint32_t ISP; diff --git a/target/tricore/csfr.def b/target/tricore/csfr.def index 05c45dd..ff004cb 100644 --- a/target/tricore/csfr.def +++ b/target/tricore/csfr.def @@ -10,6 +10,7 @@ A(0xfe00, PCXI, TRICORE_FEATURE_13) A(0xfe08, PC, TRICORE_FEATURE_13) A(0xfe14, SYSCON, TRICORE_FEATURE_13) R(0xfe18, CPU_ID, TRICORE_FEATURE_13) +R(0xfe1c, CORE_ID, TRICORE_FEATURE_161) E(0xfe20, BIV, TRICORE_FEATURE_13) E(0xfe24, BTV, TRICORE_FEATURE_13) E(0xfe28, ISP, TRICORE_FEATURE_13) --=20 2.7.4 From nobody Wed Oct 22 04:24:25 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519919997560126.1074376346038; Thu, 1 Mar 2018 07:59:57 -0800 (PST) Received: from localhost ([::1]:57774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQce-0003ZG-Jh for importer@patchew.org; Thu, 01 Mar 2018 10:59:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQZy-0001YS-IE for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erQZu-0002Oi-Kr for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:10 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:43757) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erQZu-0002OW-9g for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:06 -0500 Received: from localhost.localdomain ([178.239.76.114]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LisgQ-1eHpNB3ElC-00dG95; Thu, 01 Mar 2018 16:57:03 +0100 From: David Brenken To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 16:56:18 +0100 Message-Id: <20180301155619.8640-4-david.brenken@efs-auto.org> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20180301155619.8640-1-david.brenken@efs-auto.org> References: <20180301155619.8640-1-david.brenken@efs-auto.org> X-Provags-ID: V03:K0:3OVMFFuYvEq3QIthAG188RepmTj2LhSOcFblngsCXMMMUIA8zHe EgmpMidI13V2xlUpaxyULn6GXkZYumBZtkktqaMY2L4gx7tEgMXnUAeX9CxJHMyr+9PayjJ AoIHbIJD/ArADxz+zBxzbBaV//OnitEX4YrlhocA7VXFszHmX6U6BYAmXRtXgPjntOV4BY+ E3foOn/gbdgUlG+6+/IIA== X-UI-Out-Filterresults: notjunk:1;V01:K0:Ysct3l/9nFg=:YVd1Mv9SxLQ/yvEhTWjFlJ LrysyxjCXC2Udjb4Je53dm/nKu3nqXWx/CLh8YQ5wwqFvVG2SZVd0sRQTu3N8ThV+c05Utvw9 o/wYwsOWYlIMT1ZhHdgB3Ff9X9Eyl+OyufiH15EHK3g0wxNjxc02OmidssROgJqQRqvKXmmxt zkNk0n4Vc5m7NEiSL8yNM3nrgcsHHl+7MplRZPrR6SRgQS3D7obrRW+MZsbmTX6l1ppUX4uG/ yiLXAGj3aTBr3Sh+pZPR74oIQ0VSXbwRJp4Cyh2ECPjiMaX9GfYYOcteuW7WB7nsQF88/Aity gboDfroypcAPM6JmBGmsuOItLBoBTRCJGu+oOXXxrp3mcLyahKQO3JzQXJy6ltfGgsOFYQlZl MG97dS/e5aeYCgtgW/ud0PVzNqTBaLbMtlzlgbDiLzc2mDoiuspwnBzlrDVjPCWcpdL99MZah 1ouXgSj6DMm+DIfy/KEz6f0F3kqZJuKKNI79WsNf0FnUry8c2kCERRCDFlcKoYg+Fd1eH8Z+I XQiAFvKCN9PLhgxQskZcRVVAObaNaIyisAMTaDcXvBMNlA8YvdwfAnWOy7QZsHvPo1CddLDa4 jZQTN7RDoXSrHCyhZZQiJlMjOS+PEAMv0tDsT8zqi9gWaJyKdu/1AZmP6PUqgpaFGtZgIbJ3A jxmbFP2fzCIGTTQpE5KiD3763NQ1TGoTd/TGTDTeW/yzGyoYeyvr7JqaKJeSaM3lXnC1kdYNR leCfjrLBkIMKww/RoF3YWeAJAfi3Zk43OcYfwA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH v2 3/4] tricore: renamed masking of IE 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: kbastian@mail.uni-paderborn.de, Florian Artmeier , David Brenken , Georg Hofstetter Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Brenken Signed-off-by: David Brenken Signed-off-by: Florian Artmeier Signed-off-by: Georg Hofstetter --- target/tricore/cpu.h | 3 ++- target/tricore/op_helper.c | 17 +++++++++-------- target/tricore/translate.c | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index c295763..a98b6f2 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -257,7 +257,8 @@ void tricore_cpu_dump_state(CPUState *cpu, FILE *f, #define MASK_CPUID_REV 0x000000ff =20 #define MASK_ICR_PIPN 0x00ff0000 -#define MASK_ICR_IE 0x00000100 +#define MASK_ICR_IE_1_3 0x00000100 +#define MASK_ICR_IE_1_6 0x00008000 #define MASK_ICR_CCPN 0x000000ff =20 #define MASK_FCX_FCXS 0x000f0000 diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c index 098f217..475b6ce 100644 --- a/target/tricore/op_helper.c +++ b/target/tricore/op_helper.c @@ -85,7 +85,7 @@ raise_exception_sync_internal(CPUTriCoreState *env, uint3= 2_t class, int tin, =20 /* PCXI.PIE =3D ICR.IE */ env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + - ((env->ICR & MASK_ICR_IE) << 15)); + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.PCPN =3D ICR.CCPN */ env->PCXI =3D (env->PCXI & 0xffffff) + ((env->ICR & MASK_ICR_CCPN) << 24); @@ -2465,7 +2465,7 @@ void helper_call(CPUTriCoreState *env, uint32_t next_= pc) ((env->ICR & MASK_ICR_CCPN) << 24); /* PCXI.PIE =3D ICR.IE; */ env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + - ((env->ICR & MASK_ICR_IE) << 15)); + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.UL =3D 1; */ env->PCXI |=3D MASK_PCXI_UL; =20 @@ -2563,7 +2563,7 @@ void helper_bisr(CPUTriCoreState *env, uint32_t const= 9) ((env->ICR & MASK_ICR_CCPN) << 24); /* PCXI.PIE =3D ICR.IE */ env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + - ((env->ICR & MASK_ICR_IE) << 15)); + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.UL =3D 0 */ env->PCXI &=3D ~(MASK_PCXI_UL); /* PCXI[19: 0] =3D FCX[19: 0] */ @@ -2571,7 +2571,7 @@ void helper_bisr(CPUTriCoreState *env, uint32_t const= 9) /* FXC[19: 0] =3D new_FCX[19: 0] */ env->FCX =3D (env->FCX & 0xfff00000) + (new_FCX & 0xfffff); /* ICR.IE =3D 1 */ - env->ICR |=3D MASK_ICR_IE; + env->ICR |=3D MASK_ICR_IE_1_3; =20 env->ICR |=3D const9; /* ICR.CCPN =3D const9[7: 0];*/ =20 @@ -2603,7 +2603,8 @@ void helper_rfe(CPUTriCoreState *env) } env->PC =3D env->gpr_a[11] & ~0x1; /* ICR.IE =3D PCXI.PIE; */ - env->ICR =3D (env->ICR & ~MASK_ICR_IE) + ((env->PCXI & MASK_PCXI_PIE) = >> 15); + env->ICR =3D (env->ICR & ~MASK_ICR_IE_1_3) + + ((env->PCXI & MASK_PCXI_PIE) >> 15); /* ICR.CCPN =3D PCXI.PCPN; */ env->ICR =3D (env->ICR & ~MASK_ICR_CCPN) + ((env->PCXI & MASK_PCXI_PCPN) >> 24); @@ -2627,7 +2628,7 @@ void helper_rfm(CPUTriCoreState *env) { env->PC =3D (env->gpr_a[11] & ~0x1); /* ICR.IE =3D PCXI.PIE; */ - env->ICR =3D (env->ICR & ~MASK_ICR_IE) | + env->ICR =3D (env->ICR & ~MASK_ICR_IE_1_3) | ((env->PCXI & MASK_PCXI_PIE) >> 15); /* ICR.CCPN =3D PCXI.PCPN; */ env->ICR =3D (env->ICR & ~MASK_ICR_CCPN) | @@ -2694,7 +2695,7 @@ void helper_svlcx(CPUTriCoreState *env) ((env->ICR & MASK_ICR_CCPN) << 24); /* PCXI.PIE =3D ICR.IE; */ env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + - ((env->ICR & MASK_ICR_IE) << 15)); + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.UL =3D 0; */ env->PCXI &=3D ~MASK_PCXI_UL; =20 @@ -2737,7 +2738,7 @@ void helper_svucx(CPUTriCoreState *env) ((env->ICR & MASK_ICR_CCPN) << 24); /* PCXI.PIE =3D ICR.IE; */ env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + - ((env->ICR & MASK_ICR_IE) << 15)); + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.UL =3D 1; */ env->PCXI |=3D MASK_PCXI_UL; =20 diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 54de0dd..aef0d9c 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -8379,12 +8379,12 @@ static void decode_sys_interrupts(CPUTriCoreState *= env, DisasContext *ctx) /* raise EXCP_DEBUG */ break; case OPC2_32_SYS_DISABLE: - tcg_gen_andi_tl(cpu_ICR, cpu_ICR, ~MASK_ICR_IE); + tcg_gen_andi_tl(cpu_ICR, cpu_ICR, ~MASK_ICR_IE_1_3); break; case OPC2_32_SYS_DSYNC: break; case OPC2_32_SYS_ENABLE: - tcg_gen_ori_tl(cpu_ICR, cpu_ICR, MASK_ICR_IE); + tcg_gen_ori_tl(cpu_ICR, cpu_ICR, MASK_ICR_IE_1_3); break; case OPC2_32_SYS_ISYNC: break; --=20 2.7.4 From nobody Wed Oct 22 04:24:25 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519920068118601.3755620824263; Thu, 1 Mar 2018 08:01:08 -0800 (PST) Received: from localhost ([::1]:57788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQdn-0004X9-5y for importer@patchew.org; Thu, 01 Mar 2018 11:01:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQZx-0001YC-7L for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erQZw-0002P3-B8 for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:09 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:37273) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erQZw-0002Oq-1E for qemu-devel@nongnu.org; Thu, 01 Mar 2018 10:57:08 -0500 Received: from localhost.localdomain ([178.239.76.114]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0McvJJ-1f9N4K3Ag5-00HsqC; Thu, 01 Mar 2018 16:57:05 +0100 From: David Brenken To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 16:56:19 +0100 Message-Id: <20180301155619.8640-5-david.brenken@efs-auto.org> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20180301155619.8640-1-david.brenken@efs-auto.org> References: <20180301155619.8640-1-david.brenken@efs-auto.org> X-Provags-ID: V03:K0:vnBhcXl9IYJNe2eIBlAo3tXwUoY1g1959ZarM1L58FVys+WRkLP rI0zmNNlwuOcPL/oZCb5KBGDu1O0mVVXxSzx+Iwf/ExJ7C6INNEYs4A0LLtczlo6LT+Xf+K c+ZxxweR5bmAaY0rLtB1wd6U9AuoKw4rGPCBDAQTkNnDRbLKvQgOzT8KA4nIdaqptW/D/kL 2jdobGVWPPvFZ+rxCdGzw== X-UI-Out-Filterresults: notjunk:1;V01:K0:xw3XLnoGCy0=:v4vzWftw8GO+qVbmO2VLZ+ CKXgCXRxQ+tqj7XwipmPta5YsaKJM4cT53tcA8h1nWVlAAPK0bijQ4Nm78WpebxDshZw8Zdtk aGkTPIzFalXk/6KY5GJ7QyxMpupHAasjbDrbfwrcTELkazYV2y1gzILWlC71W+ukJUSrD3B6F ba35UGh3eWO6T8TSWFeyyKojZoMvPH23R3gwWcHWMgRTZFXVLvLxhVxWuLNzcFRkxnz5gaBdN 9HhRG1OY1sEdq1grQdW6ZuKP8K3yOlLaxAWv4bebw8qSYiyF8E5meD8S/KtJ4SoJqfYT0f6Z5 thp+EECcy5kWlrKsbGUs+vhTfhBsKtuz3eem2hJCWbdCaSjxJZdxP09LCqVF1EzrTGTg06hRN rcHw1GsT8feQ/WmYmGkTcBCcOcnIrZAXwLIVjD9XsOa8j6Ao3uxfG2EMf/4Kx1uW4+M64ox6y 4nSaWb0JJzvgNpyU+NCP9OeW6ROSG9pHb2Hl84r16BzcRv0WtV1eZQ76Zfq/DGhlF0qF9iFCg r40u34LCcMEMR8kt3R2hVQekeU3KajjB6uvcYhzGnIGSouEeno43u3saqEWO8y1K+/4bKix5h oo6K2bgxJbpjWC42voQ+4UL1++YxM4wL5NdBkIEcMn/XV0gW7hwmMWT5oEMHrtWY6/ME/7ZGH hs3LtwgnsqLoK4mmp2CvKhhBdNf3k0cweHio/Z+SHg805h5baVndhFuRZ4UdUlH5L+yNWuF0E 3W7V9PzN4pCiUMkBef4UkXUvYZd/iN+4kl1NrQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v2 4/4] tricore: renamed masking of PIE 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: kbastian@mail.uni-paderborn.de, Florian Artmeier , David Brenken , Georg Hofstetter Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Brenken Signed-off-by: David Brenken Signed-off-by: Florian Artmeier Signed-off-by: Georg Hofstetter --- target/tricore/cpu.h | 3 ++- target/tricore/op_helper.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index a98b6f2..defab5e 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -230,7 +230,8 @@ void tricore_cpu_dump_state(CPUState *cpu, FILE *f, =20 =20 #define MASK_PCXI_PCPN 0xff000000 -#define MASK_PCXI_PIE 0x00800000 +#define MASK_PCXI_PIE_1_3 0x00800000 +#define MASK_PCXI_PIE_1_6 0x00200000 #define MASK_PCXI_UL 0x00400000 #define MASK_PCXI_PCXS 0x000f0000 #define MASK_PCXI_PCXO 0x0000ffff diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c index 475b6ce..16955f2 100644 --- a/target/tricore/op_helper.c +++ b/target/tricore/op_helper.c @@ -84,7 +84,7 @@ raise_exception_sync_internal(CPUTriCoreState *env, uint3= 2_t class, int tin, ICR.IE and ICR.CCPN are saved */ =20 /* PCXI.PIE =3D ICR.IE */ - env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + + env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE_1_3) + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.PCPN =3D ICR.CCPN */ env->PCXI =3D (env->PCXI & 0xffffff) + @@ -2464,7 +2464,7 @@ void helper_call(CPUTriCoreState *env, uint32_t next_= pc) env->PCXI =3D (env->PCXI & 0xffffff) + ((env->ICR & MASK_ICR_CCPN) << 24); /* PCXI.PIE =3D ICR.IE; */ - env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + + env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE_1_3) + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.UL =3D 1; */ env->PCXI |=3D MASK_PCXI_UL; @@ -2562,7 +2562,7 @@ void helper_bisr(CPUTriCoreState *env, uint32_t const= 9) env->PCXI =3D (env->PCXI & 0xffffff) + ((env->ICR & MASK_ICR_CCPN) << 24); /* PCXI.PIE =3D ICR.IE */ - env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + + env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE_1_3) + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.UL =3D 0 */ env->PCXI &=3D ~(MASK_PCXI_UL); @@ -2604,7 +2604,7 @@ void helper_rfe(CPUTriCoreState *env) env->PC =3D env->gpr_a[11] & ~0x1; /* ICR.IE =3D PCXI.PIE; */ env->ICR =3D (env->ICR & ~MASK_ICR_IE_1_3) - + ((env->PCXI & MASK_PCXI_PIE) >> 15); + + ((env->PCXI & MASK_PCXI_PIE_1_3) >> 15); /* ICR.CCPN =3D PCXI.PCPN; */ env->ICR =3D (env->ICR & ~MASK_ICR_CCPN) + ((env->PCXI & MASK_PCXI_PCPN) >> 24); @@ -2628,8 +2628,8 @@ void helper_rfm(CPUTriCoreState *env) { env->PC =3D (env->gpr_a[11] & ~0x1); /* ICR.IE =3D PCXI.PIE; */ - env->ICR =3D (env->ICR & ~MASK_ICR_IE_1_3) | - ((env->PCXI & MASK_PCXI_PIE) >> 15); + env->ICR =3D (env->ICR & ~MASK_ICR_IE_1_3) + | ((env->PCXI & MASK_PCXI_PIE_1_3) >> 15); /* ICR.CCPN =3D PCXI.PCPN; */ env->ICR =3D (env->ICR & ~MASK_ICR_CCPN) | ((env->PCXI & MASK_PCXI_PCPN) >> 24); @@ -2694,7 +2694,7 @@ void helper_svlcx(CPUTriCoreState *env) env->PCXI =3D (env->PCXI & 0xffffff) + ((env->ICR & MASK_ICR_CCPN) << 24); /* PCXI.PIE =3D ICR.IE; */ - env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + + env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE_1_3) + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.UL =3D 0; */ env->PCXI &=3D ~MASK_PCXI_UL; @@ -2737,7 +2737,7 @@ void helper_svucx(CPUTriCoreState *env) env->PCXI =3D (env->PCXI & 0xffffff) + ((env->ICR & MASK_ICR_CCPN) << 24); /* PCXI.PIE =3D ICR.IE; */ - env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE) + + env->PCXI =3D ((env->PCXI & ~MASK_PCXI_PIE_1_3) + ((env->ICR & MASK_ICR_IE_1_3) << 15)); /* PCXI.UL =3D 1; */ env->PCXI |=3D MASK_PCXI_UL; --=20 2.7.4