From nobody Tue Feb 10 12:13:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600042061; cv=none; d=zohomail.com; s=zohoarc; b=dekjIBqMSM5lYjkihqVmQEHjhmckzlF0ZcO4lgKVv6XGEE5mbConswrdSm0KdAXiBpAZcXVFjtBOAX/bWPjxhGzTjPSm7uykPh/JvJdplJc5zzm55C3ndS6RsEMlHoRcfohkeFW9i3qfKJys7CVbSFBpNQ47ydtRPlWqgY7feCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600042061; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7F/Aro6rbDEPwg9gtfNrFuKJoWXLzLpxKySFvgwO7/U=; b=bJCTdOl5hZRzl8NIwGW/Q+NbDpD14pYZA3Kp23FsNO4Ne+r2t+cmOtBpNqVbp/uhvXl2OTuUPedhym6TvCmh3Q/4aKfSSFgdi3bRqj+iiCy+ftKEG41D3tuoQuTgiLrW32FnitdjybeJVzkc7JMGtTGmiT7Ok6QPs1V4OpdA9r4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600042061615450.8630261558626; Sun, 13 Sep 2020 17:07:41 -0700 (PDT) Received: from localhost ([::1]:46610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHc20-0001fw-4t for importer@patchew.org; Sun, 13 Sep 2020 20:07:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHbwc-0002eX-Jl for qemu-devel@nongnu.org; Sun, 13 Sep 2020 20:02:06 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:39190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHbwY-0004Bz-NY for qemu-devel@nongnu.org; Sun, 13 Sep 2020 20:02:06 -0400 Received: by mail-pg1-x532.google.com with SMTP id d13so1849711pgl.6 for ; Sun, 13 Sep 2020 17:02:02 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id 31sm6538252pgs.59.2020.09.13.17.01.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 17:01:59 -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=9Q9iyS4+070kw5nQFpfTmG4IVebUEHcY0984nv5bR9Y=; b=Cp9hRogrZuLzluRG810fLmYeLx3KV/Gr8QdQYPFoVofiDjwoUEEjtEVFtKYMJt9TAW 1xsvfM18s1M/U/RPdD18tP4+TX7W+rrF9glFasNI1pMaJsxBrQb/nGWnpafCohcjxUPC EMuHo5s709nLYHd3PARC36XrvhJg3HX7TA3H4unCkxFT60Tdpj+2AiuWp4RjkaH+J5aI JikcRLPqJ4U8w/gshtrYzV1NRot/aLT7CbNGA3Gbo82978hvOzXbaYHCRlPIH5Mh0nvi dyGcmg/SuGMZxj37FZsEY1vjMrpazQyLVKWwGdCLH9IHYMqjRQHP4znwFcU+djRXJ2Vd jZ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Q9iyS4+070kw5nQFpfTmG4IVebUEHcY0984nv5bR9Y=; b=qmMsS75ukrpmd22AiGJcdTzXRChZ8mn0tKdTMiddZe0HXJ8dkdPPscb/rQYsOlDpbx Y4b9yqtQNCnJL/XK8ZZ+QJhXfwYeWkDu23TfPEQQXYwNg4u+SqN8Nw4VSbDZE7mtZBJb eHSfo8SFaOW661EoKOIkooAz2X39m6ZLn3Mj/fFJfMasjnjfrNbJmx238Y4c+MWyh04w IH1Cjkch+OZNiqT4My+ELJ63r3W3zfaDyQyahavS0UkKnD8UJvthMftYeK7h/Egics9M 8kV3po1jpaTy8vSA0l6MujhCqh0n7yiX4MhFoiB82cNYzdfvdoS3QGTpwbw7IcCgdDTR Wc5w== X-Gm-Message-State: AOAM5319LhrP7s/PNdrA227bDOk0cJsURVGd3PWAiogoQZqZkEguVp4U l6yL3l7max+K6hSLQBMKwzoiyC3zs9zxyA== X-Google-Smtp-Source: ABdhPJyKyQYBNGWsHycP7dFne2rSaCaiWjtlsGBe3e2sT6PD5JdGUZMUpKQ5LOcUtNYOEDpu6kvhyQ== X-Received: by 2002:a63:485c:: with SMTP id x28mr9173603pgk.289.1600041720332; Sun, 13 Sep 2020 17:02:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 04/11] disas: Clean up CPUDebug initialization Date: Sun, 13 Sep 2020 17:01:46 -0700 Message-Id: <20200914000153.1725632-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914000153.1725632-1-richard.henderson@linaro.org> References: <20200914000153.1725632-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::532; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x532.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PDS_OTHER_BAD_TLD=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: luoyonggang@gmail.com, alex.bennee@linaro.org, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rename buffer_read_memory to host_read_memory. Make a bunch of functions static that are not used outside this file. Replace INIT_DISASSEMBLE_INFO with a trio of functions. Signed-off-by: Richard Henderson --- include/disas/dis-asm.h | 60 -------- disas.c | 323 +++++++++++++++++++--------------------- 2 files changed, 150 insertions(+), 233 deletions(-) diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h index 9856bf7921..d2418c977e 100644 --- a/include/disas/dis-asm.h +++ b/include/disas/dis-asm.h @@ -461,67 +461,7 @@ int print_insn_riscv32 (bfd_vma, disassemble_= info*); int print_insn_riscv64 (bfd_vma, disassemble_info*); int print_insn_rx(bfd_vma, disassemble_info *); =20 -#if 0 -/* Fetch the disassembler for a given BFD, if that support is available. = */ -disassembler_ftype disassembler(bfd *); -#endif - =0C -/* This block of definitions is for particular callers who read instructio= ns - into a buffer before calling the instruction decoder. */ - -/* Here is a function which callers may wish to use for read_memory_func. - It gets bytes from a buffer. */ -int buffer_read_memory(bfd_vma, bfd_byte *, int, struct disassemble_info *= ); - -/* This function goes with buffer_read_memory. - It prints a message using info->fprintf_func and info->stream. */ -void perror_memory(int, bfd_vma, struct disassemble_info *); - - -/* Just print the address in hex. This is included for completeness even - though both GDB and objdump provide their own (to print symbolic - addresses). */ -void generic_print_address(bfd_vma, struct disassemble_info *); - -/* Always true. */ -int generic_symbol_at_address(bfd_vma, struct disassemble_info *); - -/* Macro to initialize a disassemble_info struct. This should be called - by all applications creating such a struct. */ -#define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \ - (INFO).flavour =3D bfd_target_unknown_flavour, \ - (INFO).arch =3D bfd_arch_unknown, \ - (INFO).mach =3D 0, \ - (INFO).endian =3D BFD_ENDIAN_UNKNOWN, \ - INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) - -/* Call this macro to initialize only the internal variables for the - disassembler. Architecture dependent things such as byte order, or mac= hine - variant are not touched by this macro. This makes things much easier f= or - GDB which must initialize these things separately. */ - -#define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \ - (INFO).fprintf_func =3D (FPRINTF_FUNC), \ - (INFO).stream =3D (STREAM), \ - (INFO).symbols =3D NULL, \ - (INFO).num_symbols =3D 0, \ - (INFO).private_data =3D NULL, \ - (INFO).buffer =3D NULL, \ - (INFO).buffer_vma =3D 0, \ - (INFO).buffer_length =3D 0, \ - (INFO).read_memory_func =3D buffer_read_memory, \ - (INFO).memory_error_func =3D perror_memory, \ - (INFO).print_address_func =3D generic_print_address, \ - (INFO).print_insn =3D NULL, \ - (INFO).symbol_at_address_func =3D generic_symbol_at_address, \ - (INFO).flags =3D 0, \ - (INFO).bytes_per_line =3D 0, \ - (INFO).bytes_per_chunk =3D 0, \ - (INFO).display_endian =3D BFD_ENDIAN_UNKNOWN, \ - (INFO).disassembler_options =3D NULL, \ - (INFO).insn_info_valid =3D 0 - #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((unused)) #endif diff --git a/disas.c b/disas.c index a4304e8137..50b5677930 100644 --- a/disas.c +++ b/disas.c @@ -16,75 +16,70 @@ typedef struct CPUDebug { /* Filled in by elfload.c. Simplistic, but will do for now. */ struct syminfo *syminfos =3D NULL; =20 -/* Get LENGTH bytes from info's buffer, at target address memaddr. - Transfer them to myaddr. */ -int -buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, - struct disassemble_info *info) +/* + * Get LENGTH bytes from info's buffer, at host address memaddr. + * Transfer them to myaddr. + */ +static int host_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, + struct disassemble_info *info) { if (memaddr < info->buffer_vma - || memaddr + length > info->buffer_vma + info->buffer_length) + || memaddr + length > info->buffer_vma + info->buffer_length) { /* Out of bounds. Use EIO because GDB uses it. */ return EIO; + } memcpy (myaddr, info->buffer + (memaddr - info->buffer_vma), length); return 0; } =20 -/* Get LENGTH bytes from info's buffer, at target address memaddr. - Transfer them to myaddr. */ -static int -target_read_memory (bfd_vma memaddr, - bfd_byte *myaddr, - int length, - struct disassemble_info *info) +/* + * Get LENGTH bytes from info's buffer, at target address memaddr. + * Transfer them to myaddr. + */ +static int target_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int lengt= h, + struct disassemble_info *info) { CPUDebug *s =3D container_of(info, CPUDebug, info); - int r; - - r =3D cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); - + int r =3D cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); return r ? EIO : 0; } =20 /* Print an error message. We can assume that this is in response to an error return from buffer_read_memory. */ -void -perror_memory (int status, bfd_vma memaddr, struct disassemble_info *info) +static void perror_memory(int status, bfd_vma memaddr, + struct disassemble_info *info) { - if (status !=3D EIO) - /* Can't happen. */ - (*info->fprintf_func) (info->stream, "Unknown error %d\n", status); - else - /* Actually, address between memaddr and memaddr + len was - out of bounds. */ - (*info->fprintf_func) (info->stream, - "Address 0x%" PRIx64 " is out of bounds.\n", memaddr); + if (status !=3D EIO) { + /* Can't happen. */ + info->fprintf_func(info->stream, "Unknown error %d\n", status); + } else { + /* Address between memaddr and memaddr + len was out of bounds. */ + info->fprintf_func(info->stream, + "Address 0x%" PRIx64 " is out of bounds.\n", + memaddr); + } } =20 -/* This could be in a separate file, to save minuscule amounts of space - in statically linked executables. */ - -/* Just print the address is hex. This is included for completeness even - though both GDB and objdump provide their own (to print symbolic - addresses). */ - -void -generic_print_address (bfd_vma addr, struct disassemble_info *info) +/* + * Print the address is hex. This is included for completeness even + * though both GDB and objdump provide their own (to print symbolic + * addresses). + */ +static void generic_print_address (bfd_vma addr, struct disassemble_info *= info) { - (*info->fprintf_func) (info->stream, "0x%" PRIx64, addr); + info->fprintf_func(info->stream, "0x%" PRIx64, addr); } =20 /* Print address in hex, truncated to the width of a host virtual address.= */ -static void -generic_print_host_address(bfd_vma addr, struct disassemble_info *info) +static void generic_print_host_address(bfd_vma addr, + struct disassemble_info *info) { - uint64_t mask =3D ~0ULL >> (64 - (sizeof(void *) * 8)); - generic_print_address(addr & mask, info); + generic_print_address((uintptr_t)addr, info); } =20 /* Just return the given address. */ =20 -int +static int generic_symbol_at_address (bfd_vma addr, struct disassemble_info *info) { return 1; @@ -423,36 +418,116 @@ static bool cap_disas_monitor(disassemble_info *info= , uint64_t pc, int count) # define cap_disas_plugin(i, p, c) false #endif /* CONFIG_CAPSTONE */ =20 +static void initialize_debug(CPUDebug *s) +{ + memset(s, 0, sizeof(*s)); + s->info.arch =3D bfd_arch_unknown; + s->info.cap_arch =3D -1; + s->info.cap_insn_unit =3D 4; + s->info.cap_insn_split =3D 4; + s->info.memory_error_func =3D perror_memory; + s->info.symbol_at_address_func =3D generic_symbol_at_address; +} + +static void initialize_debug_target(CPUDebug *s, CPUState *cpu) +{ + initialize_debug(s); + + s->cpu =3D cpu; + s->info.read_memory_func =3D target_read_memory; + s->info.print_address_func =3D generic_print_address; +#ifdef TARGET_WORDS_BIGENDIAN + s->info.endian =3D BFD_ENDIAN_BIG; +#else + s->info.endian =3D BFD_ENDIAN_LITTLE; +#endif + + CPUClass *cc =3D CPU_GET_CLASS(cpu); + if (cc->disas_set_info) { + cc->disas_set_info(cpu, &s->info); + } +} + +static void initialize_debug_host(CPUDebug *s) +{ + initialize_debug(s); + + s->info.read_memory_func =3D host_read_memory; + s->info.print_address_func =3D generic_print_host_address; +#ifdef HOST_WORDS_BIGENDIAN + s->info.endian =3D BFD_ENDIAN_BIG; +#else + s->info.endian =3D BFD_ENDIAN_LITTLE; +#endif +#if defined(CONFIG_TCG_INTERPRETER) + s->info.print_insn =3D print_insn_tci; +#elif defined(__i386__) + s->info.mach =3D bfd_mach_i386_i386; + s->info.print_insn =3D print_insn_i386; + s->info.cap_arch =3D CS_ARCH_X86; + s->info.cap_mode =3D CS_MODE_32; + s->info.cap_insn_unit =3D 1; + s->info.cap_insn_split =3D 8; +#elif defined(__x86_64__) + s->info.mach =3D bfd_mach_x86_64; + s->info.print_insn =3D print_insn_i386; + s->info.cap_arch =3D CS_ARCH_X86; + s->info.cap_mode =3D CS_MODE_64; + s->info.cap_insn_unit =3D 1; + s->info.cap_insn_split =3D 8; +#elif defined(_ARCH_PPC) + s->info.disassembler_options =3D (char *)"any"; + s->info.print_insn =3D print_insn_ppc; + s->info.cap_arch =3D CS_ARCH_PPC; +# ifdef _ARCH_PPC64 + s->info.cap_mode =3D CS_MODE_64; +# endif +#elif defined(__riscv) && defined(CONFIG_RISCV_DIS) +#if defined(_ILP32) || (__riscv_xlen =3D=3D 32) + s->info.print_insn =3D print_insn_riscv32; +#elif defined(_LP64) + s->info.print_insn =3D print_insn_riscv64; +#else +#error unsupported RISC-V ABI +#endif +#elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS) + s->info.print_insn =3D print_insn_arm_a64; + s->info.cap_arch =3D CS_ARCH_ARM64; +#elif defined(__alpha__) + s->info.print_insn =3D print_insn_alpha; +#elif defined(__sparc__) + s->info.print_insn =3D print_insn_sparc; + s->info.mach =3D bfd_mach_sparc_v9b; +#elif defined(__arm__) + /* TCG only generates code for arm mode. */ + s->info.print_insn =3D print_insn_arm; + s->info.cap_arch =3D CS_ARCH_ARM; +#elif defined(__MIPSEB__) + s->info.print_insn =3D print_insn_big_mips; +#elif defined(__MIPSEL__) + s->info.print_insn =3D print_insn_little_mips; +#elif defined(__m68k__) + s->info.print_insn =3D print_insn_m68k; +#elif defined(__s390__) + s->info.print_insn =3D print_insn_s390; +#elif defined(__hppa__) + s->info.print_insn =3D print_insn_hppa; +#endif +} + /* Disassemble this for me please... (debugging). */ void target_disas(FILE *out, CPUState *cpu, target_ulong code, target_ulong size) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); target_ulong pc; int count; CPUDebug s; =20 - INIT_DISASSEMBLE_INFO(s.info, out, fprintf); - - s.cpu =3D cpu; - s.info.read_memory_func =3D target_read_memory; + initialize_debug_target(&s, cpu); + s.info.fprintf_func =3D fprintf; + s.info.stream =3D out; s.info.buffer_vma =3D code; s.info.buffer_length =3D size; - s.info.print_address_func =3D generic_print_address; - s.info.cap_arch =3D -1; - s.info.cap_mode =3D 0; - s.info.cap_insn_unit =3D 4; - s.info.cap_insn_split =3D 4; - -#ifdef TARGET_WORDS_BIGENDIAN - s.info.endian =3D BFD_ENDIAN_BIG; -#else - s.info.endian =3D BFD_ENDIAN_LITTLE; -#endif - - if (cc->disas_set_info) { - cc->disas_set_info(cpu, &s.info); - } =20 if (s.info.cap_arch >=3D 0 && cap_disas_target(&s.info, code, size)) { return; @@ -540,34 +615,17 @@ bool cap_disas_plugin(disassemble_info *info, uint64_= t pc, size_t size) */ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); int count; CPUDebug s; GString *ds =3D g_string_set_size(&plugin_disas_output, 0); =20 g_assert(ds =3D=3D &plugin_disas_output); =20 - INIT_DISASSEMBLE_INFO(s.info, NULL, plugin_printf); - - s.cpu =3D cpu; - s.info.read_memory_func =3D target_read_memory; + initialize_debug_target(&s, cpu); + s.info.fprintf_func =3D plugin_printf; s.info.buffer_vma =3D addr; s.info.buffer_length =3D size; s.info.print_address_func =3D plugin_print_address; - s.info.cap_arch =3D -1; - s.info.cap_mode =3D 0; - s.info.cap_insn_unit =3D 4; - s.info.cap_insn_split =3D 4; - -#ifdef TARGET_WORDS_BIGENDIAN - s.info.endian =3D BFD_ENDIAN_BIG; -#else - s.info.endian =3D BFD_ENDIAN_LITTLE; -#endif - - if (cc->disas_set_info) { - cc->disas_set_info(cpu, &s.info); - } =20 if (s.info.cap_arch >=3D 0 && cap_disas_plugin(&s.info, addr, size)) { return g_strdup(ds->str); @@ -593,89 +651,24 @@ void disas(FILE *out, void *code, unsigned long size) uintptr_t pc; int count; CPUDebug s; - int (*print_insn)(bfd_vma pc, disassemble_info *info) =3D NULL; - - INIT_DISASSEMBLE_INFO(s.info, out, fprintf); - s.info.print_address_func =3D generic_print_host_address; =20 + initialize_debug_host(&s); + s.info.fprintf_func =3D fprintf; + s.info.stream =3D out; s.info.buffer =3D code; s.info.buffer_vma =3D (uintptr_t)code; s.info.buffer_length =3D size; - s.info.cap_arch =3D -1; - s.info.cap_mode =3D 0; - s.info.cap_insn_unit =3D 4; - s.info.cap_insn_split =3D 4; - -#ifdef HOST_WORDS_BIGENDIAN - s.info.endian =3D BFD_ENDIAN_BIG; -#else - s.info.endian =3D BFD_ENDIAN_LITTLE; -#endif -#if defined(CONFIG_TCG_INTERPRETER) - print_insn =3D print_insn_tci; -#elif defined(__i386__) - s.info.mach =3D bfd_mach_i386_i386; - print_insn =3D print_insn_i386; - s.info.cap_arch =3D CS_ARCH_X86; - s.info.cap_mode =3D CS_MODE_32; - s.info.cap_insn_unit =3D 1; - s.info.cap_insn_split =3D 8; -#elif defined(__x86_64__) - s.info.mach =3D bfd_mach_x86_64; - print_insn =3D print_insn_i386; - s.info.cap_arch =3D CS_ARCH_X86; - s.info.cap_mode =3D CS_MODE_64; - s.info.cap_insn_unit =3D 1; - s.info.cap_insn_split =3D 8; -#elif defined(_ARCH_PPC) - s.info.disassembler_options =3D (char *)"any"; - print_insn =3D print_insn_ppc; - s.info.cap_arch =3D CS_ARCH_PPC; -# ifdef _ARCH_PPC64 - s.info.cap_mode =3D CS_MODE_64; -# endif -#elif defined(__riscv) && defined(CONFIG_RISCV_DIS) -#if defined(_ILP32) || (__riscv_xlen =3D=3D 32) - print_insn =3D print_insn_riscv32; -#elif defined(_LP64) - print_insn =3D print_insn_riscv64; -#else -#error unsupported RISC-V ABI -#endif -#elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS) - print_insn =3D print_insn_arm_a64; - s.info.cap_arch =3D CS_ARCH_ARM64; -#elif defined(__alpha__) - print_insn =3D print_insn_alpha; -#elif defined(__sparc__) - print_insn =3D print_insn_sparc; - s.info.mach =3D bfd_mach_sparc_v9b; -#elif defined(__arm__) - print_insn =3D print_insn_arm; - s.info.cap_arch =3D CS_ARCH_ARM; - /* TCG only generates code for arm mode. */ -#elif defined(__MIPSEB__) - print_insn =3D print_insn_big_mips; -#elif defined(__MIPSEL__) - print_insn =3D print_insn_little_mips; -#elif defined(__m68k__) - print_insn =3D print_insn_m68k; -#elif defined(__s390__) - print_insn =3D print_insn_s390; -#elif defined(__hppa__) - print_insn =3D print_insn_hppa; -#endif =20 if (s.info.cap_arch >=3D 0 && cap_disas_host(&s.info, code, size)) { return; } =20 - if (print_insn =3D=3D NULL) { - print_insn =3D print_insn_od_host; + if (s.info.print_insn =3D=3D NULL) { + s.info.print_insn =3D print_insn_od_host; } for (pc =3D (uintptr_t)code; size > 0; pc +=3D count, size -=3D count)= { fprintf(out, "0x%08" PRIxPTR ": ", pc); - count =3D print_insn(pc, &s.info); + count =3D s.info.print_insn(pc, &s.info); fprintf(out, "\n"); if (count < 0) { break; @@ -720,31 +713,15 @@ physical_read_memory(bfd_vma memaddr, bfd_byte *myadd= r, int length, void monitor_disas(Monitor *mon, CPUState *cpu, target_ulong pc, int nb_insn, int is_physical) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); int count, i; CPUDebug s; =20 - INIT_DISASSEMBLE_INFO(s.info, NULL, qemu_fprintf); - - s.cpu =3D cpu; - s.info.read_memory_func - =3D (is_physical ? physical_read_memory : target_read_memory); - s.info.print_address_func =3D generic_print_address; - s.info.buffer_vma =3D pc; - s.info.cap_arch =3D -1; - s.info.cap_mode =3D 0; - s.info.cap_insn_unit =3D 4; - s.info.cap_insn_split =3D 4; - -#ifdef TARGET_WORDS_BIGENDIAN - s.info.endian =3D BFD_ENDIAN_BIG; -#else - s.info.endian =3D BFD_ENDIAN_LITTLE; -#endif - - if (cc->disas_set_info) { - cc->disas_set_info(cpu, &s.info); + initialize_debug_target(&s, cpu); + s.info.fprintf_func =3D qemu_fprintf; + if (is_physical) { + s.info.read_memory_func =3D physical_read_memory; } + s.info.buffer_vma =3D pc; =20 if (s.info.cap_arch >=3D 0 && cap_disas_monitor(&s.info, pc, nb_insn))= { return; --=20 2.25.1