From nobody Sat Nov 15 09:08:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754176843; cv=none; d=zohomail.com; s=zohoarc; b=ig0fqnWYLXonu5ka4DHo0bE2eBrUzzPVBbv05P1tDOoqtT/X6Uzcspy375IVTqjgYuxsWomQtNpihR9m+7bzhoFkzlQ/MP/cUJWnKXwJwTVvgJ1dd58tySkOJskSQWrtQPw4cinTEl+PhfLcT/gUnrNPf9BQ+1WFybsTFlOFUSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754176843; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=WoXWe4y77AsCGhDaS9yT+kQxHmDuhBAYI2/iArGrG58=; b=EB00/wIfOS24qp1SGPigl+LK+1IJepWIAs5gMKj+xiwywRV+hE6FhnoYpL8yz/9i0mXp/1q3UKF7IY0rcC6pYvTWxUsf6TBJDEDq6aB77cSpyL4t0BDX9wnc+lnSLIKNkocwxZ8vAIoImEAR3gnkdthURC/tSPeE/ochgGBj2OE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754176843740420.1909404081182; Sat, 2 Aug 2025 16:20:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiLNn-0000yB-A4; Sat, 02 Aug 2025 19:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uiLNY-0008MM-Nr for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:11:04 -0400 Received: from mail-oo1-xc2c.google.com ([2607:f8b0:4864:20::c2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiLNV-0001fU-Py for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:11:04 -0400 Received: by mail-oo1-xc2c.google.com with SMTP id 006d021491bc7-6197e13b6b8so1136399eaf.3 for ; Sat, 02 Aug 2025 16:11:01 -0700 (PDT) Received: from stoup.. ([172.58.111.133]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-61970693ed9sm1084454eaf.20.2025.08.02.16.10.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 16:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754176260; x=1754781060; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WoXWe4y77AsCGhDaS9yT+kQxHmDuhBAYI2/iArGrG58=; b=dk6Mo7++hgua1HNHkuDOQFmiz/XIvdOr26rmgkJbhwk+LtC81oRZjzrj2nD7lE8se4 ejDBAoNuj1t2B/nLpz1JjWd9acG3UxSCJBFSbYSpdJAVHYLaefnSBKOS8OvMELd2SGwQ GAh3iIg7Ln5akFax5FtDIuN8ZpldRs9mKy6CQGPVylDLvLMVTXrPLnzz54Jf6oIWcBtY xBN6heIKz9vx5ErdWkDhuj6hoz2y9Mh0GRekGlGV5YQT7IgIdDLPBkraNbnUgTqaPw5E oGDn+TL7e+zWMiNMOoqMVgJueHqjfW1yGUV4ybLFhKAjvBIDtPevjR2ixRk7k2i0rhJj SDDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754176260; x=1754781060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WoXWe4y77AsCGhDaS9yT+kQxHmDuhBAYI2/iArGrG58=; b=fR6Znx34H/H9O+Egdmv1eOAiNRoF94ZbI/FnxpiiliucA4VdEu4qJ2z5eZtV2uqKBg 6Sd6LF9ipNaDPAXnLTExHnCDi5GYjTeSE8gJWaINGgFRlkzy2VoT04fPlS6kRgv75UP4 5PvfmRqVelxDb6U/Glh5KtK0KWBOlmGqGWCToiX00HF8M8/XMLO6xXG1RGRJ7DROYGzA iPT7g1mDifCCsl5tjLVRuqYrT29C04BgDDdjA5XK3uxOI07qTe4R9q7kvugqQXREJH7J GlEZw3U8oOk5qVHd3eH5Ww0Z9MVpaM+Oy9g6+l7+EE3UsrqV7kIazEA0d4LJFTFvMrhu DD3w== X-Gm-Message-State: AOJu0Yyn9SsPBBIw7UDfAqd1RgvhAwNBUx1vU4mP+d6y5opl/d8RJVBj Vx42NuJ42gyYpalZNTt8vIPhw6EsZwouUOOnyhiM567g7jCIqZ/CuKg+nklbALl/mHQKE4GA81Q 6e1k0MHg= X-Gm-Gg: ASbGncv3jM8XJyj0Mguwy4qkXXLGIOC/bSpA+xzsp5YbrQrqWO7DAMxYmpRLf4Vfvno WKDgE12ThVZ+MYkL3I6M0uObdZgxWgybPg9fwkeYNtNK0Etn8Qt61g/Ipr8M+JWI2dJkO46Qf3f eY43bUcRzXrasBKb4Tm9EFKPbXjKQKEX2u7WZBoC7+iL1cW53cKUNVGgvlV1E3X4De8nMxPzqXS jxO4k8TSo1ETI/SloDqTTl0YOd1RLPYH7sgM8BU0sayTrJoWgpAlYiNU6QwFhpkvU9sP56lKYqp sG3fX3P28BdBEdp5pVBbMncO2/lKEpyRmeW1ppdUfLSlLSWn4OS9XthACvIFCtdBIKN2Xouphiz jadvcmvATLC5QX+GFszgDbwd3o0q8aKnsoPl8TexjERl3AtfnEGKakIHUgBxyBp8= X-Google-Smtp-Source: AGHT+IEwtK9RGF5EW2Y0w7REq/+SDUzIqLw7KOtBuqEVJPdKmxNxA/+RCc6PHRKB9f2dHIhoPN+4hw== X-Received: by 2002:a05:6820:c91:b0:619:355c:f279 with SMTP id 006d021491bc7-6198f23336bmr2714598eaf.4.1754176260306; Sat, 02 Aug 2025 16:11:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 46/95] linux-user: Replace tswapreg with tswapl Date: Sun, 3 Aug 2025 09:04:10 +1000 Message-ID: <20250802230459.412251-47-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250802230459.412251-1-richard.henderson@linaro.org> References: <20250802230459.412251-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c2c; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc2c.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754176844711124100 Content-Type: text/plain; charset="utf-8" With the removal of target_elf_greg_t, we don't need a special case tswap. Use tswapl for target_ulong. Signed-off-by: Richard Henderson --- linux-user/elfload.c | 264 +++++++++++++++++++++---------------------- 1 file changed, 129 insertions(+), 135 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 70a1e402d3..e7622e7610 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -130,12 +130,6 @@ int info_is_fdpic(struct image_info *info) #define ELF_DATA ELFDATA2LSB #endif =20 -#ifdef TARGET_ABI_MIPSN32 -#define tswapreg(ptr) tswap64(ptr) -#else -#define tswapreg(ptr) tswapal(ptr) -#endif - #ifdef USE_UID16 typedef abi_ushort target_uid_t; typedef abi_ushort target_gid_t; @@ -163,33 +157,33 @@ typedef target_ulong target_elf_gregset_t[ELF_NREG]; */ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86Sta= te *env) { - (*regs)[0] =3D tswapreg(env->regs[15]); - (*regs)[1] =3D tswapreg(env->regs[14]); - (*regs)[2] =3D tswapreg(env->regs[13]); - (*regs)[3] =3D tswapreg(env->regs[12]); - (*regs)[4] =3D tswapreg(env->regs[R_EBP]); - (*regs)[5] =3D tswapreg(env->regs[R_EBX]); - (*regs)[6] =3D tswapreg(env->regs[11]); - (*regs)[7] =3D tswapreg(env->regs[10]); - (*regs)[8] =3D tswapreg(env->regs[9]); - (*regs)[9] =3D tswapreg(env->regs[8]); - (*regs)[10] =3D tswapreg(env->regs[R_EAX]); - (*regs)[11] =3D tswapreg(env->regs[R_ECX]); - (*regs)[12] =3D tswapreg(env->regs[R_EDX]); - (*regs)[13] =3D tswapreg(env->regs[R_ESI]); - (*regs)[14] =3D tswapreg(env->regs[R_EDI]); - (*regs)[15] =3D tswapreg(get_task_state(env_cpu_const(env))->orig_ax); - (*regs)[16] =3D tswapreg(env->eip); - (*regs)[17] =3D tswapreg(env->segs[R_CS].selector & 0xffff); - (*regs)[18] =3D tswapreg(env->eflags); - (*regs)[19] =3D tswapreg(env->regs[R_ESP]); - (*regs)[20] =3D tswapreg(env->segs[R_SS].selector & 0xffff); - (*regs)[21] =3D tswapreg(env->segs[R_FS].selector & 0xffff); - (*regs)[22] =3D tswapreg(env->segs[R_GS].selector & 0xffff); - (*regs)[23] =3D tswapreg(env->segs[R_DS].selector & 0xffff); - (*regs)[24] =3D tswapreg(env->segs[R_ES].selector & 0xffff); - (*regs)[25] =3D tswapreg(env->segs[R_FS].selector & 0xffff); - (*regs)[26] =3D tswapreg(env->segs[R_GS].selector & 0xffff); + (*regs)[0] =3D tswapl(env->regs[15]); + (*regs)[1] =3D tswapl(env->regs[14]); + (*regs)[2] =3D tswapl(env->regs[13]); + (*regs)[3] =3D tswapl(env->regs[12]); + (*regs)[4] =3D tswapl(env->regs[R_EBP]); + (*regs)[5] =3D tswapl(env->regs[R_EBX]); + (*regs)[6] =3D tswapl(env->regs[11]); + (*regs)[7] =3D tswapl(env->regs[10]); + (*regs)[8] =3D tswapl(env->regs[9]); + (*regs)[9] =3D tswapl(env->regs[8]); + (*regs)[10] =3D tswapl(env->regs[R_EAX]); + (*regs)[11] =3D tswapl(env->regs[R_ECX]); + (*regs)[12] =3D tswapl(env->regs[R_EDX]); + (*regs)[13] =3D tswapl(env->regs[R_ESI]); + (*regs)[14] =3D tswapl(env->regs[R_EDI]); + (*regs)[15] =3D tswapl(get_task_state(env_cpu_const(env))->orig_ax); + (*regs)[16] =3D tswapl(env->eip); + (*regs)[17] =3D tswapl(env->segs[R_CS].selector & 0xffff); + (*regs)[18] =3D tswapl(env->eflags); + (*regs)[19] =3D tswapl(env->regs[R_ESP]); + (*regs)[20] =3D tswapl(env->segs[R_SS].selector & 0xffff); + (*regs)[21] =3D tswapl(env->segs[R_FS].selector & 0xffff); + (*regs)[22] =3D tswapl(env->segs[R_GS].selector & 0xffff); + (*regs)[23] =3D tswapl(env->segs[R_DS].selector & 0xffff); + (*regs)[24] =3D tswapl(env->segs[R_ES].selector & 0xffff); + (*regs)[25] =3D tswapl(env->segs[R_FS].selector & 0xffff); + (*regs)[26] =3D tswapl(env->segs[R_GS].selector & 0xffff); } =20 #if ULONG_MAX > UINT32_MAX @@ -240,23 +234,23 @@ typedef target_ulong target_elf_gregset_t[ELF_NREG]; */ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86Sta= te *env) { - (*regs)[0] =3D tswapreg(env->regs[R_EBX]); - (*regs)[1] =3D tswapreg(env->regs[R_ECX]); - (*regs)[2] =3D tswapreg(env->regs[R_EDX]); - (*regs)[3] =3D tswapreg(env->regs[R_ESI]); - (*regs)[4] =3D tswapreg(env->regs[R_EDI]); - (*regs)[5] =3D tswapreg(env->regs[R_EBP]); - (*regs)[6] =3D tswapreg(env->regs[R_EAX]); - (*regs)[7] =3D tswapreg(env->segs[R_DS].selector & 0xffff); - (*regs)[8] =3D tswapreg(env->segs[R_ES].selector & 0xffff); - (*regs)[9] =3D tswapreg(env->segs[R_FS].selector & 0xffff); - (*regs)[10] =3D tswapreg(env->segs[R_GS].selector & 0xffff); - (*regs)[11] =3D tswapreg(get_task_state(env_cpu_const(env))->orig_ax); - (*regs)[12] =3D tswapreg(env->eip); - (*regs)[13] =3D tswapreg(env->segs[R_CS].selector & 0xffff); - (*regs)[14] =3D tswapreg(env->eflags); - (*regs)[15] =3D tswapreg(env->regs[R_ESP]); - (*regs)[16] =3D tswapreg(env->segs[R_SS].selector & 0xffff); + (*regs)[0] =3D tswapl(env->regs[R_EBX]); + (*regs)[1] =3D tswapl(env->regs[R_ECX]); + (*regs)[2] =3D tswapl(env->regs[R_EDX]); + (*regs)[3] =3D tswapl(env->regs[R_ESI]); + (*regs)[4] =3D tswapl(env->regs[R_EDI]); + (*regs)[5] =3D tswapl(env->regs[R_EBP]); + (*regs)[6] =3D tswapl(env->regs[R_EAX]); + (*regs)[7] =3D tswapl(env->segs[R_DS].selector & 0xffff); + (*regs)[8] =3D tswapl(env->segs[R_ES].selector & 0xffff); + (*regs)[9] =3D tswapl(env->segs[R_FS].selector & 0xffff); + (*regs)[10] =3D tswapl(env->segs[R_GS].selector & 0xffff); + (*regs)[11] =3D tswapl(get_task_state(env_cpu_const(env))->orig_ax); + (*regs)[12] =3D tswapl(env->eip); + (*regs)[13] =3D tswapl(env->segs[R_CS].selector & 0xffff); + (*regs)[14] =3D tswapl(env->eflags); + (*regs)[15] =3D tswapl(env->regs[R_ESP]); + (*regs)[16] =3D tswapl(env->segs[R_SS].selector & 0xffff); } =20 /* @@ -294,25 +288,25 @@ typedef target_ulong target_elf_gregset_t[ELF_NREG]; =20 static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUARMSta= te *env) { - (*regs)[0] =3D tswapreg(env->regs[0]); - (*regs)[1] =3D tswapreg(env->regs[1]); - (*regs)[2] =3D tswapreg(env->regs[2]); - (*regs)[3] =3D tswapreg(env->regs[3]); - (*regs)[4] =3D tswapreg(env->regs[4]); - (*regs)[5] =3D tswapreg(env->regs[5]); - (*regs)[6] =3D tswapreg(env->regs[6]); - (*regs)[7] =3D tswapreg(env->regs[7]); - (*regs)[8] =3D tswapreg(env->regs[8]); - (*regs)[9] =3D tswapreg(env->regs[9]); - (*regs)[10] =3D tswapreg(env->regs[10]); - (*regs)[11] =3D tswapreg(env->regs[11]); - (*regs)[12] =3D tswapreg(env->regs[12]); - (*regs)[13] =3D tswapreg(env->regs[13]); - (*regs)[14] =3D tswapreg(env->regs[14]); - (*regs)[15] =3D tswapreg(env->regs[15]); + (*regs)[0] =3D tswapl(env->regs[0]); + (*regs)[1] =3D tswapl(env->regs[1]); + (*regs)[2] =3D tswapl(env->regs[2]); + (*regs)[3] =3D tswapl(env->regs[3]); + (*regs)[4] =3D tswapl(env->regs[4]); + (*regs)[5] =3D tswapl(env->regs[5]); + (*regs)[6] =3D tswapl(env->regs[6]); + (*regs)[7] =3D tswapl(env->regs[7]); + (*regs)[8] =3D tswapl(env->regs[8]); + (*regs)[9] =3D tswapl(env->regs[9]); + (*regs)[10] =3D tswapl(env->regs[10]); + (*regs)[11] =3D tswapl(env->regs[11]); + (*regs)[12] =3D tswapl(env->regs[12]); + (*regs)[13] =3D tswapl(env->regs[13]); + (*regs)[14] =3D tswapl(env->regs[14]); + (*regs)[15] =3D tswapl(env->regs[15]); =20 - (*regs)[16] =3D tswapreg(cpsr_read((CPUARMState *)env)); - (*regs)[17] =3D tswapreg(env->regs[0]); /* XXX */ + (*regs)[16] =3D tswapl(cpsr_read((CPUARMState *)env)); + (*regs)[17] =3D tswapl(env->regs[0]); /* XXX */ } =20 #define USE_ELF_CORE_DUMP @@ -398,10 +392,10 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, int i; =20 for (i =3D 0; i < 32; i++) { - (*regs)[i] =3D tswapreg(env->xregs[i]); + (*regs)[i] =3D tswapl(env->xregs[i]); } - (*regs)[32] =3D tswapreg(env->pc); - (*regs)[33] =3D tswapreg(pstate_read((CPUARMState *)env)); + (*regs)[32] =3D tswapl(env->pc); + (*regs)[33] =3D tswapl(pstate_read((CPUARMState *)env)); } =20 #define USE_ELF_CORE_DUMP @@ -485,17 +479,17 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, const CPUPPCState *en target_ulong ccr =3D 0; =20 for (i =3D 0; i < ARRAY_SIZE(env->gpr); i++) { - (*regs)[i] =3D tswapreg(env->gpr[i]); + (*regs)[i] =3D tswapl(env->gpr[i]); } =20 - (*regs)[32] =3D tswapreg(env->nip); - (*regs)[33] =3D tswapreg(env->msr); - (*regs)[35] =3D tswapreg(env->ctr); - (*regs)[36] =3D tswapreg(env->lr); - (*regs)[37] =3D tswapreg(cpu_read_xer(env)); + (*regs)[32] =3D tswapl(env->nip); + (*regs)[33] =3D tswapl(env->msr); + (*regs)[35] =3D tswapl(env->ctr); + (*regs)[36] =3D tswapl(env->lr); + (*regs)[37] =3D tswapl(cpu_read_xer(env)); =20 ccr =3D ppc_get_cr(env); - (*regs)[38] =3D tswapreg(ccr); + (*regs)[38] =3D tswapl(ccr); } =20 #define USE_ELF_CORE_DUMP @@ -539,11 +533,11 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, (*regs)[TARGET_EF_R0] =3D 0; =20 for (i =3D 1; i < ARRAY_SIZE(env->gpr); i++) { - (*regs)[TARGET_EF_R0 + i] =3D tswapreg(env->gpr[i]); + (*regs)[TARGET_EF_R0 + i] =3D tswapl(env->gpr[i]); } =20 - (*regs)[TARGET_EF_CSR_ERA] =3D tswapreg(env->pc); - (*regs)[TARGET_EF_CSR_BADV] =3D tswapreg(env->CSR_BADV); + (*regs)[TARGET_EF_CSR_ERA] =3D tswapl(env->pc); + (*regs)[TARGET_EF_CSR_BADV] =3D tswapl(env->CSR_BADV); } =20 #define USE_ELF_CORE_DUMP @@ -599,17 +593,17 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, const CPUMIPSState *e (*regs)[TARGET_EF_R0] =3D 0; =20 for (i =3D 1; i < ARRAY_SIZE(env->active_tc.gpr); i++) { - (*regs)[TARGET_EF_R0 + i] =3D tswapreg(env->active_tc.gpr[i]); + (*regs)[TARGET_EF_R0 + i] =3D tswapl(env->active_tc.gpr[i]); } =20 (*regs)[TARGET_EF_R26] =3D 0; (*regs)[TARGET_EF_R27] =3D 0; - (*regs)[TARGET_EF_LO] =3D tswapreg(env->active_tc.LO[0]); - (*regs)[TARGET_EF_HI] =3D tswapreg(env->active_tc.HI[0]); - (*regs)[TARGET_EF_CP0_EPC] =3D tswapreg(env->active_tc.PC); - (*regs)[TARGET_EF_CP0_BADVADDR] =3D tswapreg(env->CP0_BadVAddr); - (*regs)[TARGET_EF_CP0_STATUS] =3D tswapreg(env->CP0_Status); - (*regs)[TARGET_EF_CP0_CAUSE] =3D tswapreg(env->CP0_Cause); + (*regs)[TARGET_EF_LO] =3D tswapl(env->active_tc.LO[0]); + (*regs)[TARGET_EF_HI] =3D tswapl(env->active_tc.HI[0]); + (*regs)[TARGET_EF_CP0_EPC] =3D tswapl(env->active_tc.PC); + (*regs)[TARGET_EF_CP0_BADVADDR] =3D tswapl(env->CP0_BadVAddr); + (*regs)[TARGET_EF_CP0_STATUS] =3D tswapl(env->CP0_Status); + (*regs)[TARGET_EF_CP0_CAUSE] =3D tswapl(env->CP0_Cause); } =20 #define USE_ELF_CORE_DUMP @@ -636,15 +630,15 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, const CPUMBState *env int i, pos =3D 0; =20 for (i =3D 0; i < 32; i++) { - (*regs)[pos++] =3D tswapreg(env->regs[i]); + (*regs)[pos++] =3D tswapl(env->regs[i]); } =20 - (*regs)[pos++] =3D tswapreg(env->pc); - (*regs)[pos++] =3D tswapreg(mb_cpu_read_msr(env)); + (*regs)[pos++] =3D tswapl(env->pc); + (*regs)[pos++] =3D tswapl(mb_cpu_read_msr(env)); (*regs)[pos++] =3D 0; - (*regs)[pos++] =3D tswapreg(env->ear); + (*regs)[pos++] =3D tswapl(env->ear); (*regs)[pos++] =3D 0; - (*regs)[pos++] =3D tswapreg(env->esr); + (*regs)[pos++] =3D tswapl(env->esr); } =20 #endif /* TARGET_MICROBLAZE */ @@ -668,10 +662,10 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, int i; =20 for (i =3D 0; i < 32; i++) { - (*regs)[i] =3D tswapreg(cpu_get_gpr(env, i)); + (*regs)[i] =3D tswapl(cpu_get_gpr(env, i)); } - (*regs)[32] =3D tswapreg(env->pc); - (*regs)[33] =3D tswapreg(cpu_get_sr(env)); + (*regs)[32] =3D tswapl(env->pc); + (*regs)[33] =3D tswapl(cpu_get_sr(env)); } =20 #endif /* TARGET_OPENRISC */ @@ -702,15 +696,15 @@ static inline void elf_core_copy_regs(target_elf_greg= set_t *regs, int i; =20 for (i =3D 0; i < 16; i++) { - (*regs)[i] =3D tswapreg(env->gregs[i]); + (*regs)[i] =3D tswapl(env->gregs[i]); } =20 - (*regs)[TARGET_REG_PC] =3D tswapreg(env->pc); - (*regs)[TARGET_REG_PR] =3D tswapreg(env->pr); - (*regs)[TARGET_REG_SR] =3D tswapreg(env->sr); - (*regs)[TARGET_REG_GBR] =3D tswapreg(env->gbr); - (*regs)[TARGET_REG_MACH] =3D tswapreg(env->mach); - (*regs)[TARGET_REG_MACL] =3D tswapreg(env->macl); + (*regs)[TARGET_REG_PC] =3D tswapl(env->pc); + (*regs)[TARGET_REG_PR] =3D tswapl(env->pr); + (*regs)[TARGET_REG_SR] =3D tswapl(env->sr); + (*regs)[TARGET_REG_GBR] =3D tswapl(env->gbr); + (*regs)[TARGET_REG_MACH] =3D tswapl(env->mach); + (*regs)[TARGET_REG_MACL] =3D tswapl(env->macl); (*regs)[TARGET_REG_SYSCALL] =3D 0; /* FIXME */ } =20 @@ -730,25 +724,25 @@ typedef target_ulong target_elf_gregset_t[ELF_NREG]; =20 static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUM68KSt= ate *env) { - (*regs)[0] =3D tswapreg(env->dregs[1]); - (*regs)[1] =3D tswapreg(env->dregs[2]); - (*regs)[2] =3D tswapreg(env->dregs[3]); - (*regs)[3] =3D tswapreg(env->dregs[4]); - (*regs)[4] =3D tswapreg(env->dregs[5]); - (*regs)[5] =3D tswapreg(env->dregs[6]); - (*regs)[6] =3D tswapreg(env->dregs[7]); - (*regs)[7] =3D tswapreg(env->aregs[0]); - (*regs)[8] =3D tswapreg(env->aregs[1]); - (*regs)[9] =3D tswapreg(env->aregs[2]); - (*regs)[10] =3D tswapreg(env->aregs[3]); - (*regs)[11] =3D tswapreg(env->aregs[4]); - (*regs)[12] =3D tswapreg(env->aregs[5]); - (*regs)[13] =3D tswapreg(env->aregs[6]); - (*regs)[14] =3D tswapreg(env->dregs[0]); - (*regs)[15] =3D tswapreg(env->aregs[7]); - (*regs)[16] =3D tswapreg(env->dregs[0]); /* FIXME: orig_d0 */ - (*regs)[17] =3D tswapreg(env->sr); - (*regs)[18] =3D tswapreg(env->pc); + (*regs)[0] =3D tswapl(env->dregs[1]); + (*regs)[1] =3D tswapl(env->dregs[2]); + (*regs)[2] =3D tswapl(env->dregs[3]); + (*regs)[3] =3D tswapl(env->dregs[4]); + (*regs)[4] =3D tswapl(env->dregs[5]); + (*regs)[5] =3D tswapl(env->dregs[6]); + (*regs)[6] =3D tswapl(env->dregs[7]); + (*regs)[7] =3D tswapl(env->aregs[0]); + (*regs)[8] =3D tswapl(env->aregs[1]); + (*regs)[9] =3D tswapl(env->aregs[2]); + (*regs)[10] =3D tswapl(env->aregs[3]); + (*regs)[11] =3D tswapl(env->aregs[4]); + (*regs)[12] =3D tswapl(env->aregs[5]); + (*regs)[13] =3D tswapl(env->aregs[6]); + (*regs)[14] =3D tswapl(env->dregs[0]); + (*regs)[15] =3D tswapl(env->aregs[7]); + (*regs)[16] =3D tswapl(env->dregs[0]); /* FIXME: orig_d0 */ + (*regs)[17] =3D tswapl(env->sr); + (*regs)[18] =3D tswapl(env->pc); (*regs)[19] =3D 0; /* FIXME: regs->format | regs->vector */ } =20 @@ -790,10 +784,10 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, int i; uint32_t *aregs; =20 - (*regs)[TARGET_REG_PSWM] =3D tswapreg(env->psw.mask); - (*regs)[TARGET_REG_PSWA] =3D tswapreg(env->psw.addr); + (*regs)[TARGET_REG_PSWM] =3D tswapl(env->psw.mask); + (*regs)[TARGET_REG_PSWA] =3D tswapl(env->psw.addr); for (i =3D 0; i < 16; i++) { - (*regs)[TARGET_REG_GPRS + i] =3D tswapreg(env->regs[i]); + (*regs)[TARGET_REG_GPRS + i] =3D tswapl(env->regs[i]); } aregs =3D (uint32_t *)&((*regs)[TARGET_REG_ARS]); for (i =3D 0; i < 16; i++) { @@ -895,18 +889,18 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, { unsigned i; =20 - (*regs)[TARGET_REG_PC] =3D tswapreg(env->pc); - (*regs)[TARGET_REG_PS] =3D tswapreg(env->sregs[PS] & ~PS_EXCM); - (*regs)[TARGET_REG_LBEG] =3D tswapreg(env->sregs[LBEG]); - (*regs)[TARGET_REG_LEND] =3D tswapreg(env->sregs[LEND]); - (*regs)[TARGET_REG_LCOUNT] =3D tswapreg(env->sregs[LCOUNT]); - (*regs)[TARGET_REG_SAR] =3D tswapreg(env->sregs[SAR]); - (*regs)[TARGET_REG_WINDOWSTART] =3D tswapreg(env->sregs[WINDOW_START]); - (*regs)[TARGET_REG_WINDOWBASE] =3D tswapreg(env->sregs[WINDOW_BASE]); - (*regs)[TARGET_REG_THREADPTR] =3D tswapreg(env->uregs[THREADPTR]); + (*regs)[TARGET_REG_PC] =3D tswapl(env->pc); + (*regs)[TARGET_REG_PS] =3D tswapl(env->sregs[PS] & ~PS_EXCM); + (*regs)[TARGET_REG_LBEG] =3D tswapl(env->sregs[LBEG]); + (*regs)[TARGET_REG_LEND] =3D tswapl(env->sregs[LEND]); + (*regs)[TARGET_REG_LCOUNT] =3D tswapl(env->sregs[LCOUNT]); + (*regs)[TARGET_REG_SAR] =3D tswapl(env->sregs[SAR]); + (*regs)[TARGET_REG_WINDOWSTART] =3D tswapl(env->sregs[WINDOW_START]); + (*regs)[TARGET_REG_WINDOWBASE] =3D tswapl(env->sregs[WINDOW_BASE]); + (*regs)[TARGET_REG_THREADPTR] =3D tswapl(env->uregs[THREADPTR]); xtensa_sync_phys_from_window((CPUXtensaState *)env); for (i =3D 0; i < env->config->nareg; ++i) { - (*regs)[TARGET_REG_AR0 + i] =3D tswapreg(env->phys_regs[i]); + (*regs)[TARGET_REG_AR0 + i] =3D tswapl(env->phys_regs[i]); } } =20 --=20 2.43.0