From patchwork Sun Jul 5 20:50:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 491353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 286671409F8 for ; Mon, 6 Jul 2015 06:51:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=xN5OLr0T; dkim-atps=neutral Received: from localhost ([::1]:47644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBqsV-0007Uz-E4 for incoming@patchwork.ozlabs.org; Sun, 05 Jul 2015 16:51:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBqs7-0007ER-AD for qemu-devel@nongnu.org; Sun, 05 Jul 2015 16:50:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBqs3-0008FY-PJ for qemu-devel@nongnu.org; Sun, 05 Jul 2015 16:50:43 -0400 Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]:35988) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBqs3-0008FH-EL for qemu-devel@nongnu.org; Sun, 05 Jul 2015 16:50:39 -0400 Received: by pddu5 with SMTP id u5so5896442pdd.3 for ; Sun, 05 Jul 2015 13:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vl3APRbxexXwMUyBnLFrpY7OIW6C85UP9nO3micde/g=; b=xN5OLr0TDBehZLEefzUyv1HZwEDp1nLUZcAAWGYKZm0z18aWhDHb84iIWXY/8Jwgik EMdXhYtkKDo2qPEdf8/sZYDMObIuS+9YVPh+WAUNzHePo5bXcyqw96Q2tGE5GLHHp6HX qLoEodR0dRLr6aEVM/pB506lxAuqTpbqRUIKEJI0Z8zhOekO774A5tncP5g6qlEzlZ6Y Fr6E4DPMYCCWsDbri0N93svYPWfb3tu9WrIrAbEfS7Igl3X6558S8vZqImaTgWBaGJZ1 e8yYB3jyUTSsS5bwSCNFM7wWBUFoU7wQ3IokvK2uaCckcI5aimxePLBX4E45SOU/ZnnV 7/9A== X-Received: by 10.70.40.133 with SMTP id x5mr2953916pdk.14.1436129438583; Sun, 05 Jul 2015 13:50:38 -0700 (PDT) Received: from pcrost-laptop.hsd1.ca.comcast.net (c-73-15-58-35.hsd1.ca.comcast.net. [73.15.58.35]) by mx.google.com with ESMTPSA id p9sm15759919pds.92.2015.07.05.13.50.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Jul 2015 13:50:37 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sun, 5 Jul 2015 13:50:32 -0700 Message-Id: <1436129432-16617-1-git-send-email-crosthwaite.peter@gmail.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22f Cc: pbonzini@redhat.com, Peter Crosthwaite , rth@twiddle.net Subject: [Qemu-devel] [PATCH] disas: Defeature print_target_address X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It does not work in multi-arch as it requires the CPU specific TARGET_VIRT_ADDR_SPACE_BITS global define. Just use the generic version that does no masking. Targets should be responsible for passing in a sane virtual address. Signed-off-by: Peter Crosthwaite Reviewed-by: Richard Henderson --- Depends on "Unify and QOMify (target|monitor)_disas" series disas.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/disas.c b/disas.c index 69a6066..0ae70c2 100644 --- a/disas.c +++ b/disas.c @@ -72,14 +72,6 @@ generic_print_address (bfd_vma addr, struct disassemble_info *info) (*info->fprintf_func) (info->stream, "0x%" PRIx64, addr); } -/* Print address in hex, truncated to the width of a target virtual address. */ -static void -generic_print_target_address(bfd_vma addr, struct disassemble_info *info) -{ - uint64_t mask = ~0ULL >> (64 - TARGET_VIRT_ADDR_SPACE_BITS); - generic_print_address(addr & mask, info); -} - /* 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) @@ -201,7 +193,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, s.info.read_memory_func = target_read_memory; s.info.buffer_vma = code; s.info.buffer_length = size; - s.info.print_address_func = generic_print_target_address; + s.info.print_address_func = generic_print_address; #ifdef TARGET_WORDS_BIGENDIAN s.info.endian = BFD_ENDIAN_BIG; @@ -424,7 +416,7 @@ void monitor_disas(Monitor *mon, CPUState *cpu, s.cpu = cpu; monitor_disas_is_physical = is_physical; s.info.read_memory_func = monitor_read_memory; - s.info.print_address_func = generic_print_target_address; + s.info.print_address_func = generic_print_address; s.info.buffer_vma = pc;