From patchwork Tue Nov 14 09:45:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Huang X-Patchwork-Id: 79813 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 92AA93857707 for ; Tue, 14 Nov 2023 09:46:17 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from s02.bc.larksuite.com (s02.bc.larksuite.com [209.127.230.20]) by sourceware.org (Postfix) with UTF8SMTPS id DE9A73858404 for ; Tue, 14 Nov 2023 09:45:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DE9A73858404 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=oss.cipunited.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=oss.cipunited.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DE9A73858404 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.127.230.20 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699955160; cv=none; b=VSfXT1rn9mymuP663NVVTkImCsXVBT1uwfEZ99LOSIwxQgG5+HueIZm417PsfzOY+QnVCTK7kUWoOj7PnnC7uyYJGCuknZMWe42qAu4iaQBjVFLrsMQ1+kzf+0Tm/iiqafF96kKp7xv695Mex9H6w2JQ94LG/M68+OvEZIKaR3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699955160; c=relaxed/simple; bh=/XFDZ/k5X2Fp8FALVTQ0lLEXg2F6YDOfrgSGFzwAbws=; h=DKIM-Signature:From:Subject:Date:To:Message-Id:Mime-Version; b=egYuc6dkf/YTwEnxQeNAgAQvignXOKS892+vS0vTRByskLC7U8Cf51qNfZsR2XNuS4Sj09mR+SSJUuQjiHvuAkWYwbv3DdrUQ7YYXnxL5Omn2cxRcaor0KIP1XrMXQ779ZbqXSp8FxQDqAXFnZn15q4B7lWkmH5JLh+K7nJc8NE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=feishu2303200042; d=oss.cipunited.com; t=1699955149; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=xtWXKfohOMH3NIReV2brXpBy5rDNWgJmJzB+QUUb5n8=; b=eKydmqk3aUpfELn6ZMmYh/Ld9nwsaqhoDNuk3TX+RSPzKMt3JVz6jpygI3O0WYdtkDz6UY 6zWRwH0JK4FmveFBVgjsx+OnZ7h7e9HYXVVAq9l/HVrrutyZwNXKbocQFseIpua1vQ0Z/H HmKToxIjrq3yBvupR54brH/H4b/9aTOv0qCCsWe79EAe3lFmEvCDGmdKeqrtsZGYjj+aOz cOPyfO+UGilOg/oKwRhseI4tSpbDq8Kb05EfZJxijurHpPoaS4RObNweM8iqc8ZJoTtnfT CKB8ew7lewsffE1AolTN1JWcEAjzvlvAyUaMPxDESyZdwQvk3ms8qZzPt7VZgw== From: "Ying Huang" X-Original-From: Ying Huang Cc: , "Ying Huang" References: <20231114094535.434194-1-ying.huang@oss.cipunited.com> X-Mailer: git-send-email 2.30.2 X-Lms-Return-Path: Subject: [PATCH 1/2] gdb: mips: Change E_MIPS_* to EF_MIPS_* Date: Tue, 14 Nov 2023 17:45:34 +0800 In-Reply-To: <20231114094535.434194-1-ying.huang@oss.cipunited.com> Received: from localhost.localdomain ([1.192.16.206]) by smtp.feishu.cn with ESMTPS; Tue, 14 Nov 2023 17:45:47 +0800 To: Message-Id: <20231114094535.434194-2-ying.huang@oss.cipunited.com> Mime-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, NO_DNS_FOR_FROM, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org From: Ying Huang --- gdb/mips-tdep.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index d40d28e85de..066c7c80669 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -8109,16 +8109,16 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Check ELF_FLAGS to see if it specifies the ABI being used. */ switch ((elf_flags & EF_MIPS_ABI)) { - case E_MIPS_ABI_O32: + case EF_MIPS_ABI_O32: found_abi = MIPS_ABI_O32; break; - case E_MIPS_ABI_O64: + case EF_MIPS_ABI_O64: found_abi = MIPS_ABI_O64; break; - case E_MIPS_ABI_EABI32: + case EF_MIPS_ABI_EABI32: found_abi = MIPS_ABI_EABI32; break; - case E_MIPS_ABI_EABI64: + case EF_MIPS_ABI_EABI64: found_abi = MIPS_ABI_EABI64; break; default: @@ -8924,16 +8924,16 @@ mips_dump_tdep (struct gdbarch *gdbarch, struct ui_file *file) /* Determine the ISA. */ switch (tdep->elf_flags & EF_MIPS_ARCH) { - case E_MIPS_ARCH_1: + case EF_MIPS_ARCH_1: ef_mips_arch = 1; break; - case E_MIPS_ARCH_2: + case EF_MIPS_ARCH_2: ef_mips_arch = 2; break; - case E_MIPS_ARCH_3: + case EF_MIPS_ARCH_3: ef_mips_arch = 3; break; - case E_MIPS_ARCH_4: + case EF_MIPS_ARCH_4: ef_mips_arch = 4; break; default: From patchwork Tue Nov 14 09:45:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Huang X-Patchwork-Id: 79814 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C1EE73857736 for ; Tue, 14 Nov 2023 09:46:51 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from va-2-39.ptr.blmpb.com (va-2-39.ptr.blmpb.com [209.127.231.39]) by sourceware.org (Postfix) with UTF8SMTPS id 55C90385C8B1 for ; Tue, 14 Nov 2023 09:46:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 55C90385C8B1 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=oss.cipunited.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=oss.cipunited.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 55C90385C8B1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.127.231.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699955164; cv=none; b=gM/aoNurDonqUDl7qGpBNUH9NmlR7WBUVUK1s6MugLiPX8QLj9gOtHR/W0lpRPvJZSCZMQ+gauQssZMzVi5Aa5DKkRcVKHhfWSth3o3cFQ0ak+Va2P/s8/s9XSzYfYtMeGxqPplBVE4dfgOCAQ/2YAoOfq6qqF7eLolpSG870Uw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699955164; c=relaxed/simple; bh=Dtj0XTLaAaR0DGmnAbmqxfhOV5lYgMqaSvGsWpxpqIc=; h=DKIM-Signature:From:Message-Id:Mime-Version:Subject:Date:To; b=ihsBp0imCAlndvJEkzHxsScrXJEHeJQscG9jEdRgQZmIrZX35LBZ8S8leUdHiWBJ2YvldfPuYlyKj6pbXnEt5lqawJeF/saoAfDtmxALUdRnUrSAAPYwJ+cEczIpFYtBPnFRIKldRzk3cM1/LTCZxSX2qK3U9GWhA7MHXAabNE8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=feishu2303200042; d=oss.cipunited.com; t=1699955152; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=sLNj74CaQhlFBzA9REJ5ljH7/zpumsxKjoKNaNZHl08=; b=g9CjCUxWBfw6nrLrCRQgLE2lO8Y+k4n61+0oKhTb0OXEp+13xOedllpQsZpD4/9KRxLs3K HNdxFAcPl36sBBG7leHgq7kASf6mfuseccnoxODhzsQZujY0IyegmuFo/BKJMvUWykkMZM W/uBjk6ZClpojR8/CcsJ9HisyTv2ULEpsAx64dCawiJB25aWtaderleyRZlC0E+NM3mBU2 pD1Jvm2x0D56kKNI53iPJXqdmapbrJl5i6lOFNzeQ9S+Hek39mrD/9MkWQhfGk9oWujzAg T/CSNJrQunVoB+QdowlGyoTKvLYhW9I+Fw5PPQAhR1tB1KP0ZxtB89xGeR5r7Q== From: "Ying Huang" Message-Id: <20231114094535.434194-3-ying.huang@oss.cipunited.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231114094535.434194-1-ying.huang@oss.cipunited.com> X-Original-From: Ying Huang Subject: [PATCH 2/2] sim: mips: Change E_MIPS_* to EF_MIPS_* Date: Tue, 14 Nov 2023 17:45:35 +0800 Received: from localhost.localdomain ([1.192.16.206]) by smtp.feishu.cn with ESMTPS; Tue, 14 Nov 2023 17:45:50 +0800 X-Lms-Return-Path: References: <20231114094535.434194-1-ying.huang@oss.cipunited.com> To: Cc: , "Ying Huang" X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, NO_DNS_FOR_FROM, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org From: Ying Huang --- sim/mips/interp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/mips/interp.c b/sim/mips/interp.c index e521963a902..f0c509021a4 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -1557,8 +1557,8 @@ store_word (SIM_DESC sd, } #define MIPSR6_P(abfd) \ - ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_32R6 \ - || (elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_64R6) + ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == EF_MIPS_ARCH_32R6 \ + || (elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == EF_MIPS_ARCH_64R6) /* Load a word from memory. */