From patchwork Thu May 11 08:04:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680848 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp3264989wrs; Thu, 11 May 2023 01:05:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7UxiDaOziNwLpg1euqbVuOxkQZehoXNmsm5mMxNezM6F4Zz7J5yDuFNP3k+ndCkUAkfNUs X-Received: by 2002:a05:6214:29e4:b0:572:6e81:ae9c with SMTP id jv4-20020a05621429e400b005726e81ae9cmr39117198qvb.1.1683792333979; Thu, 11 May 2023 01:05:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683792333; cv=none; d=google.com; s=arc-20160816; b=0GLON54wWTWB1ltjRgrouidfSeYdQHYhs8XJliXL/W0Jw6OluvlH2zNV99wtIshANO ev+tHnWBIuRnALAM7opWDYV9g3gvjM/p0/B8Hbaxox3fPcujkN2cufHy9IzOlYY7lboQ T+176yxA8as26TO4sMBgPHymIhyalWZOsgTV1W9SgOWxbXnXZDXZVsFCFtfYPJ2lBs/d jKPlkjyQwAXjb/WiUGL/3NTHc5cgylhm8EBQV7CFNQkMKMMWUp8qJWXzRuOW/kT1xWCp f1YUlaJ0nCiHtS/yPumWK3/sK49gTmmBCc2Wg+xN685qnpsu6Hst5KXNlEe4FnVHEuD9 ZQaA== 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=6Az8WcHOgmzjU41IoVy9JVQ9yyean8ToXLY6lPiG6LY=; b=ibYeFtUlayhAE4K0Kl67NzJIYvC+Q8bsCKuuRH8YKKeeRpkoprRsaghGPab6ZowdrY M8dk9cdfFh144PNFQmHx9Wt9yHrlHhPfgs88XbOnwsNQbMaL8LB/9PreNFh0J3pfTNWY BUBQbRtFjs1OnfzRX6C7vBQYxEM/H8/+kGYMVfUBzWpF9z0X8K2wImNPW/qngsnBbYhG UuJnq9ejzT0/xhyGZyXbr+lVPxDnikl8A9BujgZD7ncNwyi0k+RWl7pVtQW1bdQV51SL pUIUW+kVzqJXcEYgcGF3VW9qZba/7TWHhLKg18rPf6pF24sD82spvXtGVIKPLUHGLlkM JwZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=amhE8Hvl; 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 kc14-20020a056214410e00b005ef56e4f61dsi3413357qvb.24.2023.05.11.01.05.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 01:05:33 -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=amhE8Hvl; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px1IW-0006MQ-9j; Thu, 11 May 2023 04:05:12 -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 1px1IL-0006Ia-GG for qemu-devel@nongnu.org; Thu, 11 May 2023 04:05:02 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1px1II-0000wh-DU for qemu-devel@nongnu.org; Thu, 11 May 2023 04:05:00 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-50bc37e1525so15593154a12.1 for ; Thu, 11 May 2023 01:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683792296; x=1686384296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6Az8WcHOgmzjU41IoVy9JVQ9yyean8ToXLY6lPiG6LY=; b=amhE8Hvl1VNR34giNIwRiF9Y1Si2yRdqKIub7q58k8IrXDN8z4YFco2xbGgkJv7166 ZScsZRvBOn2fZmkwpxw1JqluP6/rmXe0jV8QEjPoiQEh7E9QnMg9qCKS3CqfBsqaDTMi JZYJN1ohd16wGY+FLoMUNWwjIF5gGU6DA7/PoKrIM1KFHqwol9F4tczP6ebYFa1QNOuL EbZiNoSK+mwdW0JtfGYwlC7LCLyp2q/hljrNluIaP2cJZTrKpA+EMRNGSu33fEUbOVnL eBVHOZf42gDWeqPhW0o3q60uFXRz91xiw3hLmt2swxX8/A8PMgQs5bBE5HCjXFhWe+0a ibZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683792296; x=1686384296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6Az8WcHOgmzjU41IoVy9JVQ9yyean8ToXLY6lPiG6LY=; b=WpuAFKL1mUGQghmoYfpdOi23iucVH3xOHNbNND4MNzatSCfNQbNOhGygV3Qn+OuaPL 2q+XZY/7PntJI38Fxn5qct416arxT+iw6agRUTGGpFrEKe+ticc5sqrmIH7NUpiOXHc+ 9JyP7C5Jezm23Sq7DH33Kv8rAyjhdBHk/1WmG40unY7cuFAkfK2ECa0DDfCVJpcKqm5U G6SMFXPpyGw3rxp27r8wZ8024lbT+gfEwh31ui2di0E4TvepJKGsnz1siy2HUm421LkU 1nXYL9479KrpuE2hHUBov1dfGbkwpWlSFeQ+TwjAwiOpFEZGp0Bjx/alWxNgcNbvs7NG T7Iw== X-Gm-Message-State: AC+VfDzInLv7fNBopa2JfGNROGTDScz7YvcVud1wi6z2uALGrWRafItb +JmxP3ml14BjdF+hYpbHipjlBZwV4Tm09TeGdVkUhA== X-Received: by 2002:aa7:cc8b:0:b0:50b:d2f2:43f with SMTP id p11-20020aa7cc8b000000b0050bd2f2043fmr14403490edt.35.1683792296054; Thu, 11 May 2023 01:04:56 -0700 (PDT) Received: from stoup.. ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i12-20020aa7c70c000000b0050bd7267a5csm2662095edq.58.2023.05.11.01.04.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 01:04:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 05/53] disas: Remove target_ulong from the interface Date: Thu, 11 May 2023 09:04:02 +0100 Message-Id: <20230511080450.860923-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511080450.860923-1-richard.henderson@linaro.org> References: <20230511080450.860923-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=richard.henderson@linaro.org; helo=mail-ed1-x535.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-bounces+patch=linaro.org@nongnu.org Use uint64_t for the pc, and size_t for the size. Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-Id: <20230503072331.1747057-81-richard.henderson@linaro.org> --- include/disas/disas.h | 17 ++++++----------- bsd-user/elfload.c | 5 +++-- disas/disas.c | 19 +++++++++---------- linux-user/elfload.c | 5 +++-- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/include/disas/disas.h b/include/disas/disas.h index d363e95ede..6c394e0b09 100644 --- a/include/disas/disas.h +++ b/include/disas/disas.h @@ -7,28 +7,23 @@ #include "cpu.h" /* Disassemble this for me please... (debugging). */ -void disas(FILE *out, const void *code, unsigned long size); -void target_disas(FILE *out, CPUState *cpu, target_ulong code, - target_ulong size); +void disas(FILE *out, const void *code, size_t size); +void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size); -void monitor_disas(Monitor *mon, CPUState *cpu, - target_ulong pc, int nb_insn, int is_physical); +void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, + int nb_insn, bool is_physical); char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size); /* Look up symbol for debugging purpose. Returns "" if unknown. */ -const char *lookup_symbol(target_ulong orig_addr); +const char *lookup_symbol(uint64_t orig_addr); #endif struct syminfo; struct elf32_sym; struct elf64_sym; -#if defined(CONFIG_USER_ONLY) -typedef const char *(*lookup_symbol_t)(struct syminfo *s, target_ulong orig_addr); -#else -typedef const char *(*lookup_symbol_t)(struct syminfo *s, hwaddr orig_addr); -#endif +typedef const char *(*lookup_symbol_t)(struct syminfo *s, uint64_t orig_addr); struct syminfo { lookup_symbol_t lookup_symbol; diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index fbcdc94b96..2e76f0d3b5 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -352,9 +352,10 @@ static abi_ulong load_elf_interp(struct elfhdr *interp_elf_ex, static int symfind(const void *s0, const void *s1) { - target_ulong addr = *(target_ulong *)s0; + __typeof(sym->st_value) addr = *(uint64_t *)s0; struct elf_sym *sym = (struct elf_sym *)s1; int result = 0; + if (addr < sym->st_value) { result = -1; } else if (addr >= sym->st_value + sym->st_size) { @@ -363,7 +364,7 @@ static int symfind(const void *s0, const void *s1) return result; } -static const char *lookup_symbolxx(struct syminfo *s, target_ulong orig_addr) +static const char *lookup_symbolxx(struct syminfo *s, uint64_t orig_addr) { #if ELF_CLASS == ELFCLASS32 struct elf_sym *syms = s->disas_symtab.elf32; diff --git a/disas/disas.c b/disas/disas.c index d46f638a72..aac7cf3b03 100644 --- a/disas/disas.c +++ b/disas/disas.c @@ -204,10 +204,9 @@ static void initialize_debug_host(CPUDebug *s) } /* Disassemble this for me please... (debugging). */ -void target_disas(FILE *out, CPUState *cpu, target_ulong code, - target_ulong size) +void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size) { - target_ulong pc; + uint64_t pc; int count; CPUDebug s; @@ -226,7 +225,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, } for (pc = code; size > 0; pc += count, size -= count) { - fprintf(out, "0x" TARGET_FMT_lx ": ", pc); + fprintf(out, "0x%08" PRIx64 ": ", pc); count = s.info.print_insn(pc, &s.info); fprintf(out, "\n"); if (count < 0) { @@ -293,7 +292,7 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) } /* Disassemble this for me please... (debugging). */ -void disas(FILE *out, const void *code, unsigned long size) +void disas(FILE *out, const void *code, size_t size) { uintptr_t pc; int count; @@ -325,7 +324,7 @@ void disas(FILE *out, const void *code, unsigned long size) } /* Look up symbol for debugging purpose. Returns "" if unknown. */ -const char *lookup_symbol(target_ulong orig_addr) +const char *lookup_symbol(uint64_t orig_addr) { const char *symbol = ""; struct syminfo *s; @@ -357,8 +356,8 @@ physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, } /* Disassembler for the monitor. */ -void monitor_disas(Monitor *mon, CPUState *cpu, - target_ulong pc, int nb_insn, int is_physical) +void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc, + int nb_insn, bool is_physical) { int count, i; CPUDebug s; @@ -379,13 +378,13 @@ void monitor_disas(Monitor *mon, CPUState *cpu, } if (!s.info.print_insn) { - monitor_printf(mon, "0x" TARGET_FMT_lx + monitor_printf(mon, "0x%08" PRIx64 ": Asm output not supported on this arch\n", pc); return; } for (i = 0; i < nb_insn; i++) { - g_string_append_printf(ds, "0x" TARGET_FMT_lx ": ", pc); + g_string_append_printf(ds, "0x%08" PRIx64 ": ", pc); count = s.info.print_insn(pc, &s.info); g_string_append_c(ds, '\n'); if (count < 0) { diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 703f7434a0..80085b8a30 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3327,9 +3327,10 @@ static void load_elf_interp(const char *filename, struct image_info *info, static int symfind(const void *s0, const void *s1) { - target_ulong addr = *(target_ulong *)s0; struct elf_sym *sym = (struct elf_sym *)s1; + __typeof(sym->st_value) addr = *(uint64_t *)s0; int result = 0; + if (addr < sym->st_value) { result = -1; } else if (addr >= sym->st_value + sym->st_size) { @@ -3338,7 +3339,7 @@ static int symfind(const void *s0, const void *s1) return result; } -static const char *lookup_symbolxx(struct syminfo *s, target_ulong orig_addr) +static const char *lookup_symbolxx(struct syminfo *s, uint64_t orig_addr) { #if ELF_CLASS == ELFCLASS32 struct elf_sym *syms = s->disas_symtab.elf32;