From nobody Thu May 16 05:32:58 2024 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=1712907387; cv=none; d=zohomail.com; s=zohoarc; b=HKhSR35ZME0kqJKoNa1te5by7UB162lOO0l8QUOBotUOYluqWyUfJGxyjM+R18sY8lJ8n28xVggvHJr/yi+rI2H/d5165pGZZo5cMrSNdcV8NvLJP8qe0wPiuUZFtKWJYWDMzehL6Qzpmx41Cx0cBXWbimVdUHWbPOkRI4eca2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907387; 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=ISGCLEDJVFZiUeSj505TnpSQiQ8gRVs+fhfSNIPx8Ks=; b=hRLU9ZmEwsh/avTBuAzU5ocmWihQXbqflw55Zcgz9Ie3rIfMpxn+yuWLVy0zHscEvYgJumGto84l6yVZmAIW0D4ZBJ2mcGiMGW77f4n39TKLoJqeQipN8pV+rg6OAH+G9twW5+QQ9ViK8iJFtEfe8xgixZK2/w1/ZdcUhtfwURY= 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 1712907387545366.9267469388892; Fri, 12 Apr 2024 00:36:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQ2-0006yT-JI; Fri, 12 Apr 2024 03:33:54 -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 1rvBPz-0006ww-OW for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:51 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBPx-00074a-Qf for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:51 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5ce07cf1e5dso421993a12.2 for ; Fri, 12 Apr 2024 00:33:49 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907228; x=1713512028; 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=ISGCLEDJVFZiUeSj505TnpSQiQ8gRVs+fhfSNIPx8Ks=; b=RaCYFfs38nvxICiWQCl6+45MYFyfzIsrBmBLs9NTtKTwIZH3tc47PtZauX4mEkGNYA DE98YqDOiTkqh5RTEISNhWensMSu2B7LVLG+Z5oauXSX1z/+pkxVeqHVmVhZdHGERbNd 0nQ5tZQlBmyUND4KSzZR94C6rkTVcD/+3xN6xjPF1U4hHGvbrQ39K1Ewsfjxd119qykO DO4Psm8O7cOTzot1isbzrffti0CelbxuH5r71sR8ylpynUntvIWzpptMA1oJC1eSFIXs 9MkhcC6KI+Od1OlNE8NXM1tGIV36uT3HUo+uUav0Dd/AV1VLB1phu6wB3jb2U/fOpDfI Dl5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907228; x=1713512028; 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=ISGCLEDJVFZiUeSj505TnpSQiQ8gRVs+fhfSNIPx8Ks=; b=ZG5W/G34smriHMz+CdxtSmc/vFBAeRASJVL3+crunjQTTuDRxSOCDV+H8PpIkx8yAb 6xhpwKRjFgtVchYKO1GHkvkUMdVBNyhpplOlGzg9JTDsTNwFruSptIdNS6bQvHBI0pjz 4Yw4JfhhNdHg0jrXfnOuZ557uZH8DSayDxsmbQXfHAhe7Lc1G0PEXZSn+OfpLNL11GUe G0wSHj09vHdmnpbXweGiMZgAHMbowXhE6eD0lg/YXWZAPhWHlyuWe15F+gAr13z4o0Cz xtp2qhpgURJ/dUw7mqwNdfowUj4cNh6YiFM9GurE7gJTTuYej0Zy8K/y+mPEgXweMnPR 2TKg== X-Gm-Message-State: AOJu0Yxx2IOdqSXXN9f8YJyyDdi9N47DGS/GoxnrPsEOlRhnnvcQq9Hm iCXsec+kkgFMUNl18pAAzGxkt7aKiwWO6s5i0oS93Dz/jH0C7vKw5Cam6JbMFDHCxSxSFG6VveS S X-Google-Smtp-Source: AGHT+IEnd0rmDPo0aYVMqOy1/eSlsemPhUtzIqHjNRKp5GkbmIhthdNb0lm/JIm7U/5TDoJRIZ2Zlw== X-Received: by 2002:a05:6a21:3e02:b0:1a7:9adc:86de with SMTP id bk2-20020a056a213e0200b001a79adc86demr2025603pzc.20.1712907228329; Fri, 12 Apr 2024 00:33:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 01/27] util/hexdump: Remove b parameter from qemu_hexdump_line Date: Fri, 12 Apr 2024 00:33:20 -0700 Message-Id: <20240412073346.458116-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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: 1712907389000100002 Content-Type: text/plain; charset="utf-8" Require that the caller output the offset and increment bufptr. Use QEMU_HEXDUMP_LINE_BYTES in vhost_vdpa_dump_config instead of raw integer. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/cutils.h | 2 +- hw/virtio/vhost-vdpa.c | 4 ++-- util/hexdump.c | 13 ++++++------- hw/virtio/trace-events | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 92c927a6a3..3415f5d249 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -257,7 +257,7 @@ int parse_debug_env(const char *name, int max, int init= ial); */ #define QEMU_HEXDUMP_LINE_BYTES 16 /* Number of bytes to dump */ #define QEMU_HEXDUMP_LINE_LEN 75 /* Number of characters in line */ -void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr, +void qemu_hexdump_line(char *line, const void *bufptr, unsigned int len, bool ascii); =20 /* diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index e827b9175f..b4afa142f6 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -946,8 +946,8 @@ static void vhost_vdpa_dump_config(struct vhost_dev *de= v, const uint8_t *config, =20 for (b =3D 0; b < config_len; b +=3D 16) { len =3D config_len - b; - qemu_hexdump_line(line, b, config, len, false); - trace_vhost_vdpa_dump_config(dev, line); + qemu_hexdump_line(line, config + b, len, false); + trace_vhost_vdpa_dump_config(dev, b, line); } } =20 diff --git a/util/hexdump.c b/util/hexdump.c index 9921114b3c..7324e7b126 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" =20 -void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr, +void qemu_hexdump_line(char *line, const void *bufptr, unsigned int len, bool ascii) { const char *buf =3D bufptr; @@ -26,13 +26,12 @@ void qemu_hexdump_line(char *line, unsigned int b, cons= t void *bufptr, len =3D QEMU_HEXDUMP_LINE_BYTES; } =20 - line +=3D snprintf(line, 6, "%04x:", b); for (i =3D 0; i < QEMU_HEXDUMP_LINE_BYTES; i++) { - if ((i % 4) =3D=3D 0) { + if (i !=3D 0 && (i % 4) =3D=3D 0) { *line++ =3D ' '; } if (i < len) { - line +=3D sprintf(line, " %02x", (unsigned char)buf[b + i]); + line +=3D sprintf(line, " %02x", (unsigned char)buf[i]); } else { line +=3D sprintf(line, " "); } @@ -40,7 +39,7 @@ void qemu_hexdump_line(char *line, unsigned int b, const = void *bufptr, if (ascii) { *line++ =3D ' '; for (i =3D 0; i < len; i++) { - c =3D buf[b + i]; + c =3D buf[i]; if (c < ' ' || c > '~') { c =3D '.'; } @@ -58,8 +57,8 @@ void qemu_hexdump(FILE *fp, const char *prefix, =20 for (b =3D 0; b < size; b +=3D QEMU_HEXDUMP_LINE_BYTES) { len =3D size - b; - qemu_hexdump_line(line, b, bufptr, len, true); - fprintf(fp, "%s: %s\n", prefix, line); + qemu_hexdump_line(line, bufptr + b, len, true); + fprintf(fp, "%s: %04x: %s\n", prefix, b, line); } =20 } diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 96632fd026..d01bc85037 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -50,7 +50,7 @@ vhost_vdpa_get_device_id(void *dev, uint32_t device_id) "= dev: %p device_id %"PRI vhost_vdpa_reset_device(void *dev) "dev: %p" vhost_vdpa_get_vq_index(void *dev, int idx, int vq_idx) "dev: %p idx: %d v= q idx: %d" vhost_vdpa_set_vring_enable_one(void *dev, unsigned i, int enable, int r) = "dev: %p, idx: %u, enable: %u, r: %d" -vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s" +vhost_vdpa_dump_config(void *dev, unsigned ofs, const char *line) "dev: %p= %04x: %s" vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t = flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32 vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev: = %p config: %p config_len: %"PRIu32 vhost_vdpa_suspend(void *dev) "dev: %p" --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907467; cv=none; d=zohomail.com; s=zohoarc; b=GD/aM0hPWhEI8fQ8FkD6kqG08lTBnv/C7ymY8Cy9WzWiZAUhm1FljZFrSZKCLUQ1/0Gu170vSd+3JB3qbqIb+n5jY+mfPFHL2hMSuLrOcK5jo4Sqt6XrOKREYawa29ECjUKUVVMCEhyhGaa187SvIDbMXoeKXH+2S7N7mH3vUpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907467; 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=+WtY4DsJRn2jEDsEW21TOMqrULwYncFBXOs9a6AYGRc=; b=mdA1D24YGHa92kzvzeGklf1fSFg3mSP22ld19yBWN6xYypex2a2BVtfjveyY0YxruPlo5vr6OeVKZHGlsZqWLNGDiX9mK5K0hvjHZN+NUGthNJ3giP1XoMhATUKGLjBVccXLbfnGi8f/UBcFodaDPZrAwuOhASVvda6W64SH/w0= 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 171290746719252.54486587907229; Fri, 12 Apr 2024 00:37:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQ4-0006zB-77; Fri, 12 Apr 2024 03:33:56 -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 1rvBQ1-0006xO-4u for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:53 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBPy-00074g-DC for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:52 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5dca1efad59so451629a12.2 for ; Fri, 12 Apr 2024 00:33:50 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907229; x=1713512029; 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=+WtY4DsJRn2jEDsEW21TOMqrULwYncFBXOs9a6AYGRc=; b=efqxISQZfqOPZjn4MTPsnHQcAkoNh3ktYf1OveUy2/hMVh0RRqO6jwblvv/3JIU2eF xqBxUHyS/WZml8f427Mx0fo5KuzpM3vgRM828wuclKCgmyZFr+r2qxAmL6aY52fDxWAI OxuhKGyvt5DNhHaBGDHtVjW71ewJEJLxEbCHPGY5ix9bQCBe2FeH2nR+pEy9k7ygrcga Q0vrzV0le61GpptaqrKT1Cn5fq/48uqMVR+sxkfLoiHFo+z5JK75pbpdT7zzM6qCCj8b Zsv1aExQaPosk+DUD1Orb97M++FUTI+mX1kVcGNs9pneeULOmmLH67rfZifgt+dSYk87 3jKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907229; x=1713512029; 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=+WtY4DsJRn2jEDsEW21TOMqrULwYncFBXOs9a6AYGRc=; b=tDLU1OSK886T52h6Ae8nmqyYHG5T4AtTtdMiCEiU96doNN0KbQEhUslfJNsiPcrcj7 uCtPMAAVK9nNWH3fvEBom9S/1DC5xckKET6Vi89Ynv1SsgSPScAWgAkNYwQxwRTQ3Ksz +52ly/9fIOk/nWRp5w2nS3zCTSftCxqPgRe5Ik7SVI1AdDYUo5GPrqgi6olAqoXDbj/0 sy3rSFdJaiJnbhbr3lovfU7lKymMVApJ8ErTmy7EjPUdjT8P66ngqQPxUgouRUp+iKB5 sHL3w9CrBnwyghPQYl3omntCEV5stytGlji41yf95BuzfrA4CsDea9Uzn5kfEf5UH3S9 kLmw== X-Gm-Message-State: AOJu0Yyz09xBwnMvo8/zqrwCyjV3UNcBRp7pOHQ1n0UPrWVlioLy1PMo i55+lRzd9XRVHAENcLA2O8O8S41ZUEDQ8CMiidk5slxWvioMh1svIum/H7nv2uvrqS5kQvSJ9jZ O X-Google-Smtp-Source: AGHT+IGv0uisfcQpQYJDOzdqbBY/pHSv+RBuKW6VvhCXjjWsXyt91vMbh+yWx9FYe+tZE0jeXplvqQ== X-Received: by 2002:a05:6a21:151a:b0:1a9:b3e9:a62c with SMTP id nq26-20020a056a21151a00b001a9b3e9a62cmr307545pzb.48.1712907229154; Fri, 12 Apr 2024 00:33:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 02/27] util/hexdump: Remove ascii parameter from qemu_hexdump_line Date: Fri, 12 Apr 2024 00:33:21 -0700 Message-Id: <20240412073346.458116-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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: 1712907469202100013 Content-Type: text/plain; charset="utf-8" Split out asciidump_line as a separate function, local to hexdump.c, for use by qemu_hexdump. Use "%-*s" to generate the alignment between the hex and the ascii, rather than explicit spaces. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/cutils.h | 3 +-- hw/virtio/vhost-vdpa.c | 2 +- util/hexdump.c | 54 ++++++++++++++++++++++++------------------ 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 3415f5d249..d0c5386e6c 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -257,8 +257,7 @@ int parse_debug_env(const char *name, int max, int init= ial); */ #define QEMU_HEXDUMP_LINE_BYTES 16 /* Number of bytes to dump */ #define QEMU_HEXDUMP_LINE_LEN 75 /* Number of characters in line */ -void qemu_hexdump_line(char *line, const void *bufptr, - unsigned int len, bool ascii); +void qemu_hexdump_line(char *line, const void *bufptr, size_t len); =20 /* * Hexdump a buffer to a file. An optional string prefix is added to every= line diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index b4afa142f6..32bad5ce68 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -946,7 +946,7 @@ static void vhost_vdpa_dump_config(struct vhost_dev *de= v, const uint8_t *config, =20 for (b =3D 0; b < config_len; b +=3D 16) { len =3D config_len - b; - qemu_hexdump_line(line, config + b, len, false); + qemu_hexdump_line(line, config + b, len); trace_vhost_vdpa_dump_config(dev, b, line); } } diff --git a/util/hexdump.c b/util/hexdump.c index 7324e7b126..dbc536fe84 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -16,8 +16,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" =20 -void qemu_hexdump_line(char *line, const void *bufptr, - unsigned int len, bool ascii) +void qemu_hexdump_line(char *line, const void *bufptr, size_t len) { const char *buf =3D bufptr; int i, c; @@ -26,39 +25,48 @@ void qemu_hexdump_line(char *line, const void *bufptr, len =3D QEMU_HEXDUMP_LINE_BYTES; } =20 - for (i =3D 0; i < QEMU_HEXDUMP_LINE_BYTES; i++) { + for (i =3D 0; i < len; i++) { if (i !=3D 0 && (i % 4) =3D=3D 0) { *line++ =3D ' '; } - if (i < len) { - line +=3D sprintf(line, " %02x", (unsigned char)buf[i]); - } else { - line +=3D sprintf(line, " "); - } - } - if (ascii) { - *line++ =3D ' '; - for (i =3D 0; i < len; i++) { - c =3D buf[i]; - if (c < ' ' || c > '~') { - c =3D '.'; - } - *line++ =3D c; - } + line +=3D sprintf(line, " %02x", (unsigned char)buf[i]); } *line =3D '\0'; } =20 +static void asciidump_line(char *line, const void *bufptr, size_t len) +{ + const char *buf =3D bufptr; + + for (size_t i =3D 0; i < len; i++) { + char c =3D buf[i]; + + if (c < ' ' || c > '~') { + c =3D '.'; + } + *line++ =3D c; + } + *line =3D '\0'; +} + +#define QEMU_HEXDUMP_LINE_WIDTH \ + (QEMU_HEXDUMP_LINE_BYTES * 2 + QEMU_HEXDUMP_LINE_BYTES / 4) + void qemu_hexdump(FILE *fp, const char *prefix, const void *bufptr, size_t size) { - unsigned int b, len; char line[QEMU_HEXDUMP_LINE_LEN]; + char ascii[QEMU_HEXDUMP_LINE_BYTES + 1]; + size_t b, len; =20 - for (b =3D 0; b < size; b +=3D QEMU_HEXDUMP_LINE_BYTES) { - len =3D size - b; - qemu_hexdump_line(line, bufptr + b, len, true); - fprintf(fp, "%s: %04x: %s\n", prefix, b, line); + for (b =3D 0; b < size; b +=3D len) { + len =3D MIN(size - b, QEMU_HEXDUMP_LINE_BYTES); + + qemu_hexdump_line(line, bufptr + b, len); + asciidump_line(ascii, bufptr + b, len); + + fprintf(fp, "%s: %04x: %-*s %s\n", + prefix, b, QEMU_HEXDUMP_LINE_WIDTH, line, ascii); } =20 } --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907390; cv=none; d=zohomail.com; s=zohoarc; b=ekCJI1aHb91PHR0WwwYbbZ0kLL0jsRNROyWMSSPtZQyShrqqSJwkOaGN5NmA9E95X4LEjA8gp7Rq/frl8kNyW0kWach8m8uJAdsZFx22QaBQCcVqZS2gWPcyYbnd+JKx3RR21Zoy+L13UnjdIhKpHQoK2Hvm9B/ztkizmkrQm0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907390; 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=q7LRFqckZoWWz6WECvkgu9IuYe9DhqTySxBwiAwbY30=; b=hz1axsd7h2KQeNFklZD9aORB+OiWdh5IdU8jOKvEGIuuxsbFsG0Rab5/RLRjrmUGDSyIHekR/eCMfc32uvaHf5rP6PIGmkeOCUM7cfGQpWX/ofhr7cuYjjojaekX1675pSEAttOLsgy7L7HR0KBXeuMezTCrvIhARHKMjoetJzU= 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 1712907390333404.28573348130055; Fri, 12 Apr 2024 00:36:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQ2-0006yU-J3; Fri, 12 Apr 2024 03:33:54 -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 1rvBQ1-0006xY-Cm for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:53 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBPz-00074k-7X for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:53 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1e3f17c64daso5125995ad.3 for ; Fri, 12 Apr 2024 00:33:50 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907230; x=1713512030; 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=q7LRFqckZoWWz6WECvkgu9IuYe9DhqTySxBwiAwbY30=; b=Ji1OwLEqenHekJ5WeWHeaRXRfrT88eaNY5bBL/LziJFECT8hpPCiLFkgvFBSoXHBmm 17SVvvvIXayIIkBX2MFT9S1iG2iSAEJtQEqPfTTQQLjrQ1sQdQZ5iRLLi4aPxDtZy/jA ZGWrkNAvpbROhTTAh5ZFG6xMNVtDfNmTx1I5Y1eViE2maVZdBwJ09cD4V/e2Xsj1SbAU wUohtZNNsx7hwRofGKNKqdl/SU4aEp+ic1sXs+j82ocFy0c7niv0ueOwwrNkwXUH1Lxk YzRM/3uW7Jc/fzO45RNabTYgRVlIDy13RdosyaSBl9U5DewJt7+8BGBf/y6fE1Zs/Gdv 8sbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907230; x=1713512030; 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=q7LRFqckZoWWz6WECvkgu9IuYe9DhqTySxBwiAwbY30=; b=qO0WNMIMdJQQTcBR/BhBDk+rat/ur6368t1fMX6Yf/oZnnAW4fb1gSmIgtQUfFV1H3 Ni3n7IjdCWZnQu2S6Er590l3PJaZItBJbSVw6G8AnrQa2lsd2StzhIklbs9TBPwmsbJH y59sR8fBrLoHxl8o23MVvbd2FYEpgGlgw+aWVbjJubBjnkEpK9sjnXzKPFSmoYEzODZv vg4QKTOxAC0ScvzghwDA1HFOqXeZCZ/gYAyL/Qw1abpF6tWSowKl8xKN5eQfMFS8kElF 6pWm/atonTJzth+JsEs1aJfNaIGYnYvSrbbtDFtmbyalpcHqZzJeHZ0BWfGH4V1+kdLz IMJw== X-Gm-Message-State: AOJu0YznmLtaGYDDGPjcEUQ6T31rYVYHVPYLAqf5ElS+KBg1caLySPwx fJj6ZvxbVPHLEzIh+YYtVm+Xmq28IEOnUutlvJAzKA/2cIECi6FUnCPUiY2UWTqXc5D4/eqRQJW Q X-Google-Smtp-Source: AGHT+IEWUpBQvEH1BepR1QQxCKJq5Vr/moEzz9mRVCcewMn0jekh5nsUOoQ8SwukAXAgWDEw2aa5sg== X-Received: by 2002:a17:902:d2c2:b0:1e2:3d05:5f4c with SMTP id n2-20020a170902d2c200b001e23d055f4cmr1837714plc.39.1712907229941; Fri, 12 Apr 2024 00:33:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 03/27] util/hexdump: Use a GString for qemu_hexdump_line Date: Fri, 12 Apr 2024 00:33:22 -0700 Message-Id: <20240412073346.458116-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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: 1712907390983100006 Content-Type: text/plain; charset="utf-8" Allocate a new, or append to an existing GString instead of using a fixed sized buffer. Require the caller to determine the length of the line -- do not bound len here. Signed-off-by: Richard Henderson --- include/qemu/cutils.h | 15 ++++++++++----- hw/virtio/vhost-vdpa.c | 14 ++++++++------ util/hexdump.c | 29 +++++++++++++++++------------ 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index d0c5386e6c..7311fb36ca 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -252,12 +252,17 @@ static inline const char *yes_no(bool b) */ int parse_debug_env(const char *name, int max, int initial); =20 -/* - * Hexdump a line of a byte buffer into a hexadecimal/ASCII buffer +/** + * qemu_hexdump_line: + * @str: GString into which to append + * @buf: buffer to dump + * @len: number of bytes to dump + * + * Append @len bytes of @buf as hexadecimal into @str. + * If @str is NULL, allocate a new string and return it; + * otherwise return @str. */ -#define QEMU_HEXDUMP_LINE_BYTES 16 /* Number of bytes to dump */ -#define QEMU_HEXDUMP_LINE_LEN 75 /* Number of characters in line */ -void qemu_hexdump_line(char *line, const void *bufptr, size_t len); +GString *qemu_hexdump_line(GString *str, const void *buf, size_t len); =20 /* * Hexdump a buffer to a file. An optional string prefix is added to every= line diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 32bad5ce68..ab047d8ee0 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -941,13 +941,15 @@ static int vhost_vdpa_set_config_call(struct vhost_de= v *dev, static void vhost_vdpa_dump_config(struct vhost_dev *dev, const uint8_t *c= onfig, uint32_t config_len) { - int b, len; - char line[QEMU_HEXDUMP_LINE_LEN]; + g_autoptr(GString) str =3D g_string_sized_new(4 * 16); + size_t b, len; =20 - for (b =3D 0; b < config_len; b +=3D 16) { - len =3D config_len - b; - qemu_hexdump_line(line, config + b, len); - trace_vhost_vdpa_dump_config(dev, b, line); + for (b =3D 0; b < config_len; b +=3D len) { + len =3D MIN(config_len - b, 16); + + g_string_truncate(str, 0); + qemu_hexdump_line(str, config + b, len); + trace_vhost_vdpa_dump_config(dev, b, str->str); } } =20 diff --git a/util/hexdump.c b/util/hexdump.c index dbc536fe84..521e346bc6 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -16,22 +16,25 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" =20 -void qemu_hexdump_line(char *line, const void *bufptr, size_t len) +GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len) { - const char *buf =3D bufptr; - int i, c; + const uint8_t *buf =3D vbuf; + size_t i; =20 - if (len > QEMU_HEXDUMP_LINE_BYTES) { - len =3D QEMU_HEXDUMP_LINE_BYTES; + if (str =3D=3D NULL) { + /* Estimate the length of the output to avoid reallocs. */ + i =3D len * 3 + len / 4; + str =3D g_string_sized_new(i + 1); } =20 for (i =3D 0; i < len; i++) { if (i !=3D 0 && (i % 4) =3D=3D 0) { - *line++ =3D ' '; + g_string_append_c(str, ' '); } - line +=3D sprintf(line, " %02x", (unsigned char)buf[i]); + g_string_append_printf(str, " %02x", buf[i]); } - *line =3D '\0'; + + return str; } =20 static void asciidump_line(char *line, const void *bufptr, size_t len) @@ -49,24 +52,26 @@ static void asciidump_line(char *line, const void *bufp= tr, size_t len) *line =3D '\0'; } =20 +#define QEMU_HEXDUMP_LINE_BYTES 16 #define QEMU_HEXDUMP_LINE_WIDTH \ (QEMU_HEXDUMP_LINE_BYTES * 2 + QEMU_HEXDUMP_LINE_BYTES / 4) =20 void qemu_hexdump(FILE *fp, const char *prefix, const void *bufptr, size_t size) { - char line[QEMU_HEXDUMP_LINE_LEN]; + g_autoptr(GString) str =3D g_string_sized_new(QEMU_HEXDUMP_LINE_WIDTH = + 1); char ascii[QEMU_HEXDUMP_LINE_BYTES + 1]; size_t b, len; =20 for (b =3D 0; b < size; b +=3D len) { len =3D MIN(size - b, QEMU_HEXDUMP_LINE_BYTES); =20 - qemu_hexdump_line(line, bufptr + b, len); + g_string_truncate(str, 0); + qemu_hexdump_line(str, bufptr + b, len); asciidump_line(ascii, bufptr + b, len); =20 - fprintf(fp, "%s: %04x: %-*s %s\n", - prefix, b, QEMU_HEXDUMP_LINE_WIDTH, line, ascii); + fprintf(fp, "%s: %04zx: %-*s %s\n", + prefix, b, QEMU_HEXDUMP_LINE_WIDTH, str->str, ascii); } =20 } --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907460; cv=none; d=zohomail.com; s=zohoarc; b=bEje++52RUedw5dgujDGIRzIsBZOT18GCG5nggP15w+YN6yL0/eWbgCjHOMNdI8YFYlYNmrVUF3S8UEYWMGPLhAPCiD7vr9rJhS3dXgJ2QUITDyExY/cHJY+y/Fd1MLgq+XqLtCpIX1DnkDfaDQyDSKYAYCfJ4oLr+z36GejPCY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907460; 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=QYzl2xtlupH583p6wNi2Q7esWD8H9kcrEe3HL6WSapw=; b=HP63C063mUGW4tQcwjMHQGhwUN6nzEch83VKFsEtVBWc2KmO6/fCr0CoeO/On90bNzd20847pMy4c53yDeChPOJG7GWLqQCi7K6PiTmXscSgAatLutxls0X1fBnvQRLEtSG0HnpdvRsTiFVYK+ma8UdjYEcWr3qgZqamtsYoCKA= 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 17129074609301010.1127776298244; Fri, 12 Apr 2024 00:37:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQ4-0006zO-Ql; Fri, 12 Apr 2024 03:33:56 -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 1rvBQ1-0006y7-Th for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:53 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ0-00075H-3C for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:53 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1e50a04c317so3846935ad.1 for ; Fri, 12 Apr 2024 00:33:51 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907231; x=1713512031; 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=QYzl2xtlupH583p6wNi2Q7esWD8H9kcrEe3HL6WSapw=; b=uDszS8zSHNzzM33hEt1IjGa3vNQ74URtC5Fx7HvDS3j7WfRTwarpkwGfYRULr/lr1Z vPumyb9ifl6X3LubvPWkmn5CEIf1UCo2lxl5BBwCQYA8QrF9hokpASM/w18rQnLLJlr7 eXRMfSNrUOfv7bLwKHCLJtN3FPJpVW8HFci2HSQK47qmwOnk9hyDhpBQMzuDLEi/eHrD Ba6PFXjX6uhpWrypOldioR8o8zdMENhWxRg2ou0kdmaK+rNJ/uaXosL0Fqn+xbPOw771 k9mtUCJG4T6UDnLaWMZNOOzLJ2zauLf0nljC56GmVkTpZjn1KXnogqHakVdFw+88/8B2 sKMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907231; x=1713512031; 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=QYzl2xtlupH583p6wNi2Q7esWD8H9kcrEe3HL6WSapw=; b=CgBeT4JyOe/M9AW+nNUlIhftAi62lxWhHaeT9W1NBiH28amsKzn5js7NpsH/ksKtZR F1sdTSgg6iHLS3Vsmo6zOsSVFCMigPpMwKlZdpzKjWK5XQPCK4nNYwM6q2x8nBR2YAuH 2tSvECOokg5p3QnBDh6F40AVu0dOx3pXnySbeQNnRha8tMA8ClGjeRSoIEwuqALNcqRX J+aioka5j9npL+290kOXYaI6rvyj6lmkggIoHl+neh0OqLmiMojGDZeqzhDrmZfnlBuH M+KoIowBANaB7L9sgbVx8HOSD8N+wwBlZ4p8PlgvkpF1h8+2yBLk+YdxXyACezb4llRM QM6w== X-Gm-Message-State: AOJu0YwtnlDb6YHrgrLIhL49GXIbE5tRvzkIerwzVv7bPm9UrQFDIQ0Z xLDdbCqsfUSE6sxP+Ob6mvwMDYqk/vC5DgTfgVUyz/GHcMi0sasxOvTZHt1Cu3W+B8TK4CjfzgU t X-Google-Smtp-Source: AGHT+IHZ/T0F5KwnB+Vg6m5eCq4OasCIEVgMQ4BZx9dyNu+CABfRw/gsMS8yUbCIrOqzPoYmYcOtaw== X-Received: by 2002:a17:902:f602:b0:1e0:b2d5:5f46 with SMTP id n2-20020a170902f60200b001e0b2d55f46mr2241118plg.46.1712907230749; Fri, 12 Apr 2024 00:33:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 04/27] util/hexdump: Add unit_len and block_len to qemu_hexdump_line Date: Fri, 12 Apr 2024 00:33:23 -0700 Message-Id: <20240412073346.458116-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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: 1712907461188100002 Content-Type: text/plain; charset="utf-8" Generalize the current 1 byte unit and 4 byte blocking within the output. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/cutils.h | 6 +++++- hw/virtio/vhost-vdpa.c | 2 +- util/hexdump.c | 30 +++++++++++++++++++++--------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 7311fb36ca..e28adedab9 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -257,12 +257,16 @@ int parse_debug_env(const char *name, int max, int in= itial); * @str: GString into which to append * @buf: buffer to dump * @len: number of bytes to dump + * @unit_len: add a space between every @unit_len bytes + * @block_len: add an extra space between every @block_len bytes * * Append @len bytes of @buf as hexadecimal into @str. + * Add spaces between every @unit_len and @block_len bytes. * If @str is NULL, allocate a new string and return it; * otherwise return @str. */ -GString *qemu_hexdump_line(GString *str, const void *buf, size_t len); +GString *qemu_hexdump_line(GString *str, const void *buf, size_t len, + size_t unit_len, size_t block_len); =20 /* * Hexdump a buffer to a file. An optional string prefix is added to every= line diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index ab047d8ee0..911742e291 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -948,7 +948,7 @@ static void vhost_vdpa_dump_config(struct vhost_dev *de= v, const uint8_t *config, len =3D MIN(config_len - b, 16); =20 g_string_truncate(str, 0); - qemu_hexdump_line(str, config + b, len); + qemu_hexdump_line(str, config + b, len, 1, 4); trace_vhost_vdpa_dump_config(dev, b, str->str); } } diff --git a/util/hexdump.c b/util/hexdump.c index 521e346bc6..b29326b7f2 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -1,5 +1,5 @@ /* - * Helper to hexdump a buffer +* Helper to hexdump a buffer * * Copyright (c) 2013 Red Hat, Inc. * Copyright (c) 2013 Gerd Hoffmann @@ -16,22 +16,34 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" =20 -GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len) +GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len, + size_t unit_len, size_t block_len) { const uint8_t *buf =3D vbuf; - size_t i; + size_t u, b; =20 if (str =3D=3D NULL) { /* Estimate the length of the output to avoid reallocs. */ - i =3D len * 3 + len / 4; - str =3D g_string_sized_new(i + 1); + size_t est =3D len * 2; + if (unit_len) { + est +=3D len / unit_len; + } + if (block_len) { + est +=3D len / block_len; + } + str =3D g_string_sized_new(est + 1); } =20 - for (i =3D 0; i < len; i++) { - if (i !=3D 0 && (i % 4) =3D=3D 0) { + for (u =3D 0, b =3D 0; len; u++, b++, len--, buf++) { + if (unit_len && u =3D=3D unit_len) { g_string_append_c(str, ' '); + u =3D 0; } - g_string_append_printf(str, " %02x", buf[i]); + if (block_len && b =3D=3D block_len) { + g_string_append_c(str, ' '); + b =3D 0; + } + g_string_append_printf(str, "%02x", *buf); } =20 return str; @@ -67,7 +79,7 @@ void qemu_hexdump(FILE *fp, const char *prefix, len =3D MIN(size - b, QEMU_HEXDUMP_LINE_BYTES); =20 g_string_truncate(str, 0); - qemu_hexdump_line(str, bufptr + b, len); + qemu_hexdump_line(str, bufptr + b, len, 1, 4); asciidump_line(ascii, bufptr + b, len); =20 fprintf(fp, "%s: %04zx: %-*s %s\n", --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907464; cv=none; d=zohomail.com; s=zohoarc; b=h49ibUNn776BvGPBJs2jAjgzbnTIpuVdPmuMVeYOa9yh1TGd0OzvcRbd0gRKlaUcykrqL9efrIUFf1EW5vSiEoyr8uvswsUcEKcy1jI6sEuO9iouDbOPG6LeQ7392vPczSZmuPOfh2vx/UfFYUA9LJHjnf9OjFHtOxrqRs7yL1A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907464; 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=rvakkgiyK54UTlLULBlH8+XzGitioxqA6YEQltyd0/U=; b=ZMMKnmQjn0YL/9ktK0NUkGOmJtM8HKYljuyCiPKGdi7Vt/mHrMsetn+3/iRRusmHWqiqxHoh+HzC3dsQrcmhB0yDIF11ZxJ1FucEl1Kkz9+/6cgVb+WoePq6KnGAaRvIxDBmh3HqbJ0M6MGym9TvwV4/vEkF1Zcc6XvUfQ1wP+k= 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 17129074648441010.58685532014; Fri, 12 Apr 2024 00:37:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQI-00074M-ST; Fri, 12 Apr 2024 03:34:10 -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 1rvBQF-00073M-M2 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:07 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ0-00075y-Vg for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:06 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1e455b630acso3259055ad.1 for ; Fri, 12 Apr 2024 00:33:52 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907231; x=1713512031; 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=rvakkgiyK54UTlLULBlH8+XzGitioxqA6YEQltyd0/U=; b=hKhneatP3JxefFbpSjx+2RsvWTzNmgAROrGwt10PAYaGUGnMYQqWju2IjtD9lhLw3G 3cDQz/YzF6IzIA8A0R9etF06dNM9pgKspsuTBfWNaaM1KydQN9NlpqtmDzDb0CZ8mqAn U76MfmrFD+Ap72LpiwR+B/cbzmO2PHW8IokQ/IgPZvCf1RaaaOzYoRlb2dOXKA1iizyu BBlcChnOFfg8nB5yBMSmJnXyHZxWhyHW1w1OoxXxmjbqWc9hxNzgqN9Y1b25WvUUmCyB 7lLm9SKdutRX8ZmHrw7FiSmo019YHbAnbauSkIiUsOiL7LZbYZjDVBAn4bZWx0UmrxoI jXIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907231; x=1713512031; 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=rvakkgiyK54UTlLULBlH8+XzGitioxqA6YEQltyd0/U=; b=of0EQwyglxxM+qxmUejj1hXznes6C+R7D+0lJZ2GtRN0dNZAonisC5zuLwphzyO4zN vXSwah4VW2k4+BVQojV1Ffrvyi9Lg6XhqHbjPims897OK3AAcF8qNWMOeP4R8gnOJjfX w5wbEsoqub2sVxPZO4y4ELtan6lLydB2Ggv6RvuO4Zw6dDA8zb38qMAew8e5aK5hnUBS A1U+2xuJ+1MUMX2OyRClLscLX3SOIb3RK4bZDqTD6q94bqcqeBxXvF0S3Ub+RaQ4BuNj a4AaZD/+uQ4zzpjCBO2ISX6XodlPuFKfEfMhUOjV5UFYKcytVmy8YXmxNcDFvavUrxct Wbew== X-Gm-Message-State: AOJu0YyZodsSI2NWI/H6qC/YsFp+0KH0WpxAHPykF5m9WwMDOFEMzVz4 7HcinVxXdV8+eSi8zLMmZJbPrIJblIGBtP1QPJRUO4F1wBw6CTiJt5owH9s6FEj805sYoW9oY5s i X-Google-Smtp-Source: AGHT+IGb66LroTK49OZTU7Mt0yOPDcjzDGRZNIr4HEmn0XXOQl9Lzcvpin+8kCao63rM1+deY7WWxw== X-Received: by 2002:a17:902:6f16:b0:1e5:3c5:55a5 with SMTP id w22-20020a1709026f1600b001e503c555a5mr1557546plk.8.1712907231562; Fri, 12 Apr 2024 00:33:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 05/27] util/hexdump: Inline g_string_append_printf "%02x" Date: Fri, 12 Apr 2024 00:33:24 -0700 Message-Id: <20240412073346.458116-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.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, 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: 1712907465208100001 Content-Type: text/plain; charset="utf-8" Trivial arithmetic can be used for emitting the nibbles, rather than full-blown printf formatting. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- util/hexdump.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/util/hexdump.c b/util/hexdump.c index b29326b7f2..ae0d4992dc 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -16,6 +16,11 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" =20 +static inline char hexdump_nibble(unsigned x) +{ + return (x < 10 ? '0' : 'a' - 10) + x; +} + GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len, size_t unit_len, size_t block_len) { @@ -35,6 +40,8 @@ GString *qemu_hexdump_line(GString *str, const void *vbuf= , size_t len, } =20 for (u =3D 0, b =3D 0; len; u++, b++, len--, buf++) { + uint8_t c; + if (unit_len && u =3D=3D unit_len) { g_string_append_c(str, ' '); u =3D 0; @@ -43,7 +50,10 @@ GString *qemu_hexdump_line(GString *str, const void *vbu= f, size_t len, g_string_append_c(str, ' '); b =3D 0; } - g_string_append_printf(str, "%02x", *buf); + + c =3D *buf; + g_string_append_c(str, hexdump_nibble(c / 16)); + g_string_append_c(str, hexdump_nibble(c % 16)); } =20 return str; --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907434; cv=none; d=zohomail.com; s=zohoarc; b=kMaKPZxnyGy49h39UngliA6jzFsjvptLFEWWBr0qulAMVL2RIGYuoBFZ/ovqKrSbTork88RtMjDzxAtQ45iPS3PLZdgtbuyTylfrr6bMhEKEkPRfeNTDVjeAGLE0mCmOVhRZrDodFf6tn1lPBZDM+6cDVES8rEcTKznhKgrOGRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907434; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=qyr/Ts8Rn5hOhvh/4SLos/fwt7+2NBBMVS+YXiC8DT0=; b=c01tVW9AenELjLLmK9wE6ikXS2ePqgxTwn3vt5YJJ4F4CWiB4/5OzGFf4TnVmWaf1qEY2dblH/AdTCuRw4e5/9cpb7Cnqj0sOkhMf93LjAUvCbwRbOKDNlty1NA8wTdJH7GjBD06wrYEfwrXaUoa+jzFz9TfEMLzAuDbrrsOD+4= 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 1712907434678446.32021494283015; Fri, 12 Apr 2024 00:37:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQ5-0006zl-EX; Fri, 12 Apr 2024 03:33:57 -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 1rvBQ3-0006yh-Po for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:55 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ2-00076m-7N for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:55 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1e3e84a302eso4959245ad.0 for ; Fri, 12 Apr 2024 00:33:53 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907232; x=1713512032; darn=nongnu.org; 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=qyr/Ts8Rn5hOhvh/4SLos/fwt7+2NBBMVS+YXiC8DT0=; b=VvfbjnnzFXryrybZSXsWtuc97xkdxA3A9l6/f/WNc9652gAHjBunrhAOqgtv5gtm8w c7rZOo35DswuFVNIT03tigsEbiwuQCTSxkHWZae5Sj422mqiP1MK2xoSGDfqvNzJhW3q bGWB6pfF/HTilifFCuYHARFF2k3jVkSnILPaxDJlcJStTJICA0ZhGXkP0I9ngH+K9Fd9 Mdqcrmjsy6rok338UG7tWxkC0uR5fNZf7Bry0ynMZwToqSdhjESrUerDcVrjYR5DmIUd 7jS13ZVurCJ+BAzAJdRb2KuM51fRGjJYz1i/FPetX9Bga/3rKtnM+Zw9A8E7DE1Utiml H4tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907232; x=1713512032; 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=qyr/Ts8Rn5hOhvh/4SLos/fwt7+2NBBMVS+YXiC8DT0=; b=TycboKdIINWdTPflxM/BBDqnn0ESC9REnPLHjWtsVlClWnhCXwuOhp8568EXofSAND sDe63JuL/rgqIkMQIl7+FC3b22fMx10iBvXgHfDz2jJHG/FouzcMAGcUUk7KXQK0MHao m0iKDVwmY+/auX3nzED1NEMjWWu6e2BMES3lQDZ+Y+d1gw386AQ2BIIyXwcBwKDyYa+A SCLQW/5QFDNeNMTI3VtgwJAx9Ym/My7ZO0O1UgOv9FiyFsAdcQ3fkp9gW/yh1By1PQ8I IAr1cv5Vj2dzvsZI7t3HJkURjpxXdh8yn9d/KqjoDHFTGaL+4JRDzoVViYcNiFuvzv06 yCGA== X-Gm-Message-State: AOJu0YzlupyETpjFLb1/UEdkN5xxN5C0DNEz2dLkEO6Kmrxq8NceXB6d oTZan4Z9HnnqdJvwN3QBmr/W3O51ujhawoe1b5TQYSgzbS3wn8dmOmZmpMw6O0+Bi5aPRG2/OWC G X-Google-Smtp-Source: AGHT+IFywLt/S5guoQIEXM/568KzcCsZ2G+2Zsqnsoe2NUlN1r56usylDUOLQpM6d6ql/pJvx6G0nQ== X-Received: by 2002:a17:902:c40b:b0:1e1:4806:79cb with SMTP id k11-20020a170902c40b00b001e1480679cbmr1948271plk.56.1712907232517; Fri, 12 Apr 2024 00:33:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 06/27] hw/mips/malta: Add re-usable rng_seed_hex_new() method Date: Fri, 12 Apr 2024 00:33:25 -0700 Message-Id: <20240412073346.458116-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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: 1712907435213100007 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Extract common code from reinitialize_rng_seed and load_kernel to rng_seed_hex_new. Using qemu_hexdump_line both fixes the deprecation warning and simplifies the code base. Signed-off-by: Philippe Mathieu-Daud=C3=A9 [rth: Use qemu_hexdump_line.] Signed-off-by: Richard Henderson --- hw/mips/malta.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index af74008c82..664a2ae0a9 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -26,6 +26,7 @@ #include "qemu/units.h" #include "qemu/bitops.h" #include "qemu/datadir.h" +#include "qemu/cutils.h" #include "qemu/guest-random.h" #include "hw/clock.h" #include "hw/southbridge/piix.h" @@ -850,15 +851,18 @@ static void G_GNUC_PRINTF(3, 4) prom_set(uint32_t *pr= om_buf, int index, va_end(ap); } =20 -static void reinitialize_rng_seed(void *opaque) +static GString *rng_seed_hex_new(void) { - char *rng_seed_hex =3D opaque; uint8_t rng_seed[32]; =20 qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed)); - for (size_t i =3D 0; i < sizeof(rng_seed); ++i) { - sprintf(rng_seed_hex + i * 2, "%02x", rng_seed[i]); - } + return qemu_hexdump_line(NULL, rng_seed, sizeof(rng_seed), 0, 0); +} + +static void reinitialize_rng_seed(void *opaque) +{ + g_autoptr(GString) hex =3D rng_seed_hex_new(); + memcpy(opaque, hex->str, hex->len); } =20 /* Kernel */ @@ -870,8 +874,6 @@ static uint64_t load_kernel(void) uint32_t *prom_buf; long prom_size; int prom_index =3D 0; - uint8_t rng_seed[32]; - char rng_seed_hex[sizeof(rng_seed) * 2 + 1]; size_t rng_seed_prom_offset; =20 kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, @@ -946,14 +948,13 @@ static uint64_t load_kernel(void) prom_set(prom_buf, prom_index++, "modetty0"); prom_set(prom_buf, prom_index++, "38400n8r"); =20 - qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed)); - for (size_t i =3D 0; i < sizeof(rng_seed); ++i) { - sprintf(rng_seed_hex + i * 2, "%02x", rng_seed[i]); - } prom_set(prom_buf, prom_index++, "rngseed"); rng_seed_prom_offset =3D prom_index * ENVP_ENTRY_SIZE + sizeof(uint32_t) * ENVP_NB_ENTRIES; - prom_set(prom_buf, prom_index++, "%s", rng_seed_hex); + { + g_autoptr(GString) hex =3D rng_seed_hex_new(); + prom_set(prom_buf, prom_index++, "%s", hex->str); + } =20 prom_set(prom_buf, prom_index++, NULL); =20 --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907364; cv=none; d=zohomail.com; s=zohoarc; b=AcmzPnS9BjftvlZAy78FbPLYpqYjgtpTi4tw6nL/DVyV01r2eCZNb2ptwMXZrweWtEro9//ZMj3+AoqRieYSswSggC7/1CCuIf/qlTYls4XdLPqtlknaQiBAUSdBnAgFiTstNBLLV/f8QAXU0zZ4lAk89g15zgcT8FdyVWCYilI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907364; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=fnSXZctlzd8Wm3DUoANmQRZQ2vSrRZB+EmzfSv7sIGQ=; b=ZSE9JsQClsGf+kBIzw71FGwXUtwF74pcYIROV59GlX9Ga5XkOH7fJYgfAz0I5fCZCnAEQmqX8a+tqMSUpVYB0BsIoFPt6TaixPTWccj+s6QXo4VIqWFadxI4kvmGBtIf+0l3PRjP27MVeduea2v5j8IFJEpexWp4nvyc4FSN9p0= 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 1712907364615360.7445828258391; Fri, 12 Apr 2024 00:36:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQ6-000703-EV; Fri, 12 Apr 2024 03:33:58 -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 1rvBQ4-0006zD-Cz for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:56 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ2-00076y-QP for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:56 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1e50a04c317so3847065ad.1 for ; Fri, 12 Apr 2024 00:33:54 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907233; x=1713512033; darn=nongnu.org; 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=fnSXZctlzd8Wm3DUoANmQRZQ2vSrRZB+EmzfSv7sIGQ=; b=jfS7hNKjWkfRCMcM1YDj6JhZgolCUtddi8g4hfJjyh3vwZpAhb6pqMfliCbFChFCz7 QJyeRsvFgutfHRhb8dJ8XuVFJw96SL/NMyBwSTTHD4yEzYmo9vCA1eWzuOzbXzIH5yxQ bnbYuJLzhEkkdfFUD8Flwh5T18sNGdMw7cnhXf/qDNEujPF65ks18vMwp4vh4oAlh/YS GfroGsNUqAaezoAYjClvZUN1RRSoGoFGF3aYJTBzHbN55ojbyWNA3QZBzg8AB3S3ndvd OQuzBDcub1Ln0gFvS1uuVDoJEl+bSWKon/cl3ZB93TI2pP8P6+zav6rSNZyoBIJjbRtL Ggfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907233; x=1713512033; 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=fnSXZctlzd8Wm3DUoANmQRZQ2vSrRZB+EmzfSv7sIGQ=; b=I5DntoSogwyRd0sYc2E89v/P8D7pfMORlHHlJ4EKTcI73dFP+QgUR/LGmLO2BDWkbL fOU4jQEQ3nEctjrbr9T/YdEjjzDFLP/tmQdk48d50N/NE/xX6eQJPpBHQOH4lk14AbNW WpPDol4qPN5rLiLcKxHd17uY7ptJUqIVGAajFZ5ieRSO6WXyUzqlT2X3lsqg442ukl0o 2nGbv1Pki0EsbKjGX7N47p5Y8nlENviH60VWnEjPtHznWg2JG2SU2sJq+A0MY+8myRvC Vqhqbc5CbHZQoLBSRPMhjMJCuzZK67pVKO4d0BzVDQ4kmsAziBNyITUnaPWFI6TQND2L waIA== X-Gm-Message-State: AOJu0YxtGDSLRISbZ9YwPzOQXdb3ylipxQfV3DkLJHHW+iEqswBes7Rs RwiK4oyFNaUTcCOcTbEARQqdSc9a4CTUWbt7HGaRqeFfVJFOQLbml3Wz2o4EkmvBgWaffOpNL5S i X-Google-Smtp-Source: AGHT+IGt1RoBHzBXLy3l2+OuGMj/MegPm8dlfRvCyChDb358gcnNq+Q9QCQ15LguqFdJjxv83ugXKA== X-Received: by 2002:a17:902:ea10:b0:1dd:135e:2604 with SMTP id s16-20020a170902ea1000b001dd135e2604mr1977494plg.40.1712907233310; Fri, 12 Apr 2024 00:33:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 07/27] system/qtest: Replace sprintf by qemu_hexdump_line Date: Fri, 12 Apr 2024 00:33:26 -0700 Message-Id: <20240412073346.458116-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: 1712907364930100015 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Using qemu_hexdump_line both fixes the deprecation warning and simplifies the code base. Signed-off-by: Philippe Mathieu-Daud=C3=A9 ` [rth: Use qemu_hexdump_line] Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- system/qtest.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/system/qtest.c b/system/qtest.c index 6da58b3874..507a358f3b 100644 --- a/system/qtest.c +++ b/system/qtest.c @@ -601,9 +601,9 @@ static void qtest_process_command(CharBackend *chr, gch= ar **words) qtest_send_prefix(chr); qtest_sendf(chr, "OK 0x%016" PRIx64 "\n", value); } else if (strcmp(words[0], "read") =3D=3D 0) { - uint64_t addr, len, i; + g_autoptr(GString) enc =3D NULL; + uint64_t addr, len; uint8_t *data; - char *enc; int ret; =20 g_assert(words[1] && words[2]); @@ -618,16 +618,12 @@ static void qtest_process_command(CharBackend *chr, g= char **words) address_space_read(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, da= ta, len); =20 - enc =3D g_malloc(2 * len + 1); - for (i =3D 0; i < len; i++) { - sprintf(&enc[i * 2], "%02x", data[i]); - } + enc =3D qemu_hexdump_line(NULL, data, len, 0, 0); =20 qtest_send_prefix(chr); - qtest_sendf(chr, "OK 0x%s\n", enc); + qtest_sendf(chr, "OK 0x%s\n", enc->str); =20 g_free(data); - g_free(enc); } else if (strcmp(words[0], "b64read") =3D=3D 0) { uint64_t addr, len; uint8_t *data; --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907282; cv=none; d=zohomail.com; s=zohoarc; b=FZ97DGDn5bNaZjm3y8Cx2loppRlzoF1D55OT37zLRYrYXmfUJZMD3AzyF+hoWF+MuaEFSRRnQHNVYtVxjaWe9gDZaQ/ro+AWWBbli4fQv/sDYNDJZuYAiS3Mko+qfTrKnoMJiA/82bWKUxTh4L/DHWfYrBwKzmZn+v5KS+E/wGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907282; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=7ZOZ2GpOHx19JGGX2PLqgY++2k2pqd50fzr6oa/q3CU=; b=lmTVFwwsZhbY4AA2a4z+CVOGGSzYpYD5G7hifKT4nAwSjm4C9g0sRMuHQXiP14bW5UoSVx4okT9SWzyM8fhMB05Rxwtiaz7ZTIQGkHOynm8eF4nEH+aMF45xSZwQShk+aOzDLSrkhJLkMj2rWTHJ1DApjV7D+MO+EkIKxBEDRko= 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 1712907282853704.9845824320215; Fri, 12 Apr 2024 00:34:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQF-00072G-1z; Fri, 12 Apr 2024 03:34:07 -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 1rvBQ5-0006zQ-0U for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:57 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ3-00077c-Cd for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:56 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6ecee5c08e6so678885b3a.3 for ; Fri, 12 Apr 2024 00:33:54 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907234; x=1713512034; darn=nongnu.org; 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=7ZOZ2GpOHx19JGGX2PLqgY++2k2pqd50fzr6oa/q3CU=; b=znqmiNVrFi4ywHzeFmQIarTlblzjn7NzQwUZMZEJ0VvKzavwAn+dgfvC4I9BFNi6UC 2JmL0I9UnASgsccFyL7cz1P9vql2I7BCS6gf6ncE/pB3Znpj+wFTVq4ep+ULhaHgHT+O GqJdo65emWbjeyQPCWoXXr/iw3PAazHOigIF3l4p3+dzhVV7Tn8e7ZxH7GheUmFb0pnV CHmD4r0b8UjiVZR25enm8Yr583pmlr7vyVSz/wnjKU+vetSgKv2VIeRLvRz+ynnegESe dJ3SQ1a9K+z1kMP4OiqfH0XX/WTW8RFpIB5ZCyjsxhiwJWNEJ3iHxNOeYsLFjN3Q74sj h4OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907234; x=1713512034; 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=7ZOZ2GpOHx19JGGX2PLqgY++2k2pqd50fzr6oa/q3CU=; b=c40jbfhoYCBASNCeSULZ94yl8ow40MMf+zS37ag82hMsxhrCGgZTqSKBU5vQTBIuEj wC2oQZz3DkyDFPLP/Ho2ZE4MYT/18/Sb7Bd+T0tR3Akfz1roWg69o88AQ+9CfIABy0D2 /e19Wi9fGLtsURNeAcqJUqGDsSbh91VwkkQUawdbFxT3MnIfYER4qHE262MWXBnzHjS8 97bE5DHKcSkpQDSRTnPu1YmBKoqkeE8+MiFd0gsmfsQwVTMNny/WjVD/rKaJAApdeGNx tR3soCWEeOydZlOoezNkbZMkaHfK6pjVO3Y/ymU3vjoB81avKjSgIMFFJhex8KC+9Qj2 WudA== X-Gm-Message-State: AOJu0YygnwAEKIU914vJkxJ69SbeEymbK7sddwTf215ialpX+yVVHF5d 3MHyEz19tG6Z7BMH3T3pTWUimjBSpg3jUg3ZqztRETimRWKggFYZZEjUmOwT6+D8bWb9cAnx6TR Y X-Google-Smtp-Source: AGHT+IF4hK5KeYcySNx2BTTIdwfYvcWhcY1vOBmicawSMj+BPgoo3a5mSDkZvImdkg/v/GtOUBJUjw== X-Received: by 2002:a05:6a20:2591:b0:1a9:5136:13ba with SMTP id k17-20020a056a20259100b001a9513613bamr2713325pzd.14.1712907234026; Fri, 12 Apr 2024 00:33:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 08/27] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf Date: Fri, 12 Apr 2024 00:33:27 -0700 Message-Id: <20240412073346.458116-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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: 1712907284709100005 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Using qemu_hexdump_line both fixes the deprecation warning and simplifies the code base. Note that this drops the "0x" prefix to every byte, which should be of no consequence to tracing. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/scsi-disk.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 4bd7af9d0c..f386a2f01c 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2648,19 +2648,12 @@ static const SCSIReqOps *const scsi_disk_reqops_dis= patch[256] =3D { =20 static void scsi_disk_new_request_dump(uint32_t lun, uint32_t tag, uint8_t= *buf) { - int i; int len =3D scsi_cdb_length(buf); - char *line_buffer, *p; + g_autoptr(GString) str =3D NULL; =20 assert(len > 0 && len <=3D 16); - line_buffer =3D g_malloc(len * 5 + 1); - - for (i =3D 0, p =3D line_buffer; i < len; i++) { - p +=3D sprintf(p, " 0x%02x", buf[i]); - } - trace_scsi_disk_new_request(lun, tag, line_buffer); - - g_free(line_buffer); + str =3D qemu_hexdump_line(NULL, buf, len, 1, 0); + trace_scsi_disk_new_request(lun, tag, str->str); } =20 static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t= lun, --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907298; cv=none; d=zohomail.com; s=zohoarc; b=DlMMdOBOFUcvAE0GG0+BndaD1JM1Q45RFjJ9/j26ovMKCQWCM6CNeGTZGoDaYgOGRtabnsvvh8Q87AkgNCEKrN0PHPllhnKQwY28GCE9TcoKmnizycwRfT4Yb8Aed62YRVc+ExD/Pb+DI8Q38Wj6L4lEiX5tHO3YlWbi5HkwKOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907298; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=vWTBmrF16GSaydEzWRv0Zn9YqSFsjsSSjgb9YwJ02w4=; b=nwYkiW5R2IeXPUvICdbWgs9S3GWS8qSrunC1hYufzCraoe6HEX8Eq0sDgJPHxoCzUPftwyVMTqN9+LNkpQkiXrl2AJPojhNOEpAAiPe5OIOwooiE3pLLhCz/8WRJ3LS6XD6iD5HD4tk8aNM3YmHFIZYWWv1bYBTiTeCY1bwiFAE= 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 1712907298881813.7795917042619; Fri, 12 Apr 2024 00:34:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQ6-00070R-Tb; Fri, 12 Apr 2024 03:33:58 -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 1rvBQ5-0006zo-T7 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:57 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ4-000786-CQ for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:57 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1e51398cc4eso6364615ad.2 for ; Fri, 12 Apr 2024 00:33:55 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907235; x=1713512035; darn=nongnu.org; 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=vWTBmrF16GSaydEzWRv0Zn9YqSFsjsSSjgb9YwJ02w4=; b=Zuz3gB39RFRPXjjhlMe00Gye62SaGQL9MZHWpfKIzppFAiGXWsnI1oqea+lJUC9vDI KdrbE3r12I3nIQhES049JHCTs8xbWHpLoxRGVEGxjfjdVzc1IZ42X/sejepJ/stMfScG Qi+MVCORtIQBXUYbF8yp0bBupNMnD6u8kewKSuunjmKJ6WqMERrTLgWWXI8YoAMD3IlM Yxu+uwMuM4aJT+C6J3XRvg2s0XHrnEVwwnmz126O4ImNpFeAcO8d1tHslTfAFUF//BHy E46FEh3pD7zFQtJEb79g3KWZnhp8y2jIA+3roQbWGuvngF6OKsF44aQ5nNMnErLWfYsT YtAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907235; x=1713512035; 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=vWTBmrF16GSaydEzWRv0Zn9YqSFsjsSSjgb9YwJ02w4=; b=Uo3UIrwI38THwhwHMCA+WWH79pcoXnzZZC7Bb9JQ8TbC+4qXqcTlQ+j4ytrxLE+Olm fxVclEvBBQbpL9/OtTNtPdZGANLZOEURZKXr2o0e+ayUzetbUpmFc3Sqia6yyVppadMV Ja+Jua+dl7OT6sidSjiC1T+0qLz1GKW2wPx8oH74L+IHs2OId/CwOTzuYa5F7ILUv2q2 X5kN0LCpQpaRcIn0hZIwGux2G7u5of+85RvqiTfLjfwIdhLlmXDnANEnpkZDwRU5iV/V l9YGHJ3w0ZuYhT1zHsXffFOsgU4+LoruBzPLe01CdjMJZCgL04Vd8M8ivGokHYAGlqjc NxYQ== X-Gm-Message-State: AOJu0YyP17coF7LsZfvfK7V1hm20t77ln2KGc+31Ff+gjRch/L/d8SOH COd7wp+mTNKp98XDva6dwrp+gZtWCXlh2MVLKeRxFyMz3PIalATGPFmAj7RM7hukv31KA8Mite2 o X-Google-Smtp-Source: AGHT+IGsxKRM8R7Pclaj2h3kb6YavwQ6drPmrrbSr59Iij5QFltY/IbyeEiK2HE5Qh3BfyebQKo05Q== X-Received: by 2002:a17:903:2289:b0:1e2:81c1:b35e with SMTP id b9-20020a170903228900b001e281c1b35emr2143992plh.54.1712907234841; Fri, 12 Apr 2024 00:33:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 09/27] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf Date: Fri, 12 Apr 2024 00:33:28 -0700 Message-Id: <20240412073346.458116-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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: 1712907300732100002 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Using qemu_hexdump_line both fixes the deprecation warning and simplifies the code base. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- hw/ide/atapi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 73ec373184..fcb6cca157 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -24,6 +24,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "hw/scsi/scsi.h" #include "sysemu/block-backend.h" #include "scsi/constants.h" @@ -1309,14 +1310,9 @@ void ide_atapi_cmd(IDEState *s) trace_ide_atapi_cmd(s, s->io_buffer[0]); =20 if (trace_event_get_state_backends(TRACE_IDE_ATAPI_CMD_PACKET)) { - /* Each pretty-printed byte needs two bytes and a space; */ - char *ppacket =3D g_malloc(ATAPI_PACKET_SIZE * 3 + 1); - int i; - for (i =3D 0; i < ATAPI_PACKET_SIZE; i++) { - sprintf(ppacket + (i * 3), "%02x ", buf[i]); - } - trace_ide_atapi_cmd_packet(s, s->lcyl | (s->hcyl << 8), ppacket); - g_free(ppacket); + g_autoptr(GString) str =3D + qemu_hexdump_line(NULL, buf, ATAPI_PACKET_SIZE, 1, 0); + trace_ide_atapi_cmd_packet(s, s->lcyl | (s->hcyl << 8), str->str); } =20 /* --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907401; cv=none; d=zohomail.com; s=zohoarc; b=ivMI6VFos01wRIsFbTsqbl4RP0EAp1j0dQTfk6oHu+Ya60tmUDzN2YLU/gWhejDHmK/MFPKm2Tq/PgfyGT6I7dRae69e5PKdy6O7qcc/aJOLMIrvsZSsqnSMaXMZSSoyBpMVCvwIhvvsebW4g/Otxojei1erIRy/UaJ5wckHGdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907401; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=6ilxVF5BFwS4yjUJP5brLaFANRlAZicyrMWrO+XSuc0=; b=FiDmvRuUzYYJp2hFdyc3Y4zsm6wbQ4fYSoTqhAWXzyIaD2nIgT4R+aLWC8gRpGLZIEW2pqoCu6FfINSTZYWfDrFzpvPSyYqCRp4A72119xwQXDY6hFIm++J5aBrvIMEkaWL6Szew9XZPfW6UFtUvFsP/Xoo18B0HetiGEUyPhJg= 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 17129074013503.693645034529254; Fri, 12 Apr 2024 00:36:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQ8-00070j-1J; Fri, 12 Apr 2024 03:34:00 -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 1rvBQ6-00070C-ER for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:58 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ4-00078P-Va for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:33:58 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1e5c11076b9so640725ad.3 for ; Fri, 12 Apr 2024 00:33:56 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907235; x=1713512035; darn=nongnu.org; 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=6ilxVF5BFwS4yjUJP5brLaFANRlAZicyrMWrO+XSuc0=; b=TZXSFWDsAsMGQVsYPjBqDchaQDmbOPAHKM/mgPJZFKOqGbDHoFqE4DMQTolwJT/oPm eOGKEAk3lg4DGoTK9ZxQQRwo6OMgkkM67eYoF/rRZoqW804imrnbw14AJgpmL1lezudM a6EG09maLY4M/phWqabf8jytQRcGNq08Fb0HzpjJmkeOpwZs5MJQtiwPCpiUGew22ZBe 3VVYNIXpThn5fnOObzkVzxohofOnGOJMvFEKsWeoeP4681R0vQTBZGeLv9+3tUwqF4MT NOjIelZwb11j1Qlpbz0cQid/SEqf48j1mN2FarH0ufaUoeGlqkEOf8xOm9jLzPy7LnrX 3Ffw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907235; x=1713512035; 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=6ilxVF5BFwS4yjUJP5brLaFANRlAZicyrMWrO+XSuc0=; b=baQwoQO5atYM08PmEa8jorRxcv0EAN8KH9XvosgMt9lUuFfsAGopK/6NP8ndEDJnR4 S4++yolis/J7p27lGWN8gRbG0i/n1g1l16Oy75Ox7MBiaPOYmaaIX0hsY92Jl/YbIpvX ynItaMcZhmQQBSCbUXmToDEIbgtyryEIkT/pvrpTpg1OYIdC45Rahbw0HV3oow82wUQB wVvHzMHT4hQ6DlkPekceNJOsT4fuF/C4KkMzyRUgRyKkDsaUwuHbNStwi/C1+i+zNwRf korrMZegqP4OBhbV0bzCdsALE7t6dDboiyq33KOWKc4FNGpJskSvz5wFyF4tbEpnxvQR wzKQ== X-Gm-Message-State: AOJu0YyHqfBGS1vKELy7eEV0+EKOU5jzJ915aEfJizH+Wp4APjcbnWbv WOVOATm3IXuoWW1HqQkFjXEC1n9q7xH0mEo7NxhX5pG1jXRdw0ClFBGGJfLPvXY15mPCTYoma8K z X-Google-Smtp-Source: AGHT+IFIMoPGKgkXg1GY63SfyjaPXmkZpZTU2GlLISIDNSVn8pE+lGFT5Lcx7Z4tVcNYnVRhogK/MA== X-Received: by 2002:a17:902:f64a:b0:1e3:ff5e:159f with SMTP id m10-20020a170902f64a00b001e3ff5e159fmr2442098plg.18.1712907235663; Fri, 12 Apr 2024 00:33:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 10/27] hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf Date: Fri, 12 Apr 2024 00:33:29 -0700 Message-Id: <20240412073346.458116-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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: 1712907403036100002 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Using qemu_hexdump_line both fixes the deprecation warning and simplifies the code base. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- hw/dma/pl330.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index 70a502d245..5f89295af3 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -15,6 +15,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" @@ -317,22 +318,14 @@ typedef struct PL330InsnDesc { =20 static void pl330_hexdump(uint8_t *buf, size_t size) { - unsigned int b, i, len; - char tmpbuf[80]; + g_autoptr(GString) str =3D g_string_sized_new(64); + size_t b, len; =20 - for (b =3D 0; b < size; b +=3D 16) { - len =3D size - b; - if (len > 16) { - len =3D 16; - } - tmpbuf[0] =3D '\0'; - for (i =3D 0; i < len; i++) { - if ((i % 4) =3D=3D 0) { - strcat(tmpbuf, " "); - } - sprintf(tmpbuf + strlen(tmpbuf), " %02x", buf[b + i]); - } - trace_pl330_hexdump(b, tmpbuf); + for (b =3D 0; b < size; b +=3D len) { + len =3D MIN(16, size - b); + g_string_truncate(str, 0); + qemu_hexdump_line(str, buf + b, len, 1, 4); + trace_pl330_hexdump(b, str->str); } } =20 --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907313; cv=none; d=zohomail.com; s=zohoarc; b=ZxVopkbyqq5n9iCeIKz6g1Rd68ho11mulYTnfmPwP8MQGQUlUqWFaR4G68TTXRVm31uUe9+xesJRFwaTqGt3atLlmcKQHmYToMwjVbrd3NbMSpnZR153cykLL8rPhLBl7e4dHXKCQWRHXg5fr6gyl+taM7gDfqIJYeIjwQAZiKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907313; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=+7uXdJXbZvFgUDV/6dLp0dNk/3VKiyesi33hYvTO4ao=; b=fgahEroDzl4+AJfz7eGVMaVJTbxQRcZyIFrG03jgFJ7LlDH/EAThbb+fF3gXoERXxR88YOJvb6NqBuYhztHFur3J/5gSm59sN93th3/JGsKrhNH359MyvvxTCzC6hEDW1R5nB6UcvKNGuCKu6h4PEtFtyxQ3lnUM/0Jh8fzq50E= 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 1712907313601360.3802262781851; Fri, 12 Apr 2024 00:35:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQJ-00075K-OM; Fri, 12 Apr 2024 03:34:11 -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 1rvBQC-00071a-0U for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:04 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ5-000797-O0 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:02 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1e5b6e8f662so1413895ad.0 for ; Fri, 12 Apr 2024 00:33:57 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907236; x=1713512036; darn=nongnu.org; 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=+7uXdJXbZvFgUDV/6dLp0dNk/3VKiyesi33hYvTO4ao=; b=GcSJtibv9rodPYdW6Y516ABbpRY5FWgJhv0J+olKvlxdW3H0wOOcjldEAAorJU+nBA xmA1gGRZh7RGVgmV7+PUOfU0QpGKlQSYVTrPWVQF7crgpgUal8M0C+5RCQav4Fo2c4WV hySv6crQTK5p1a5+xkkWhuc7gJpRie7lm4a8xZsvKGgUnXptFCsn8saEx7eVFtWkKPsd XBijoPHbjSQvlB+AFptewFzgwv0noF0IpRnH7mqK4qWYJS2N/w9l/UundvD4DFcG1vZG jvCYBuWaHkb9BCycS636Cn859AG8CzymIQdn9W2dT7qDPAYwb9+1HhqqrWzhV8WxPZND 0bGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907236; x=1713512036; 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=+7uXdJXbZvFgUDV/6dLp0dNk/3VKiyesi33hYvTO4ao=; b=TmNTkxy6iLyD0ActzZ1jkUJbAuEbNpOmjo9fM+F+YwMOSX5v4CohxHPStNq+7sQDb5 qYkaoWLRB8r8Rmb2sGeG1ghcU1OynCJ9zUDUJfmNrNcNFUuVYL13BA8DefK179sH8Lun zHor5uvkRdSr4fWkfxiNqCcLoGbQvCg17Q4td9yTxiUB9sL77K+i0LkaA0wFN1MOmPV1 1kP76AXoYrl0zX/4ZpKCqt5/pjz2cQwHHdTBW2cup+bzLZ4kD9X9dLBvEewDsWB0acbS uZa7ooAB/QNZRthSFLzsvAB56ogJV+5KUp3uUpguJ4hTMYM33XWvgtsOfNd7gwJkZ4Je yegg== X-Gm-Message-State: AOJu0Yxojar7JS96yv+gdSeF+gPOKLUCaB+Ob7CQLwSr6iP6fz1oGgpm yVt+6Mc2NuOxPb43birQncgc4wgkPgbiaV2RAvdg1rbTLSAMqKQD43EBdFpY7wAzmv6dD1sCYTr R X-Google-Smtp-Source: AGHT+IEthVWBJy8rEtPNwM/wziGLiVZWjIiCd47toWvQeIf9GVMAN+hPKl3g1b5kVWulJh1rUI2R5A== X-Received: by 2002:a17:902:eb87:b0:1e4:12e1:88bc with SMTP id q7-20020a170902eb8700b001e412e188bcmr2498786plg.11.1712907236483; Fri, 12 Apr 2024 00:33:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Subject: [PATCH v3 11/27] backends/tpm: Use qemu_hexdump_line to avoid sprintf Date: Fri, 12 Apr 2024 00:33:30 -0700 Message-Id: <20240412073346.458116-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1712907314793100002 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Using qemu_hexdump_line both fixes the deprecation warning and simplifies the code base. Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 [rth: Keep the linebreaks every 16 bytes] Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- backends/tpm/tpm_util.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index 1856589c3b..bf3378fbbe 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -21,6 +21,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/cutils.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "tpm_int.h" @@ -336,27 +337,22 @@ void tpm_sized_buffer_reset(TPMSizedBuffer *tsb) void tpm_util_show_buffer(const unsigned char *buffer, size_t buffer_size, const char *string) { - size_t len, i; - char *line_buffer, *p; + g_autoptr(GString) str =3D NULL; + size_t len, i, l; =20 if (!trace_event_get_state_backends(TRACE_TPM_UTIL_SHOW_BUFFER)) { return; } len =3D MIN(tpm_cmd_get_size(buffer), buffer_size); =20 - /* - * allocate enough room for 3 chars per buffer entry plus a - * newline after every 16 chars and a final null terminator. - */ - line_buffer =3D g_malloc(len * 3 + (len / 16) + 1); - - for (i =3D 0, p =3D line_buffer; i < len; i++) { - if (i && !(i % 16)) { - p +=3D sprintf(p, "\n"); + for (i =3D 0; i < len; i +=3D l) { + if (str) { + g_string_append_c(str, '\n'); } - p +=3D sprintf(p, "%.2X ", buffer[i]); + l =3D MIN(len, 16); + str =3D qemu_hexdump_line(str, buffer, l, 1, 0); } - trace_tpm_util_show_buffer(string, len, line_buffer); =20 - g_free(line_buffer); + g_string_ascii_up(str); + trace_tpm_util_show_buffer(string, len, str->str); } --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907282; cv=none; d=zohomail.com; s=zohoarc; b=n97DNqGaB1jT1BjrzBkHe+tC/ndJjf8nZHODSgwZ0BDwwnWNbwPZH+u8GkcsVJdhjhH05zGbkkOSq863B7gV4EiFMksmo7aGs7eEon4UaKTfJYys8WItg96p4uSPFgOgePec2AWjkNmdaa11UUPnElEsTK2oVTkpaQ479CUDiMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907282; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=2rkNxCt/0g8Id1+pQXEkuRBEGY5hnj70aYW+ARQ9RhY=; b=FhYR+Jyrr8k3jbWiTjAvVUkIdTamcM3EjwReQhgn5isGX9U5aXUBeUrnT9adHzTm0smYhYQ1I6BobEjK+RDpEIt7wIuT1ILbYL+OYrItjyyfkRvK72/TZxVch+FZWObImBXKfHIbvRDed8XQnPOV/0D2n6rqYu1PxQMwAWLldkw= 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 1712907282475875.6249465415239; Fri, 12 Apr 2024 00:34:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQE-00072Y-ME; Fri, 12 Apr 2024 03:34:07 -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 1rvBQ8-00070n-FL for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:01 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ6-00079b-US for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:00 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1e411e339b8so5282885ad.3 for ; Fri, 12 Apr 2024 00:33:58 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907237; x=1713512037; darn=nongnu.org; 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=2rkNxCt/0g8Id1+pQXEkuRBEGY5hnj70aYW+ARQ9RhY=; b=IARtOh47MGDsmxINTCLsAlLoq5CkD61rkgaKBjMBK9nkSArqpj8+tPHa6w6yRC8vvH Tk0S0PZo9GRAsRcr1Uq/J/sS8OICGwuxm490d36XIVMQTUQcH5ADDaTF8cLA/5D/sCSl ZhFSro03qmK69JGFiIXgiWCxqoWcrbjTN7W3hcc1q3MK1E3wwrIWAReNgCPYhpnQj5bh GPyRpe/QzdI+G4QsprY/Wzy1ZT+uei8cpyRECxZCppW+4G1Tif9c4m4iHe3z0qYGN6kY PRM6Rm9A1KfMgHGjMPSRzCvAP9MibwKPW6i60OSphXmduNkTW0mAW0at1xcTUQQnwsEV vmww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907237; x=1713512037; 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=2rkNxCt/0g8Id1+pQXEkuRBEGY5hnj70aYW+ARQ9RhY=; b=U2AyRBU7dNliZAU0y2EOugMTAjM9NNKhC22Yj+6+tSWrP0VPCsGsREJhcAXBZudhLs du0YiB+QZnEs4/K4li6bmzFCMBM3gBR3xUf0LP/uMRf/uCxlpgSIE80z4s6E3SeYfhLe ia7imXlfa9R/sKSL5xR+itcOyY51kkr7ovT720UQQ4KPlURdaRiYlM+Ln279xEhzSNvX DvHjODcG0RBtsqmc7lSD53yJ6d1+CmSszDTMtqgTYUKL8hCtQhLB+FEyudvPLnDVHbvk 4NpBd82WRyHMP/Y4xV2BbpssH0cL1ySzd8NOutr1uxXjJhkR7htHzDYWVTCCMh8s1a5c 9nhQ== X-Gm-Message-State: AOJu0YzBIPOwL4dy5fKn44XuVTMEPJz0VG1mzEw0ICZ0Y0NgrLnLVGUO 0gdiA+clQwaECIHolytfeaP2eczZ6xsvjH/yQN/Cuw437igcUt9vqJz4IOKtRo4Lsxf0ObA/L2r C X-Google-Smtp-Source: AGHT+IHmUlHocG4kYk9i0OE3silNXhWVflOySM8Xk/mZ9SydUwAPdDOfsfruyY0iGejRkGRRle9jUA== X-Received: by 2002:a17:903:24d:b0:1e4:970e:37a7 with SMTP id j13-20020a170903024d00b001e4970e37a7mr1874001plh.60.1712907237402; Fri, 12 Apr 2024 00:33:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v3 12/27] disas/m68k: Replace sprintf() by snprintf() Date: Fri, 12 Apr 2024 00:33:31 -0700 Message-Id: <20240412073346.458116-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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: 1712907283052100001 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1, resulting in painful developper experience. Use snprintf() instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Peter Maydell Message-Id: <20240411104340.6617-2-philmd@linaro.org> Signed-off-by: Richard Henderson --- disas/m68k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disas/m68k.c b/disas/m68k.c index 1f16e295ab..800b4145ac 100644 --- a/disas/m68k.c +++ b/disas/m68k.c @@ -1000,7 +1000,7 @@ print_indexed (int basereg, =20 /* Generate the text for the index register. Where this will be output is not yet determined. */ - sprintf (buf, "%s:%c%s", + snprintf(buf, sizeof(buf), "%s:%c%s", reg_names[(word >> 12) & 0xf], (word & 0x800) ? 'l' : 'w', scales[(word >> 9) & 3]); --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907469; cv=none; d=zohomail.com; s=zohoarc; b=hwqazsJxv07++ZxPulzpmxyKibcMZrT/2boigaas+zaor307mvJqSk6jyL92EfQpWdG0jMLmkaDNGVQ/MEDoktgBmSfbHATjkYsnFUehZcDW6Kbi6qyLd6QJy4/raDBmGuEo8W8lz8/8N2po1SHshqIpYo2Unrv1uoSvVkxIy0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907469; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=5eqjrZGd5HpdIOKB4IPvtcJuO95xZlA91V8rntFRy4Y=; b=ZA9BqvTpPYWIiHe4KYg2QLj9/3uU877HwZcZHWgUO+A2FaMuk8XsfNbBELfxgXsrcwZYAaUq/SLT+mWnEGtuWzLKGem4SGTU3owHodYrY7/kExoU0l0+3ujoGyd3k9XQRz7IbB3LaZvKMThTt1s4ubCtRTTB2AkWOLMGx0RctMg= 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 1712907469290888.6708746110638; Fri, 12 Apr 2024 00:37:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQI-00074L-Rm; Fri, 12 Apr 2024 03:34:10 -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 1rvBQA-00070r-9f for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:03 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ7-0007Ab-Dp for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:01 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1e3c3aa8938so4339325ad.1 for ; Fri, 12 Apr 2024 00:33:59 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907238; x=1713512038; darn=nongnu.org; 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=5eqjrZGd5HpdIOKB4IPvtcJuO95xZlA91V8rntFRy4Y=; b=GsxyWnq4SPm1F6qxQ7Er7HRkqR5DDdg2apELXOOdsttru4Erlo2D/uH1sSa9vSIwoD f6yyyPNGUWwi7qe1smpliAwLbJXWOKB1L8Ekdv2Q+p0iN3HnU93OVIq1LrIBTox5QmUh K4wse7xjKckIvfXuB6UJP9Pvtwh0fXKP/z6joiPAHxn9UasRybTZP0hvBEEg+aoXoSBw nocGumaEgJOn9VViOJeQ1zvI8RYjyn8zweCrBm3Kld1XzoFJ1nxVKbbsDNWy5g9GA6aK JV0qgRICARRuFryGdQ5er2ikjgW0dO/fscmtd9L9DPc9lPelolMmLn/EpHP709VyD1/m 4URQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907238; x=1713512038; 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=5eqjrZGd5HpdIOKB4IPvtcJuO95xZlA91V8rntFRy4Y=; b=GYPCvFYMLqeAW4dh8rKKZM0QOZobk8DbxNAkHFmauZqov+OtF9scQq2rLTulogkgIW PQJhsFr1nO8vDy8kNYB8fT8P/j8QM0Z3DG/nuNLulYCaqCoJYy9YQnCPv5yP8WnGaJ4W EJtJ06Joe3xcEYzNi2suuo9fFIq+vFbuWCFfYFO/UXJbPgbXh5AtZp+HKdVnBVjk1wV4 QHZvA2EIyKaDrHuC4stewUQ5grnXx2Emgo0YEQgu4lYeeVK3eRscH5WXinPhh7rVSr9Y 1ej4a1aa5zuthMBEI239+LKfo1+31iVCqDhGi4wl8EIKpxwkySCQHwuZYs7H5wAaRhb4 pyjQ== X-Gm-Message-State: AOJu0YwyacDpnDYUoHuYn+VL4/4sltLnLE6ncVh+f+w3/ZdY5Zf/tUrY UPdzTG1jZSUlbiqIoSxOt9iHq25Tc0HC6+iDiNdwWoJQ5bIDCcuh7df2EOjlKa6/rJsZtJ/nzRj t X-Google-Smtp-Source: AGHT+IHZUV/7g8Q7Ay7lwMoeCqJbHYAPLuR7zU8YnkTW2irWRzcU0UK9lp4LsaP9eDaju1eQOGIbzA== X-Received: by 2002:a17:902:e882:b0:1e4:70d0:9337 with SMTP id w2-20020a170902e88200b001e470d09337mr2121487plg.45.1712907238090; Fri, 12 Apr 2024 00:33:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E . Iglesias" Subject: [PATCH v3 13/27] disas/microblaze: Replace sprintf() by snprintf() Date: Fri, 12 Apr 2024 00:33:32 -0700 Message-Id: <20240412073346.458116-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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: 1712907471221100017 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1, resulting in painful developper experience. Use snprintf() instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Edgar E. Iglesias Message-Id: <20240411104340.6617-3-philmd@linaro.org> Signed-off-by: Richard Henderson --- disas/microblaze.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index 0b89b9c4fa..49a4c0fd40 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -600,7 +600,8 @@ static char * get_field (long instr, long mask, unsigned short low) { char tmpstr[25]; - sprintf(tmpstr, "%s%d", register_prefix, (int)((instr & mask) >> low)); + snprintf(tmpstr, sizeof(tmpstr), "%s%d", register_prefix, + (int)((instr & mask) >> low)); return(strdup(tmpstr)); } =20 @@ -608,7 +609,8 @@ static char * get_field_imm (long instr) { char tmpstr[25]; - sprintf(tmpstr, "%d", (short)((instr & IMM_MASK) >> IMM_LOW)); + snprintf(tmpstr, sizeof(tmpstr), "%d", + (short)((instr & IMM_MASK) >> IMM_LOW)); return(strdup(tmpstr)); } =20 @@ -616,7 +618,8 @@ static char * get_field_imm5 (long instr) { char tmpstr[25]; - sprintf(tmpstr, "%d", (short)((instr & IMM5_MASK) >> IMM_LOW)); + snprintf(tmpstr, sizeof(tmpstr), "%d", + (short)((instr & IMM5_MASK) >> IMM_LOW)); return(strdup(tmpstr)); } =20 @@ -624,7 +627,8 @@ static char * get_field_rfsl (long instr) { char tmpstr[25]; - sprintf(tmpstr, "%s%d", fsl_register_prefix, (short)((instr & RFSL_MASK)= >> IMM_LOW)); + snprintf(tmpstr, sizeof(tmpstr), "%s%d", fsl_register_prefix, + (short)((instr & RFSL_MASK) >> IMM_LOW)); return(strdup(tmpstr)); } =20 @@ -632,7 +636,8 @@ static char * get_field_imm15 (long instr) { char tmpstr[25]; - sprintf(tmpstr, "%d", (short)((instr & IMM15_MASK) >> IMM_LOW)); + snprintf(tmpstr, sizeof(tmpstr), "%d", + (short)((instr & IMM15_MASK) >> IMM_LOW)); return(strdup(tmpstr)); } =20 @@ -641,7 +646,8 @@ static char * get_field_unsigned_imm (long instr) { char tmpstr[25]; - sprintf(tmpstr, "%d", (int)((instr & IMM_MASK) >> IMM_LOW)); + snprintf(tmpstr, sizeof(tmpstr), "%d", + (int)((instr & IMM_MASK) >> IMM_LOW)); return(strdup(tmpstr)); } #endif @@ -653,7 +659,8 @@ get_field_unsigned_imm (long instr) { char tmpstr[25]; =20 - sprintf(tmpstr, "%s%s", register_prefix, (((instr & IMM_MASK) >> IMM_LOW= ) & REG_MSR_MASK) =3D=3D 0 ? "pc" : "msr"); + snprintf(tmpstr, sizeof(tmpstr), "%s%s", register_prefix, + (((instr & IMM_MASK) >> IMM_LOW) & REG_MSR_MASK) =3D=3D 0 ? "pc"= : "msr"); =20 return(strdup(tmpstr)); } @@ -709,7 +716,7 @@ get_field_special(long instr, const struct op_code_stru= ct *op) default : { if ( ((((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask) & 0xE000)= =3D=3D REG_PVR_MASK) { - sprintf(tmpstr, "%s%u", pvr_register_prefix, + snprintf(tmpstr, sizeof(tmpstr), "%s%u", pvr_register_prefix, (unsigned short)(((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask) ^ REG_PVR_MASK); return(strdup(tmpstr)); @@ -720,7 +727,7 @@ get_field_special(long instr, const struct op_code_stru= ct *op) break; } =20 - sprintf(tmpstr, "%s%s", register_prefix, spr); + snprintf(tmpstr, sizeof(tmpstr), "%s%s", register_prefix, spr); return(strdup(tmpstr)); } =20 --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907466; cv=none; d=zohomail.com; s=zohoarc; b=F8lN136FN6SoFRMY0Bvf98wGcWrSGK3qWjAAKjoyM8bdZzpw5LJoKQUkG05HQYsAvmpjSQTU6S82fNgiQp0+BMX82iNj+VEpUrUYRMtkFXUxf40URAFEKcZ/DcV1SFNAfIYVKq5ZxG8V2PN051pq2RP7hW0oA5rRNGo/QPZY/fQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907466; 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=rYVeh39A85lKzN367OYcjUFCWQI2goI5Bmql3JBqN/4=; b=ZFRL2akg4urxGWxije3Ogf7Oc8lwOrGXM/vuS6wZpq0a9uvUj7n3Jb9vfeXXT2XV0rTtuHlSyBC8XtEYBUMmxljbKrVKLg8VH8L2YyBJDOpxNabfYtBYn9RioUhUZrPacvYAOJ2FKMAv6f2omoOz6QToqD4aoJt298qJuUOvA+Q= 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 171290746640066.50471620640008; Fri, 12 Apr 2024 00:37:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQI-00074H-3N; Fri, 12 Apr 2024 03:34:10 -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 1rvBQA-00070s-9l for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:03 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ7-0007BB-Ve for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:01 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1e3c9300c65so6283825ad.0 for ; Fri, 12 Apr 2024 00:33:59 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907239; x=1713512039; 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=rYVeh39A85lKzN367OYcjUFCWQI2goI5Bmql3JBqN/4=; b=Oie4f+HNrso8VcxuLvXfbRirQR/F89QWTrudQ2ye6PCwB+7oi2KSKbEW9N04VEMGq2 ANF3azTIB8F9t9IGp7Fv/VeiSleiPBGuxD3h3oJHw58t0PUNHHQWx8mJsEwkZKv9ZZsX apktQXyVDnCXCXiDiADyRS2YYLDQlrRs6SAqbUIJO6Ed0HrYS9hPNeYKhMsqpWhUu4/t D2GhUOdeOvRsuUZDzpYfKz+i8btM5ke11yZpQTHtNEQLXcQqujxoWLv6hHiAbgqSh2Rg E/D31qHb3sSVpp6DpmUPfdmUA9XXDAseNRBw+ZZAHyQtstQa1vK3SBhleUxocFI1Ie8Q hFoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907239; x=1713512039; 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=rYVeh39A85lKzN367OYcjUFCWQI2goI5Bmql3JBqN/4=; b=WZncITnH6S4EVZlyeZqUWxaL0SEdtu2StVU47NE5VnY8OBkq6C+QLjnDqi8snOmFQm 7wreJ+jx5HQJqY11eivmrZH2lpMCq4Pd2y+nhbDB0YnFXdTYdZHV22PiG/zq5m1c09mf hbEbJ1cSPiLJ8bjGYDLKG6P4iqonmOLtlHDQQlS58rh/ADwg9NxHMtmLu65sbRX7z3o9 MYmYMNSD2LdtohULfaf9w8zzYbN58RDXMTrVqZ11YeV6klIEGKf6p2aHo28x9QmQc6OH JwAi+m7YOpzneoVBh3/s5070QahgGjeqcQ7/1pZZXIfvhgvZgHYwpyTLE9mqlKtaRFCZ uShQ== X-Gm-Message-State: AOJu0Yxj0n74qo67S9Jsm/r6oeaUaJiIhaskbU2g3E9n+jF+qo29KJvl dO1pjtsQ+YcTlgmzZwDs+hULijd0EWYnn4yWnxcDyvzgLmehcMsYvbcOOf7ud/B3AVuMBb3nsEj T X-Google-Smtp-Source: AGHT+IGzGaK0wHiD+ekAvlxNIssQ1JJ0aRWXHhHPuixoMGvretn8jfyoxHJZU3Zi45GfnG+j+CtAMA== X-Received: by 2002:a17:902:ba84:b0:1e4:4a3f:9a88 with SMTP id k4-20020a170902ba8400b001e44a3f9a88mr1489311pls.46.1712907238778; Fri, 12 Apr 2024 00:33:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 14/27] disas/microblaze: Split out print_immval_addr Date: Fri, 12 Apr 2024 00:33:33 -0700 Message-Id: <20240412073346.458116-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: 1712907467219100006 Content-Type: text/plain; charset="utf-8" Unify the code blocks that try to print a symbolic address. Signed-off-by: Richard Henderson --- disas/microblaze.c | 89 +++++++++++++++------------------------------- 1 file changed, 29 insertions(+), 60 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index 49a4c0fd40..3473c94164 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -767,6 +767,24 @@ read_insn_microblaze (bfd_vma memaddr, return inst; } =20 +static void print_immval_addr(struct disassemble_info *info, bool immfound, + int immval, unsigned inst, int addend) +{ + if (info->print_address_func && info->symbol_at_address_func) { + if (immfound) { + immval |=3D get_int_field_imm(inst) & 0x0000ffff; + } else { + immval =3D (int16_t)get_int_field_imm(inst); + } + immval +=3D addend; + if (immval !=3D 0 && info->symbol_at_address_func(immval, info)) { + info->fprintf_func(info->stream, "\t// "); + info->print_address_func (immval, info); + } else if (addend) { + info->fprintf_func(info->stream, "\t// %x", immval); + } + } +} =20 int=20 print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) @@ -821,18 +839,8 @@ print_insn_microblaze (bfd_vma memaddr, struct disasse= mble_info * info) break; case INST_TYPE_RD_R1_IMM: fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(i= nst), get_field_imm(inst)); - if (info->print_address_func && get_int_field_r1(inst) =3D=3D 0 && info= ->symbol_at_address_func) { - if (immfound) - immval |=3D (get_int_field_imm(inst) & 0x0000ffff); - else { - immval =3D get_int_field_imm(inst); - if (immval & 0x8000) - immval |=3D 0xFFFF0000; - } - if (immval > 0 && info->symbol_at_address_func(immval, info)) { - fprintf_func (stream, "\t// "); - info->print_address_func (immval, info); - } + if (get_int_field_r1(inst) =3D=3D 0) { + print_immval_addr(info, immfound, immval, inst, 0); } break; case INST_TYPE_RD_R1_IMM5: @@ -860,61 +868,22 @@ print_insn_microblaze (bfd_vma memaddr, struct disass= emble_info * info) fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_imm(inst= )); /* The non-pc relative instructions are returns, which shouldn't=20 have a label printed */ - if (info->print_address_func && op->inst_offset_type =3D=3D INST_PC_OFF= SET && info->symbol_at_address_func) { - if (immfound) - immval |=3D (get_int_field_imm(inst) & 0x0000ffff); - else { - immval =3D get_int_field_imm(inst); - if (immval & 0x8000) - immval |=3D 0xFFFF0000; - } - immval +=3D memaddr; - if (immval > 0 && info->symbol_at_address_func(immval, info)) { - fprintf_func (stream, "\t// "); - info->print_address_func (immval, info); - } else { - fprintf_func (stream, "\t\t// "); - fprintf_func (stream, "%x", immval); - } + if (op->inst_offset_type =3D=3D INST_PC_OFFSET) { + print_immval_addr(info, immfound, immval, inst, memaddr); } break; case INST_TYPE_RD_IMM: fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm(inst= )); - if (info->print_address_func && info->symbol_at_address_func) { - if (immfound) - immval |=3D (get_int_field_imm(inst) & 0x0000ffff); - else { - immval =3D get_int_field_imm(inst); - if (immval & 0x8000) - immval |=3D 0xFFFF0000; - } - if (op->inst_offset_type =3D=3D INST_PC_OFFSET) - immval +=3D (int) memaddr; - if (info->symbol_at_address_func(immval, info)) { - fprintf_func (stream, "\t// "); - info->print_address_func (immval, info); - }=20 - } + print_immval_addr(info, immfound, immval, inst, + op->inst_offset_type =3D=3D INST_PC_OFFSET + ? memaddr : 0); break; case INST_TYPE_IMM: fprintf_func(stream, "\t%s", get_field_imm(inst)); - if (info->print_address_func && info->symbol_at_address_func && op->ins= tr !=3D imm) { - if (immfound) - immval |=3D (get_int_field_imm(inst) & 0x0000ffff); - else { - immval =3D get_int_field_imm(inst); - if (immval & 0x8000) - immval |=3D 0xFFFF0000; - } - if (op->inst_offset_type =3D=3D INST_PC_OFFSET) - immval +=3D (int) memaddr; - if (immval > 0 && info->symbol_at_address_func(immval, info)) { - fprintf_func (stream, "\t// "); - info->print_address_func (immval, info); - } else if (op->inst_offset_type =3D=3D INST_PC_OFFSET) { - fprintf_func (stream, "\t\t// "); - fprintf_func (stream, "%x", immval); - } + if (op->instr !=3D imm) { + print_immval_addr(info, immfound, immval, inst, + op->inst_offset_type =3D=3D INST_PC_OFFSET + ? memaddr : 0); } break; case INST_TYPE_RD_R2: --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907408; cv=none; d=zohomail.com; s=zohoarc; b=fNTWrEBlnsJisKOmLBAd1tv5T3ZdQMMMq/BLHrc5s5sl4dLDPu4GeZ5XkQ8qLJRECnRUyFRKwrXo1FdiUEFD6EWIKp+olRRtllAoba55aMdm6jMNDcyvMNGqrnhFGLunIOY75RuqpjmIQZ8CFb6WnPUug8Q83ILlRRuK1p7cgsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907408; 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=6HJ1SMmA8I+3QuAFdhuJVGFMyvOQ304pvIkGq8bmlYE=; b=dPuPkWBCPA1MOFRxniXRp4rSTkucGbSXvbL2WgtmvAQVeNz1bbiAC9qfKzlmbbHmMOu/wfi5mU1ZJnU63WuA8haWqddDSmAV/0Dbe+TtXQBf8YoPsqV7HVyI+pWRuQJIZnQVe0SIrOxnMcL71xQmrfrTPSUMykqdDvqXjEHy1YU= 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 1712907408312123.32703338013653; Fri, 12 Apr 2024 00:36:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQH-000740-Fl; Fri, 12 Apr 2024 03:34:09 -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 1rvBQB-00071Z-W9 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:04 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQ9-0007Bz-67 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:02 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1e3cf5b171eso5656085ad.0 for ; Fri, 12 Apr 2024 00:34:00 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.33.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907240; x=1713512040; 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=6HJ1SMmA8I+3QuAFdhuJVGFMyvOQ304pvIkGq8bmlYE=; b=fRWCKJ16wj/9zLqvhGd1JWRQZn6wUegW8N9LV/hGOeVqc/SesWVm2f88wcSwSPJHfX hanCVfY8ysxdXySt4AZ+puG6mj5SPCEBp+ZrqJTcKwYK8zKIzv8lNHsYm9rzLwe/f1E+ RYGXp4c+/pA3FbV56bXlTNuSfKkokvKBfY14HhKNmgMQylu6OmfplbUKrFNm0XAmltZ8 xOB4U93KIjo5OGF0dL+2X9UL1/+fZet4Bz1pPyzaWfdaCI0ekZCNLLHyhxXZ8cdts4RK xo95E2UJ/NwlvSV5CHJSJtqnUtAcWzCNzGoACHd6kLl8mAlVKat89IjN5aVA+T+x8pRV CbZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907240; x=1713512040; 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=6HJ1SMmA8I+3QuAFdhuJVGFMyvOQ304pvIkGq8bmlYE=; b=Fq8exkgfPAQswrPk2xWJfxOviWCoHPifXWBcfFhrWflnvp9jTd2eujHkh/n4FDKGfh yll7/roYMhCPOss2ULqcSNhJ2PSGvi+1vOzAQEA+xdKUHqEdQ13egZ9gGoGj/hnLv4um nWpx/RKqFHKsCvIwBTq5cTRZxhoxgAo4rn1alnf1BKAOuiYmdhD6d7PAPCahmhn/yisz mnwAN//S8KUbMeMbouGrDJltVKNty8suxmSeRQoYbaMTrndUdgafOLaocHmnu23o7GcU upIpzNrUL6aNi/pVIBsATBRH8Vfrwp7uAGLGq+FxZ4Npub+CAkhpD2o+DU3gwfyn2xe8 FBZw== X-Gm-Message-State: AOJu0YzZrnWgQD6UnicGSUe8Ghc2dKYQ/+N4Di+T9pmcs+QZVGEjrzP8 7uGgWZpWx1B8Fr2gwNL4t5RNK76DdziMZSsnT8y8uo9noz7sJH2EdUnVMvn9IKgh+qw8gAA54Z2 H X-Google-Smtp-Source: AGHT+IHpJFz5Lq/IyHGyhh3KLglRPs4wpTYLyI/hFXwz1nYFKVayjRnLPqe9fJ4hul0efOkixz6q9A== X-Received: by 2002:a17:902:a98a:b0:1e3:de79:35d1 with SMTP id bh10-20020a170902a98a00b001e3de7935d1mr1685068plb.23.1712907239662; Fri, 12 Apr 2024 00:33:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 15/27] target/microblaze: Re-indent print_insn_microblaze Date: Fri, 12 Apr 2024 00:33:34 -0700 Message-Id: <20240412073346.458116-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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: 1712907409097100005 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- disas/microblaze.c | 263 ++++++++++++++++++++++++--------------------- 1 file changed, 141 insertions(+), 122 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index 3473c94164..c729c76585 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -787,134 +787,153 @@ static void print_immval_addr(struct disassemble_in= fo *info, bool immfound, } =20 int=20 -print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) +print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info) { - fprintf_function fprintf_func =3D info->fprintf_func; - void * stream =3D info->stream; - unsigned long inst, prev_inst; - const struct op_code_struct *op, *pop; - int immval =3D 0; - bfd_boolean immfound =3D FALSE; - static bfd_vma prev_insn_addr =3D -1; /*init the prev insn addr */ - static int prev_insn_vma =3D -1; /*init the prev insn vma */ - int curr_insn_vma =3D info->buffer_vma; + fprintf_function fprintf_func =3D info->fprintf_func; + void *stream =3D info->stream; + unsigned long inst, prev_inst; + const struct op_code_struct *op, *pop; + int immval =3D 0; + bool immfound =3D false; + static bfd_vma prev_insn_addr =3D -1; /*init the prev insn addr */ + static int prev_insn_vma =3D -1; /*init the prev insn vma */ + int curr_insn_vma =3D info->buffer_vma; =20 - info->bytes_per_chunk =3D 4; + info->bytes_per_chunk =3D 4; =20 - inst =3D read_insn_microblaze (memaddr, info, &op); - if (inst =3D=3D 0) { - return -1; - } + inst =3D read_insn_microblaze (memaddr, info, &op); + if (inst =3D=3D 0) { + return -1; + } =20 - if (prev_insn_vma =3D=3D curr_insn_vma) { - if (memaddr-(info->bytes_per_chunk) =3D=3D prev_insn_addr) { - prev_inst =3D read_insn_microblaze (prev_insn_addr, info, &pop); - if (prev_inst =3D=3D 0) - return -1; - if (pop->instr =3D=3D imm) { - immval =3D (get_int_field_imm(prev_inst) << 16) & 0xffff0000; - immfound =3D TRUE; + if (prev_insn_vma =3D=3D curr_insn_vma) { + if (memaddr - info->bytes_per_chunk =3D=3D prev_insn_addr) { + prev_inst =3D read_insn_microblaze (prev_insn_addr, info, &pop= ); + if (prev_inst =3D=3D 0) + return -1; + if (pop->instr =3D=3D imm) { + immval =3D (get_int_field_imm(prev_inst) << 16) & 0xffff00= 00; + immfound =3D TRUE; + } + else { + immval =3D 0; + immfound =3D FALSE; + } + } } - else { - immval =3D 0; - immfound =3D FALSE; - } - } - } - /* make curr insn as prev insn */ - prev_insn_addr =3D memaddr; - prev_insn_vma =3D curr_insn_vma; + /* make curr insn as prev insn */ + prev_insn_addr =3D memaddr; + prev_insn_vma =3D curr_insn_vma; =20 - if (op->name =3D=3D 0) { - fprintf_func (stream, ".short 0x%04lx", inst); - } - else - { - fprintf_func (stream, "%s", op->name); + if (op->name =3D=3D 0) { + fprintf_func (stream, ".short 0x%04lx", inst); + return 4; + } + + fprintf_func (stream, "%s", op->name); =20 - switch (op->inst_type) - { - case INST_TYPE_RD_R1_R2: - fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1= (inst), get_field_r2(inst)); - break; - case INST_TYPE_RD_R1_IMM: - fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(i= nst), get_field_imm(inst)); - if (get_int_field_r1(inst) =3D=3D 0) { - print_immval_addr(info, immfound, immval, inst, 0); - } - break; - case INST_TYPE_RD_R1_IMM5: - fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(i= nst), get_field_imm5(inst)); - break; - case INST_TYPE_RD_RFSL: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_rfsl(ins= t)); - break; - case INST_TYPE_R1_RFSL: - fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_rfsl(ins= t)); - break; - case INST_TYPE_RD_SPECIAL: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_special(= inst, op)); - break; - case INST_TYPE_SPECIAL_R1: - fprintf_func(stream, "\t%s, %s", get_field_special(inst, op), get_field= _r1(inst)); - break; - case INST_TYPE_RD_R1: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r1(inst)= ); - break; - case INST_TYPE_R1_R2: - fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_r2(inst)= ); - break; - case INST_TYPE_R1_IMM: - fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_imm(inst= )); - /* The non-pc relative instructions are returns, which shouldn't=20 - have a label printed */ - if (op->inst_offset_type =3D=3D INST_PC_OFFSET) { - print_immval_addr(info, immfound, immval, inst, memaddr); - } - break; - case INST_TYPE_RD_IMM: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm(inst= )); - print_immval_addr(info, immfound, immval, inst, - op->inst_offset_type =3D=3D INST_PC_OFFSET - ? memaddr : 0); - break; - case INST_TYPE_IMM: - fprintf_func(stream, "\t%s", get_field_imm(inst)); - if (op->instr !=3D imm) { - print_immval_addr(info, immfound, immval, inst, - op->inst_offset_type =3D=3D INST_PC_OFFSET - ? memaddr : 0); - } - break; - case INST_TYPE_RD_R2: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r2(inst)= ); - break; - case INST_TYPE_R2: - fprintf_func(stream, "\t%s", get_field_r2(inst)); - break; - case INST_TYPE_R1: - fprintf_func(stream, "\t%s", get_field_r1(inst)); - break; - case INST_TYPE_RD_R1_SPECIAL: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r2(ins= t)); - break; - case INST_TYPE_RD_IMM15: - fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm15(= inst)); - break; - /* For tuqula instruction */ - case INST_TYPE_RD: - fprintf_func(stream, "\t%s", get_field_rd(inst)); - break; - case INST_TYPE_RFSL: - fprintf_func(stream, "\t%s", get_field_rfsl(inst)); - break; - default: - /* if the disassembler lags the instruction set */ - fprintf_func (stream, "\tundecoded operands, inst is 0x%04lx", inst); - break; - } + switch (op->inst_type) { + case INST_TYPE_RD_R1_R2: + fprintf_func(stream, "\t%s, %s, %s", + get_field_rd(inst), get_field_r1(inst), + get_field_r2(inst)); + break; + case INST_TYPE_RD_R1_IMM: + fprintf_func(stream, "\t%s, %s, %s", + get_field_rd(inst), get_field_r1(inst), + get_field_imm(inst)); + if (get_int_field_r1(inst) =3D=3D 0) { + print_immval_addr(info, immfound, immval, inst, 0); + } + break; + case INST_TYPE_RD_R1_IMM5: + fprintf_func(stream, "\t%s, %s, %s", + get_field_rd(inst), get_field_r1(inst), + get_field_imm5(inst)); + break; + case INST_TYPE_RD_RFSL: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_rfsl(inst)); + break; + case INST_TYPE_R1_RFSL: + fprintf_func(stream, "\t%s, %s", + get_field_r1(inst), get_field_rfsl(inst)); + break; + case INST_TYPE_RD_SPECIAL: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_special(inst, op)); + break; + case INST_TYPE_SPECIAL_R1: + fprintf_func(stream, "\t%s, %s", + get_field_special(inst, op), get_field_r1(inst)); + break; + case INST_TYPE_RD_R1: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_r1(inst)); + break; + case INST_TYPE_R1_R2: + fprintf_func(stream, "\t%s, %s", + get_field_r1(inst), get_field_r2(inst)); + break; + case INST_TYPE_R1_IMM: + fprintf_func(stream, "\t%s, %s", + get_field_r1(inst), get_field_imm(inst)); + /* + * The non-pc relative instructions are returns, + * which shouldn't have a label printed. + */ + if (op->inst_offset_type =3D=3D INST_PC_OFFSET) { + print_immval_addr(info, immfound, immval, inst, memaddr); + } + break; + case INST_TYPE_RD_IMM: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_imm(inst)); + print_immval_addr(info, immfound, immval, inst, + op->inst_offset_type =3D=3D INST_PC_OFFSET + ? memaddr : 0); + break; + case INST_TYPE_IMM: + fprintf_func(stream, "\t%s", get_field_imm(inst)); + if (op->instr !=3D imm) { + print_immval_addr(info, immfound, immval, inst, + op->inst_offset_type =3D=3D INST_PC_OFFSET + ? memaddr : 0); + } + break; + case INST_TYPE_RD_R2: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_r2(inst)); + break; + case INST_TYPE_R2: + fprintf_func(stream, "\t%s", + get_field_r2(inst)); + break; + case INST_TYPE_R1: + fprintf_func(stream, "\t%s", + get_field_r1(inst)); + break; + case INST_TYPE_RD_R1_SPECIAL: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_r2(inst)); + break; + case INST_TYPE_RD_IMM15: + fprintf_func(stream, "\t%s, %s", + get_field_rd(inst), get_field_imm15(inst)); + break; + /* For tuqula instruction */ + case INST_TYPE_RD: + fprintf_func(stream, "\t%s", + get_field_rd(inst)); + break; + case INST_TYPE_RFSL: + fprintf_func(stream, "\t%s", + get_field_rfsl(inst)); + break; + default: + /* if the disassembler lags the instruction set */ + fprintf_func(stream, "\tundecoded operands, inst is 0x%04lx", inst= ); + break; } - =20 - /* Say how many bytes we consumed? */ - return 4; + return 4; } --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907482; cv=none; d=zohomail.com; s=zohoarc; b=gWgcz+SZnVvdaDiR5fBFXEBEZfuZCauDa7KJt701k/lHRc2rC7e3m8FDWbo2a83nfyMQWGsvdiS3sDGto1qmYawsmBqOFpBxW7ucIHoCuoc4UwhQyLclKBZaMPm5xVrJJ37vjI3NpBxWfXANHjJeiA4lfu5aV0es1WgeCkp6sCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907482; 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=eklEK2wKipko2sVrTrkRStnjaxK8ouvGtZK4O7yNiB8=; b=ORo09uOouwiX4KH4ZtfvjOx+BuWgk69Y0lLDA7BX3/bHEnHOQWotqafN76VggLXSvFKXHdKGa2W5cLSThdp8qjhP5XEyA78OrtPFap+XYyM1Qmy0dtZdIcghALZPGifBw2/J3c/MbZTl2rLcmSk5++LUDJH73K+Y/sdg8/jgupM= 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 1712907482582933.0707255294187; Fri, 12 Apr 2024 00:38:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQI-00074G-3a; Fri, 12 Apr 2024 03:34:10 -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 1rvBQF-00073N-MF for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:07 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQA-0007CC-55 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:06 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1e3f17c64daso5127205ad.3 for ; Fri, 12 Apr 2024 00:34:01 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907240; x=1713512040; 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=eklEK2wKipko2sVrTrkRStnjaxK8ouvGtZK4O7yNiB8=; b=z7SOZbESsgy6Oh1B6l6CTV/J+ZkpqBYBQ0l8DyLCVz8LWPrR1twOeLuxkmNhpVoVd1 ATx90Y8MkmqyZJkNxbYCiYoSvLW4sB3mhdLq511GdD2VX6sxqvGdZmIJ95voIBtRkVIX q2v44sC8BHE9hcM3FTOU9vkdauVzAywdEZlI75KpMz5qYdEf41yl0o0XS6MoOsP2B4r5 EjkydIFNXXy8DihOjzCWE8aZiTYPNnTI2+hwm3GLKRS85LSqC3bGmerxU/CV6HvaMqfH 4ch+tuIO1uoe+0M9nsGnTmfokQiUJFRoJ3GTnMIYTQGiPWnyeaHdTQoieTaKJt9tGst0 i4eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907240; x=1713512040; 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=eklEK2wKipko2sVrTrkRStnjaxK8ouvGtZK4O7yNiB8=; b=mz0CSWysTo4T7Z31NZGx8ghb8TvC/qbCDJALdSGsyhpVQuox8iW41Ns1mPUZgmSQgW qCTBZgBeQBNYsSQMpAYY5j/MLkVhlktwfox7AuSM12M1+s07yLApirZcAnAwrL46Ek62 oOq3Zd9jwWtJoZq0v35OcnKftd82MnPFkJZzdHI+OOOda/M2AoESgAXQWzbvyCffpNTD 61lhDKhEgSWynUPnOveRga/dPxpYVeH+AhJFbIq1WuckPTob+b2zX+neM2u2r0LZtwH5 eGSJgV2M8VBzRu49T59PDvjfgDfS23nDzpHLyK7/lD0i8S8PFyhSEaeIKGH5MHBuWgju 7SEg== X-Gm-Message-State: AOJu0Yz/O9Zf/RaIxmtVgyqRUPgdkyWOTXzP1w6foEBonIdBG6YN/ln/ XbNFkke7tp86xZo9Wua83fJcmL+BWwDi/ztoGE8eGV1Q7hpPaz+LgK9wq8XYLj575z3GUP2bwou M X-Google-Smtp-Source: AGHT+IHRoCaQBLRCMfpgHITORef7Ww94gaAHa9USlmODv+7b2qZbtkicv2BX+QafBAWtyCv9hjWXqg== X-Received: by 2002:a17:903:2442:b0:1e0:bddf:7ed0 with SMTP id l2-20020a170903244200b001e0bddf7ed0mr1741815pls.27.1712907240555; Fri, 12 Apr 2024 00:34:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 16/27] disas/microblaze: Merge op->name output into each fprintf Date: Fri, 12 Apr 2024 00:33:35 -0700 Message-Id: <20240412073346.458116-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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: 1712907483267100001 Content-Type: text/plain; charset="utf-8" In the common case, issue one single fprintf. Signed-off-by: Richard Henderson --- disas/microblaze.c | 80 +++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index c729c76585..a537ac65dd 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -830,54 +830,52 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) return 4; } =20 - fprintf_func (stream, "%s", op->name); - =20 switch (op->inst_type) { case INST_TYPE_RD_R1_R2: - fprintf_func(stream, "\t%s, %s, %s", - get_field_rd(inst), get_field_r1(inst), + fprintf_func(stream, "%s\t%s, %s, %s", + op->name, get_field_rd(inst), get_field_r1(inst), get_field_r2(inst)); break; case INST_TYPE_RD_R1_IMM: - fprintf_func(stream, "\t%s, %s, %s", - get_field_rd(inst), get_field_r1(inst), + fprintf_func(stream, "%s\t%s, %s, %s", + op->name, get_field_rd(inst), get_field_r1(inst), get_field_imm(inst)); if (get_int_field_r1(inst) =3D=3D 0) { print_immval_addr(info, immfound, immval, inst, 0); } break; case INST_TYPE_RD_R1_IMM5: - fprintf_func(stream, "\t%s, %s, %s", - get_field_rd(inst), get_field_r1(inst), + fprintf_func(stream, "%s\t%s, %s, %s", + op->name, get_field_rd(inst), get_field_r1(inst), get_field_imm5(inst)); break; case INST_TYPE_RD_RFSL: - fprintf_func(stream, "\t%s, %s", - get_field_rd(inst), get_field_rfsl(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_rd(inst), get_field_rfsl(inst)); break; case INST_TYPE_R1_RFSL: - fprintf_func(stream, "\t%s, %s", - get_field_r1(inst), get_field_rfsl(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_r1(inst), get_field_rfsl(inst)); break; case INST_TYPE_RD_SPECIAL: - fprintf_func(stream, "\t%s, %s", - get_field_rd(inst), get_field_special(inst, op)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_rd(inst), get_field_special(inst,= op)); break; case INST_TYPE_SPECIAL_R1: - fprintf_func(stream, "\t%s, %s", - get_field_special(inst, op), get_field_r1(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_special(inst, op), get_field_r1(i= nst)); break; case INST_TYPE_RD_R1: - fprintf_func(stream, "\t%s, %s", - get_field_rd(inst), get_field_r1(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_rd(inst), get_field_r1(inst)); break; case INST_TYPE_R1_R2: - fprintf_func(stream, "\t%s, %s", - get_field_r1(inst), get_field_r2(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_r1(inst), get_field_r2(inst)); break; case INST_TYPE_R1_IMM: - fprintf_func(stream, "\t%s, %s", - get_field_r1(inst), get_field_imm(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_r1(inst), get_field_imm(inst)); /* * The non-pc relative instructions are returns, * which shouldn't have a label printed. @@ -887,14 +885,15 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) } break; case INST_TYPE_RD_IMM: - fprintf_func(stream, "\t%s, %s", - get_field_rd(inst), get_field_imm(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_rd(inst), get_field_imm(inst)); print_immval_addr(info, immfound, immval, inst, op->inst_offset_type =3D=3D INST_PC_OFFSET ? memaddr : 0); break; case INST_TYPE_IMM: - fprintf_func(stream, "\t%s", get_field_imm(inst)); + fprintf_func(stream, "%s\t%s", + op->name, get_field_imm(inst)); if (op->instr !=3D imm) { print_immval_addr(info, immfound, immval, inst, op->inst_offset_type =3D=3D INST_PC_OFFSET @@ -902,37 +901,38 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) } break; case INST_TYPE_RD_R2: - fprintf_func(stream, "\t%s, %s", - get_field_rd(inst), get_field_r2(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_rd(inst), get_field_r2(inst)); break; case INST_TYPE_R2: - fprintf_func(stream, "\t%s", - get_field_r2(inst)); + fprintf_func(stream, "%s\t%s", + op->name, get_field_r2(inst)); break; case INST_TYPE_R1: - fprintf_func(stream, "\t%s", - get_field_r1(inst)); + fprintf_func(stream, "%s\t%s", + op->name, get_field_r1(inst)); break; case INST_TYPE_RD_R1_SPECIAL: - fprintf_func(stream, "\t%s, %s", - get_field_rd(inst), get_field_r2(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_rd(inst), get_field_r2(inst)); break; case INST_TYPE_RD_IMM15: - fprintf_func(stream, "\t%s, %s", - get_field_rd(inst), get_field_imm15(inst)); + fprintf_func(stream, "%s\t%s, %s", + op->name, get_field_rd(inst), get_field_imm15(inst)); break; /* For tuqula instruction */ case INST_TYPE_RD: - fprintf_func(stream, "\t%s", - get_field_rd(inst)); + fprintf_func(stream, "%s\t%s", + op->name, get_field_rd(inst)); break; case INST_TYPE_RFSL: - fprintf_func(stream, "\t%s", - get_field_rfsl(inst)); + fprintf_func(stream, "%s\t%s", + op->name, get_field_rfsl(inst)); break; default: /* if the disassembler lags the instruction set */ - fprintf_func(stream, "\tundecoded operands, inst is 0x%04lx", inst= ); + fprintf_func(stream, "%s\tundecoded operands, inst is 0x%04lx", + op->name, inst); break; } return 4; --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907350; cv=none; d=zohomail.com; s=zohoarc; b=MVBq3cqiJRJZLbwQm9r8DB3EyqDUQGAtkn9zcPH3IgXMc0huhIth3HM+8/tvNQHxEycJlD5xllmrm4saRoLo4hIJYKmitKTw20t264N0ACnd8znjE+6JwqP1VoKWjacuLt8PUH6wupQSUZv6x2aUfEkoAR7i+DdQ3GpODBmMjVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907350; 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=Pu90wwD72TTj1mq3bNLzC0zO16JxlBLO+eSavapzOrI=; b=BBSO9XT1UBZgw40YBp37YkipwvRFb/NemL0YFR0FwsKwGqwjSNTncUsLxDXJoFrEWbYARckSKdobz4K4zLeFGojhqqZFxvzb4g9ZLaDdAga6xbyus9XCInBEELbe+r9S/mAv5AI/BPS4K6Hkrtf6sejNClddKz1ddMQPgBCWsJE= 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 1712907350027871.5615834353009; Fri, 12 Apr 2024 00:35:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQN-00075u-4V; Fri, 12 Apr 2024 03:34:15 -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 1rvBQJ-00074g-E3 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:11 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQB-0007CG-Ng for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:08 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1e2b1cd446fso5267825ad.3 for ; Fri, 12 Apr 2024 00:34:02 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907241; x=1713512041; 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=Pu90wwD72TTj1mq3bNLzC0zO16JxlBLO+eSavapzOrI=; b=W5raVVAFG3uH/G6LN6F8cS0MOTDvyauQI2tujfTRv6zjTjiAx2LdWdLjVa1I+v8wV0 film3L0YrhNq42+mwu7s/ddP+teljBQLWDZYP/IXu/2ir0T6UNpNbu9IxMyhBMPxpo1O 0GZ7fSIaHWCMByLowsqYzXwwBgcDnbWE7yXorcIckdiHwPI04UvCh2bhsvphbDbWUEBf TwZHZu63hwQfIlAizKK9svaCLjhgT3ODhkEo+E28bZn0qbsKWNpMdejC/TQk0/qdXqwi BB3oU+XArzClJayeFMZ8/kQl8PUQQb4H5ja49QOodQjTO+QAUwu+F+9Pbk/PNa7E8C3B wcgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907241; x=1713512041; 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=Pu90wwD72TTj1mq3bNLzC0zO16JxlBLO+eSavapzOrI=; b=FHsfcRuQQRI16qX517Vtaeq4zl2IocOwNkz1rq5zfclWDZONK80hg9WgqkohfhlZHn 6viBrN5yNrb95oSIx/cVGtFYMjnwTGC1s+Q6DU3gL2o5ENu2c3983deraeBLPoTxDMss i0M6ymjedSMBfRaqU4BUq3fE/nVOvCwg4+4oHs31wiasX/BpquZZlRUBDg7sJbf22lIK J4LotCm4iPEIBNBSFNk3vsq6Ww0hR27q5a1NBjsEOo1Q4kbn37wjhoHfCYjfgGXPskeR 0VnD5SAV4qg5NQnh0oMah8MkAJR6YT8ScygIpyrt8grB3PlKT8WvUbUa8xewT34UNgk/ K5vQ== X-Gm-Message-State: AOJu0YwY9Kddw25g44O5vyQS5JKEWay1XdDLUvW9+AzBPPk2aOR0SBHo 9c36KusivELnIbveyNUDxdhATOr0kNjOBSR+KtLlMMSd1TeDp5wFylhY09gpqXW9QideZ+vD/Zm s X-Google-Smtp-Source: AGHT+IFkaO+eeJ8lZa0FyCyIHwfm/5TwixIMefmfIzNbr/j83ITh8P/LkLQmdoGy2gF11Mz1qWfkNw== X-Received: by 2002:a17:902:d481:b0:1e3:cfc5:589c with SMTP id c1-20020a170902d48100b001e3cfc5589cmr1958541plg.28.1712907241263; Fri, 12 Apr 2024 00:34:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 17/27] disas/microblaze: Print registers directly with PRIreg Date: Fri, 12 Apr 2024 00:33:36 -0700 Message-Id: <20240412073346.458116-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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, T_SPF_TEMPERROR=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1712907350905100001 Content-Type: text/plain; charset="utf-8" Use a printf format instead of sprintf into a buffer. Signed-off-by: Richard Henderson --- disas/microblaze.c | 54 ++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index a537ac65dd..c12968f3b9 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -563,7 +563,7 @@ static const struct op_code_struct { }; =20 /* prefix for register names */ -static const char register_prefix[] =3D "r"; +#define register_prefix "r" static const char fsl_register_prefix[] =3D "rfsl"; static const char pvr_register_prefix[] =3D "rpvr"; =20 @@ -579,15 +579,16 @@ static const char pvr_register_prefix[] =3D "rpvr"; =20 #include "disas/dis-asm.h" =20 -#define get_field_rd(instr) get_field(instr, RD_MASK, RD_LOW) -#define get_field_r1(instr) get_field(instr, RA_MASK, RA_LOW) -#define get_field_r2(instr) get_field(instr, RB_MASK, RB_LOW) +#define PRIreg register_prefix "%ld" + +#define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW) +#define get_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) +#define get_field_r2(instr) ((instr & RB_MASK) >> RB_LOW) #define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW) #define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) =20 /* Local function prototypes. */ =20 -static char * get_field (long instr, long mask, unsigned short low); static char * get_field_imm (long instr); static char * get_field_imm5 (long instr); static char * get_field_rfsl (long instr); @@ -596,15 +597,6 @@ static char * get_field_imm15 (long instr); static char * get_field_unsigned_imm (long instr); #endif =20 -static char * -get_field (long instr, long mask, unsigned short low) -{ - char tmpstr[25]; - snprintf(tmpstr, sizeof(tmpstr), "%s%d", register_prefix, - (int)((instr & mask) >> low)); - return(strdup(tmpstr)); -} - static char * get_field_imm (long instr) { @@ -832,12 +824,12 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) =20 switch (op->inst_type) { case INST_TYPE_RD_R1_R2: - fprintf_func(stream, "%s\t%s, %s, %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", " PRIreg, op->name, get_field_rd(inst), get_field_r1(inst), get_field_r2(inst)); break; case INST_TYPE_RD_R1_IMM: - fprintf_func(stream, "%s\t%s, %s, %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", %s", op->name, get_field_rd(inst), get_field_r1(inst), get_field_imm(inst)); if (get_int_field_r1(inst) =3D=3D 0) { @@ -845,36 +837,36 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) } break; case INST_TYPE_RD_R1_IMM5: - fprintf_func(stream, "%s\t%s, %s, %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", %s", op->name, get_field_rd(inst), get_field_r1(inst), get_field_imm5(inst)); break; case INST_TYPE_RD_RFSL: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", %s", op->name, get_field_rd(inst), get_field_rfsl(inst)); break; case INST_TYPE_R1_RFSL: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", %s", op->name, get_field_r1(inst), get_field_rfsl(inst)); break; case INST_TYPE_RD_SPECIAL: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", %s", op->name, get_field_rd(inst), get_field_special(inst,= op)); break; case INST_TYPE_SPECIAL_R1: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t%s, " PRIreg, op->name, get_field_special(inst, op), get_field_r1(i= nst)); break; case INST_TYPE_RD_R1: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg, op->name, get_field_rd(inst), get_field_r1(inst)); break; case INST_TYPE_R1_R2: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg, op->name, get_field_r1(inst), get_field_r2(inst)); break; case INST_TYPE_R1_IMM: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", %s", op->name, get_field_r1(inst), get_field_imm(inst)); /* * The non-pc relative instructions are returns, @@ -885,7 +877,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemb= le_info *info) } break; case INST_TYPE_RD_IMM: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", %s", op->name, get_field_rd(inst), get_field_imm(inst)); print_immval_addr(info, immfound, immval, inst, op->inst_offset_type =3D=3D INST_PC_OFFSET @@ -901,28 +893,28 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) } break; case INST_TYPE_RD_R2: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg, op->name, get_field_rd(inst), get_field_r2(inst)); break; case INST_TYPE_R2: - fprintf_func(stream, "%s\t%s", + fprintf_func(stream, "%s\t" PRIreg, op->name, get_field_r2(inst)); break; case INST_TYPE_R1: - fprintf_func(stream, "%s\t%s", + fprintf_func(stream, "%s\t" PRIreg, op->name, get_field_r1(inst)); break; case INST_TYPE_RD_R1_SPECIAL: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg, op->name, get_field_rd(inst), get_field_r2(inst)); break; case INST_TYPE_RD_IMM15: - fprintf_func(stream, "%s\t%s, %s", + fprintf_func(stream, "%s\t" PRIreg ", %s", op->name, get_field_rd(inst), get_field_imm15(inst)); break; /* For tuqula instruction */ case INST_TYPE_RD: - fprintf_func(stream, "%s\t%s", + fprintf_func(stream, "%s\t" PRIreg, op->name, get_field_rd(inst)); break; case INST_TYPE_RFSL: --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907466; cv=none; d=zohomail.com; s=zohoarc; b=YdUq8KDKzWcAfZrff1F2T5YKPEjCPw7fEzxyBOGa7s57SIcw+VZ1Rj72xsWH4CihS8yRcCLRskAsq4hu8lCU1D1eJ4ZK25QqkRil6WcgPg+76eFwHEIfQBKU2qgJ8UfvyTzLI0CWc2xSQL+b3xso/PbFnxPElOQK6+QUnOX84C0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907466; 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=P54+4fCIsAAc0bVMNSYixg4SDN1lDlZ7gzm2KMiAs9s=; b=cuhRJFXdlrqAVG+rQ0cUhBGyY1FArobLtmBzoL5Wygatuk7FAyMHfMowdfzs4AvIjMGHG6mFj3rhcSk+jXX/jcYcNH6Hd0ew1+3Ps0dcyMK7MIDu2DbAMwKG9OqTABTdnBVQkndOhI6hmTi1tk/63xm5KZxlC0gZnqZNlG1ARpc= 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 171290746614619.687972132441473; Fri, 12 Apr 2024 00:37:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQN-00076E-TS; Fri, 12 Apr 2024 03:34:15 -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 1rvBQJ-00074f-DW for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:11 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQB-0007CW-OL for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:08 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1e2bbc2048eso5649145ad.3 for ; Fri, 12 Apr 2024 00:34:02 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907242; x=1713512042; 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=P54+4fCIsAAc0bVMNSYixg4SDN1lDlZ7gzm2KMiAs9s=; b=tpTyIsUAm7ryE46ydOJ/Xkhlq+UQK7abWiVVTN4ACh6QckrdoU7LinmRUvs3KQ55hX AU3G37Sd1pi7CCrXnzoRFOimA7fFLOK9VmfuWzzUHdhY827SF0lb8ZlICVUrmfcPMFEH HeANxQxhI7EUDBNBPtLek0qzeRQdAcoZU0TRSB+EjI2P2/RNd1J9efiX74+B6TA090r0 P3XhgLyGx8g2RpKRXThMHwUxRH6flC+2CpzE87xKvmftviZI713yd6QTTAhL02z7I43N o6lEZGwTLWl2I6OcKjg9Z5TGuJj5oStDdNdjDwNNh4mYnvCVdWq3BtJMVHGU4n//T0mE 6vkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907242; x=1713512042; 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=P54+4fCIsAAc0bVMNSYixg4SDN1lDlZ7gzm2KMiAs9s=; b=aEiat/dY6DIswfjwmSHdTtPc3hlrwHwiOT1kDHp+q019rPXNU5iGZZ2e2WqEh+W8+2 yczGY0X89Dlzv4wyO28ClwkdDwKjXBcpW3XwfqiMkawU4okBBLQI1Y0rLdvdzkBQq97Y zEWCv3bAW2sWfgrUWYS6XzsjoGGJ6eE9gIq5ENqak400HVXhOH+IWwDbGt6ehkVaG2W/ fmj1V0AYWZBcCTey3rfrp/EvuVNo+fUwxbKm6+E8fkfZlxgsw8GxSFX4Wc5n5U+uM5a/ PTtIUgKAvelPRLdSOCVY1wVTg77PkHnmJ8HRrp4rp/lL1sO9OfVBR0UeUjcr1MuPYDs9 tXbg== X-Gm-Message-State: AOJu0YwoDtuF0khjGYoA/tjlVjjSYWR3IY+NalVbhuJtxZJlOEheMZTG qXrLNTOLPmlfMzMQx40GYWOdDjmRtdadOIu2McvxSc33sUY+9v44hmYQp6+K0WlMqYn30VyPMho Y X-Google-Smtp-Source: AGHT+IE1oYhWrgp0LI3qWXvHvH1elmh3v5JM9C+DsX4T2gEUqVSY1I0Oa6D2JXtYVkBXtmAuWgsOLQ== X-Received: by 2002:a17:903:228e:b0:1e3:c9f6:c4b with SMTP id b14-20020a170903228e00b001e3c9f60c4bmr2135075plh.10.1712907242144; Fri, 12 Apr 2024 00:34:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 18/27] disas/microblaze: Print immediates directly with PRIimm Date: Fri, 12 Apr 2024 00:33:37 -0700 Message-Id: <20240412073346.458116-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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: 1712907467230100008 Content-Type: text/plain; charset="utf-8" Use a printf format instead of sprintf into a buffer. Signed-off-by: Richard Henderson --- disas/microblaze.c | 61 +++++++++------------------------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index c12968f3b9..390f98c0a3 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -580,40 +580,21 @@ static const char pvr_register_prefix[] =3D "rpvr"; #include "disas/dis-asm.h" =20 #define PRIreg register_prefix "%ld" +#define PRIimm "%d" =20 #define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW) #define get_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) #define get_field_r2(instr) ((instr & RB_MASK) >> RB_LOW) +#define get_field_imm(instr) ((int16_t)instr) +#define get_field_imm5(instr) ((int)instr & IMM5_MASK) +#define get_field_imm15(instr) ((int)instr & IMM15_MASK) + #define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW) #define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) =20 /* Local function prototypes. */ =20 -static char * get_field_imm (long instr); -static char * get_field_imm5 (long instr); static char * get_field_rfsl (long instr); -static char * get_field_imm15 (long instr); -#if 0 -static char * get_field_unsigned_imm (long instr); -#endif - -static char * -get_field_imm (long instr) -{ - char tmpstr[25]; - snprintf(tmpstr, sizeof(tmpstr), "%d", - (short)((instr & IMM_MASK) >> IMM_LOW)); - return(strdup(tmpstr)); -} - -static char * -get_field_imm5 (long instr) -{ - char tmpstr[25]; - snprintf(tmpstr, sizeof(tmpstr), "%d", - (short)((instr & IMM5_MASK) >> IMM_LOW)); - return(strdup(tmpstr)); -} =20 static char * get_field_rfsl (long instr) @@ -624,26 +605,6 @@ get_field_rfsl (long instr) return(strdup(tmpstr)); } =20 -static char * -get_field_imm15 (long instr) -{ - char tmpstr[25]; - snprintf(tmpstr, sizeof(tmpstr), "%d", - (short)((instr & IMM15_MASK) >> IMM_LOW)); - return(strdup(tmpstr)); -} - -#if 0 -static char * -get_field_unsigned_imm (long instr) -{ - char tmpstr[25]; - snprintf(tmpstr, sizeof(tmpstr), "%d", - (int)((instr & IMM_MASK) >> IMM_LOW)); - return(strdup(tmpstr)); -} -#endif - /* char * get_field_special (instr)=20 @@ -829,7 +790,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemb= le_info *info) get_field_r2(inst)); break; case INST_TYPE_RD_R1_IMM: - fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", " PRIimm, op->name, get_field_rd(inst), get_field_r1(inst), get_field_imm(inst)); if (get_int_field_r1(inst) =3D=3D 0) { @@ -837,7 +798,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemb= le_info *info) } break; case INST_TYPE_RD_R1_IMM5: - fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", " PRIimm, op->name, get_field_rd(inst), get_field_r1(inst), get_field_imm5(inst)); break; @@ -866,7 +827,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemb= le_info *info) op->name, get_field_r1(inst), get_field_r2(inst)); break; case INST_TYPE_R1_IMM: - fprintf_func(stream, "%s\t" PRIreg ", %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIimm, op->name, get_field_r1(inst), get_field_imm(inst)); /* * The non-pc relative instructions are returns, @@ -877,14 +838,14 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) } break; case INST_TYPE_RD_IMM: - fprintf_func(stream, "%s\t" PRIreg ", %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIimm, op->name, get_field_rd(inst), get_field_imm(inst)); print_immval_addr(info, immfound, immval, inst, op->inst_offset_type =3D=3D INST_PC_OFFSET ? memaddr : 0); break; case INST_TYPE_IMM: - fprintf_func(stream, "%s\t%s", + fprintf_func(stream, "%s\t" PRIimm, op->name, get_field_imm(inst)); if (op->instr !=3D imm) { print_immval_addr(info, immfound, immval, inst, @@ -909,7 +870,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemb= le_info *info) op->name, get_field_rd(inst), get_field_r2(inst)); break; case INST_TYPE_RD_IMM15: - fprintf_func(stream, "%s\t" PRIreg ", %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIimm, op->name, get_field_rd(inst), get_field_imm15(inst)); break; /* For tuqula instruction */ --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907475; cv=none; d=zohomail.com; s=zohoarc; b=Nfmf7+DQeeUf2khroMkkB7jrGS5++eRy8tIn1oDkZAMJCybBPguIRMTCTrEI2i4KOVOD6gN8+N3+J4Qdf8EnjEtQdFktyIYhdfkiu1hgCyK2a8jfSvrlk6vGHi75D4HbhkctaBp1dblbM7OKBkDac256jjkEXWgYwQYWOY38dgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907475; 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=hxqYH9ScX+ObdWXnIbuV9Gxb9Me9BqWqhyTqw11fwnA=; b=MdsOFpglhfWPspiT9oQikG74f6Sc5xcM9gDSWiiVRiNCVXfsJpWnTgSwunZDyhuV/4e05+agYK7+ZIxGd1LQHWJ1qnw2fq8TDGaAbnedn6oSKtwZLR4FNTKC270ffzwiSzUv708t4x+flqyqrdFy3k5BKH5aZ1J5ke52p0vN2Kg= 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 1712907475300201.49095223939162; Fri, 12 Apr 2024 00:37:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQQ-000779-0m; Fri, 12 Apr 2024 03:34:18 -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 1rvBQJ-00074i-Du for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:11 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQE-0007Ca-KR for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:08 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-6eaf1005fcaso453921b3a.3 for ; Fri, 12 Apr 2024 00:34:03 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907243; x=1713512043; 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=hxqYH9ScX+ObdWXnIbuV9Gxb9Me9BqWqhyTqw11fwnA=; b=YLihk81p1f8ULXc1LC+UchZQm94JPAgc/rpzZlnVbZtOBpyvxt0CwMJ7yI02ycPW+O LCtxUvdS34kEJUPjzx58Usnje/qM1ERTnW0mWJasTZADnSVl7YNI1oYF1DZuIwMFCwWS ut8uCET6yysqMLyL4+NJuiMykOh1qxksr5rp7hGHl49ArS6P9UTLouR4fIWUMsn4Uixo ktLS8oor/y3DYla3s7Ay7NpbfG0a+Xj71pmIYCO5cPzF/VuWMNYukwwyF/njyxk6k0p3 9v8s2gWwg2GUoc2z0P3lWq/HyzxcfiBQKOPemN7rtypy8Dw7Sl27DQlTVQB7GzRFO9Dj jmDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907243; x=1713512043; 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=hxqYH9ScX+ObdWXnIbuV9Gxb9Me9BqWqhyTqw11fwnA=; b=fFyiTD0MZAlSWJhDXTTAfhVKehEfWhjrh5sXbVykmR2JqnlcUi7ZfWr46hLdiZpYyS kQAdkirzf6pB6zNc2CdN+v8HDVIvmr9iS9yM2bi83tqMDUGjDjoPFSKPCdlBDg64xSAw CidHmA2grudVut5gsHb9kj+PmrNcbkvEd6n1MIjT09upeqyu6C/lkJF+xCDCxkdysZmf 6DCzdfizY4aJzgYO175w9d83PfnKfTGDKtIK5pKCIx9crqVDRgKXLpeqYisKKiq4U5Ui Cg4iKr3Pj2BJEKw0mcRvlFhanP6picGBQmFsDmGizDPJs3klPMrE/4FgWFQpP7k33ee0 NSTg== X-Gm-Message-State: AOJu0YysYVs3EC7w/RF0rSJPKxbuFAHdscyZDyQsuuK/z66QB116Bl8N axHKI64tskcUqnRyaYE979augtlP6FLkCaKxvgom4eIXSJVRGNjSNNJ8p9kitlH39o6vdVeJSLq H X-Google-Smtp-Source: AGHT+IG8xFWTsqZpvJOr8FNcJtmqVAqBpE/VPvTBIuYknSeZnAJRqpwFwfmT/ZwpInf59fU9MvTrGA== X-Received: by 2002:a05:6a21:6d9a:b0:1a7:4867:7301 with SMTP id wl26-20020a056a216d9a00b001a748677301mr2179010pzb.5.1712907242824; Fri, 12 Apr 2024 00:34:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 19/27] disas/microblaze: Print registers directly with PRIrfsl Date: Fri, 12 Apr 2024 00:33:38 -0700 Message-Id: <20240412073346.458116-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.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: 1712907477238100001 Content-Type: text/plain; charset="utf-8" Use a printf format instead of sprintf into a buffer. Signed-off-by: Richard Henderson --- disas/microblaze.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index 390f98c0a3..24febfdea9 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -564,7 +564,6 @@ static const struct op_code_struct { =20 /* prefix for register names */ #define register_prefix "r" -static const char fsl_register_prefix[] =3D "rfsl"; static const char pvr_register_prefix[] =3D "rpvr"; =20 =20 @@ -580,11 +579,13 @@ static const char pvr_register_prefix[] =3D "rpvr"; #include "disas/dis-asm.h" =20 #define PRIreg register_prefix "%ld" +#define PRIrfsl register_prefix "fsl%ld" #define PRIimm "%d" =20 #define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW) #define get_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) #define get_field_r2(instr) ((instr & RB_MASK) >> RB_LOW) +#define get_field_rfsl(instr) (instr & RFSL_MASK) #define get_field_imm(instr) ((int16_t)instr) #define get_field_imm5(instr) ((int)instr & IMM5_MASK) #define get_field_imm15(instr) ((int)instr & IMM15_MASK) @@ -592,19 +593,6 @@ static const char pvr_register_prefix[] =3D "rpvr"; #define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW) #define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) =20 -/* Local function prototypes. */ - -static char * get_field_rfsl (long instr); - -static char * -get_field_rfsl (long instr) -{ - char tmpstr[25]; - snprintf(tmpstr, sizeof(tmpstr), "%s%d", fsl_register_prefix, - (short)((instr & RFSL_MASK) >> IMM_LOW)); - return(strdup(tmpstr)); -} - /* char * get_field_special (instr)=20 @@ -803,11 +791,11 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) get_field_imm5(inst)); break; case INST_TYPE_RD_RFSL: - fprintf_func(stream, "%s\t" PRIreg ", %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIrfsl, op->name, get_field_rd(inst), get_field_rfsl(inst)); break; case INST_TYPE_R1_RFSL: - fprintf_func(stream, "%s\t" PRIreg ", %s", + fprintf_func(stream, "%s\t" PRIreg ", " PRIrfsl, op->name, get_field_r1(inst), get_field_rfsl(inst)); break; case INST_TYPE_RD_SPECIAL: @@ -879,7 +867,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemb= le_info *info) op->name, get_field_rd(inst)); break; case INST_TYPE_RFSL: - fprintf_func(stream, "%s\t%s", + fprintf_func(stream, "%s\t" PRIrfsl, op->name, get_field_rfsl(inst)); break; default: --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907361; cv=none; d=zohomail.com; s=zohoarc; b=jlxkOc3AH6V1F0Dj4EKAc/Voa2pNkUYKfn6KsHb9raguLe6jPrtkxkETjZ8yu/g94/I/yy5Z5xmV+ddqbOqb3azKNM+hsCIFr8wrWvSwhkaAf6uHAj+mdB667xk3huZ9DW1FFr3p4djW277GUpyjFJ1lFA7OkHxKN+MOZozDaxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907361; 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=AgGhBfcq1sGSX/QZG2Od2RrYyCzuXj5RVatE7xiS5E8=; b=ECMztTFeahfbda9KmtNdkJ0jSX8JGALAOSrHu2knsPLn18X8DPp6IDUHaqDcHKkcGmDZXSxjTAgzmO6XwJN7a4Lxi8ZVoGh/I1kCQhh1KcXzeXRK8LkBr4AlHHccONBPCqKBsGZ0rArfiGa8XX4dmjzv69AbhEILA1N1srsm34c= 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 1712907361541111.95054749229416; Fri, 12 Apr 2024 00:36:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQS-00078X-QI; Fri, 12 Apr 2024 03:34:20 -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 1rvBQJ-00074h-Dz for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:11 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQF-0007Cq-D1 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:09 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1e455b630acso3259765ad.1 for ; Fri, 12 Apr 2024 00:34:06 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907243; x=1713512043; 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=AgGhBfcq1sGSX/QZG2Od2RrYyCzuXj5RVatE7xiS5E8=; b=gLxsOA2WwL0b9xr/Ux4/Tu3GoGnidWSQfSXUdei1Y06Ri1HwtzKfDosvL+6eNVO0lj Q9azJiPq5r4ZezMZTYX/IeX9GtX+/EGNENs8Rjh1oYDDSQdlD4u271AG+BlyrPfNcMCH U4SIHMMOs2VmYKW4zRWhRt4qjQiCxS7lNOmHefn7pTjonGNo1mFfHKxM5CjkiZQIU8v6 5/NL57Cv3/PvsMErOEd4Xmkg+CGAhZhqYIWpMLMVyD5YV2QeUmJN7MGrMyC4w+ocnNW2 rUAwQ2j5sTiuC6uY2PwQrE5jwByYI40lS1ZxCc9bZPuZu3eOGpwPzRQg+dsWO7ndD3LK Nz2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907243; x=1713512043; 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=AgGhBfcq1sGSX/QZG2Od2RrYyCzuXj5RVatE7xiS5E8=; b=HGuQNV7K8/vH1j6JsB8LhE49x82e/V48y8mLLlVu+PsRPedOEL0BRiIO1pK/kUKpGd xsjpjjnbiSrjuHJIAjmdL2aiOtXquqi/gJOuL1V4UhukHJTwo+YA188lilwQjo6SAJpf Gmx3v+E6ddpDbb1KGX0JbeLA1MiZWd7rR/P4LpyAN2GThLsZZu7e1MsEJ/H1CdbegSIZ tVnU1hiScrzwdBSqYFxdaJBtq4lLNqUeA5V43iwKbuAEkavSrhQYUK1wWl/947UdpI4p 0MmZWoXb/U1kLzOVdO+EnDPOMJmSFYJzu1qOwVifzKeaXrkoLXYsJyeaEkW2nM8h6N+t W6mw== X-Gm-Message-State: AOJu0Yx9FTrxWgIb8AcztSlM5OLLJfvYP7yp7U+Dw2QZGIAHCdSad/58 egJZyOA8wAcB1UdcspdXbIjoVhcnfZyyJTIc9hAHOtbhQ14QlR3mNk08teWoWBSmRmJOexWCnUq W X-Google-Smtp-Source: AGHT+IEId0spMx11GxYKMczs8l5n5n6AUD8ut89Y7HlXKlEQYtjr6c1vE4SbGbpk/4fWvMuC20W8Cg== X-Received: by 2002:a17:902:f545:b0:1e2:6b5d:5b18 with SMTP id h5-20020a170902f54500b001e26b5d5b18mr1965285plf.51.1712907243634; Fri, 12 Apr 2024 00:34:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 20/27] disas/microblaze: Split get_field_special Date: Fri, 12 Apr 2024 00:33:39 -0700 Message-Id: <20240412073346.458116-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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: 1712907362923100011 Content-Type: text/plain; charset="utf-8" Extract the raw special index and a function to lookup a name. Signed-off-by: Richard Henderson --- disas/microblaze.c | 142 +++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 81 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index 24febfdea9..197327fae4 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -564,8 +564,6 @@ static const struct op_code_struct { =20 /* prefix for register names */ #define register_prefix "r" -static const char pvr_register_prefix[] =3D "rpvr"; - =20 /* #defines for valid immediate range */ #define MIN_IMM ((int) 0x80000000) @@ -580,6 +578,7 @@ static const char pvr_register_prefix[] =3D "rpvr"; =20 #define PRIreg register_prefix "%ld" #define PRIrfsl register_prefix "fsl%ld" +#define PRIpvr register_prefix "pvr%d" #define PRIimm "%d" =20 #define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW) @@ -593,83 +592,48 @@ static const char pvr_register_prefix[] =3D "rpvr"; #define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW) #define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) =20 -/* - char * - get_field_special (instr)=20 - long instr; - { - char tmpstr[25]; - =20 - snprintf(tmpstr, sizeof(tmpstr), "%s%s", register_prefix, - (((instr & IMM_MASK) >> IMM_LOW) & REG_MSR_MASK) =3D=3D 0 ? "pc"= : "msr"); - =20 - return(strdup(tmpstr)); - } -*/ - -static char * -get_field_special(long instr, const struct op_code_struct *op) +static int get_field_special(long instr, const struct op_code_struct *op) { - char tmpstr[25]; - char spr[6]; + return ((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask; +} =20 - switch ( (((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask) ) { - - case REG_MSR_MASK : - strcpy(spr, "msr"); - break; - case REG_PC_MASK : - strcpy(spr, "pc"); - break; - case REG_EAR_MASK : - strcpy(spr, "ear"); - break; - case REG_ESR_MASK : - strcpy(spr, "esr"); - break; - case REG_FSR_MASK : - strcpy(spr, "fsr"); - break; - case REG_BTR_MASK : - strcpy(spr, "btr"); - break; =20 - case REG_EDR_MASK : - strcpy(spr, "edr"); - break; - case REG_PID_MASK : - strcpy(spr, "pid"); - break; - case REG_ZPR_MASK : - strcpy(spr, "zpr"); - break; - case REG_TLBX_MASK : - strcpy(spr, "tlbx"); - break; - case REG_TLBLO_MASK : - strcpy(spr, "tlblo"); - break; - case REG_TLBHI_MASK : - strcpy(spr, "tlbhi"); - break; - case REG_TLBSX_MASK : - strcpy(spr, "tlbsx"); - break; - default : - { - if ( ((((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask) & 0xE000)= =3D=3D REG_PVR_MASK) { - snprintf(tmpstr, sizeof(tmpstr), "%s%u", pvr_register_prefix, - (unsigned short)(((instr & IMM_MASK) >> IMM_LOW) ^ - op->immval_mask) ^ REG_PVR_MASK); - return(strdup(tmpstr)); - } else { - strcpy(spr, "pc"); - } - } - break; - } - =20 - snprintf(tmpstr, sizeof(tmpstr), "%s%s", register_prefix, spr); - return(strdup(tmpstr)); +/* Returns NULL for PVR registers, which should be rendered differently. */ +static const char *get_special_name(int special) +{ + switch (special) { + case REG_MSR_MASK: + return register_prefix "msr"; + case REG_PC_MASK: + return register_prefix "pc"; + case REG_EAR_MASK: + return register_prefix "ear"; + case REG_ESR_MASK: + return register_prefix "esr"; + case REG_FSR_MASK: + return register_prefix "fsr"; + case REG_BTR_MASK: + return register_prefix "btr"; + case REG_EDR_MASK: + return register_prefix "edr"; + case REG_PID_MASK: + return register_prefix "pid"; + case REG_ZPR_MASK: + return register_prefix "zpr"; + case REG_TLBX_MASK: + return register_prefix "tlbx"; + case REG_TLBLO_MASK: + return register_prefix "tlblo"; + case REG_TLBHI_MASK: + return register_prefix "tlbhi"; + case REG_TLBSX_MASK: + return register_prefix "tlbsx"; + default: + if ((special & 0xE000) =3D=3D REG_PVR_MASK) { + /* pvr register */ + return NULL; + } + return register_prefix "pc"; + } } =20 static unsigned long @@ -739,6 +703,8 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemb= le_info *info) static bfd_vma prev_insn_addr =3D -1; /*init the prev insn addr */ static int prev_insn_vma =3D -1; /*init the prev insn vma */ int curr_insn_vma =3D info->buffer_vma; + int special; + const char *special_name; =20 info->bytes_per_chunk =3D 4; =20 @@ -799,12 +765,26 @@ print_insn_microblaze(bfd_vma memaddr, struct disasse= mble_info *info) op->name, get_field_r1(inst), get_field_rfsl(inst)); break; case INST_TYPE_RD_SPECIAL: - fprintf_func(stream, "%s\t" PRIreg ", %s", - op->name, get_field_rd(inst), get_field_special(inst,= op)); + special =3D get_field_special(inst, op); + special_name =3D get_special_name(special); + if (special_name) { + fprintf_func(stream, "%s\t" PRIreg ", %s", + op->name, get_field_rd(inst), special_name); + } else { + fprintf_func(stream, "%s\t" PRIreg ", " PRIpvr, + op->name, get_field_rd(inst), special ^ REG_PVR_M= ASK); + } break; case INST_TYPE_SPECIAL_R1: - fprintf_func(stream, "%s\t%s, " PRIreg, - op->name, get_field_special(inst, op), get_field_r1(i= nst)); + special =3D get_field_special(inst, op); + special_name =3D get_special_name(special); + if (special_name) { + fprintf_func(stream, "%s\t%s, " PRIreg, + op->name, special_name, get_field_r1(inst)); + } else { + fprintf_func(stream, "%s\t" PRIpvr ", " PRIreg, + op->name, special ^ REG_PVR_MASK, get_field_r1(in= st)); + } break; case INST_TYPE_RD_R1: fprintf_func(stream, "%s\t" PRIreg ", " PRIreg, --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907484; cv=none; d=zohomail.com; s=zohoarc; b=HdXqMzrnOB1yBZINslmOx+t/6kYNMj0WXCgDsEqwLxsqc3qV2I7w3xQztgA9/OpGh5Q+t+SpknX68jji2s0YWMYB9+tL4Y3GEgJ9xz55vHsf0Mp2Ts+FqcNFonbbm7MQCTKQbm99vxOqCTYc7abX1cla1KJwsFOKx9ArWbqWGHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907484; 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=smvoXLUw3BuxX5tHBSXGd4u7jZ3WHwKVh8sT00cge+w=; b=nQRSLSKxrFVTUXu+qNcGQibkI59FI5XS9m7+UU95rS1+E/Br7M3n24HxCzt8UFe2wDcw+RY8EBkCAvjtLFowWVqcdR0F5+oFn3e+Tnjngh+cOov6/dPqgKRj5TlF7BbBsB7MrRM8RjzodhYXesK6YDuPdmMgWHdFh7KlFerRPYs= 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 171290748421878.91245110825594; Fri, 12 Apr 2024 00:38:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQQ-00077F-DB; Fri, 12 Apr 2024 03:34:18 -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 1rvBQJ-00074j-Ei for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:11 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQF-0007Cu-Cj for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:10 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1e2232e30f4so6022085ad.2 for ; Fri, 12 Apr 2024 00:34:06 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907244; x=1713512044; 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=smvoXLUw3BuxX5tHBSXGd4u7jZ3WHwKVh8sT00cge+w=; b=He7mBsOGO8bYHOXKdPQPilPQG/SMoHzYldeUkD0YGCPfemutEvf9WpsdGoFwud7097 Qoy0U1YO/LePYKvBBtlzeahL9/SFAoT0Mde9EcGDGicb8lWx6TR9qdMJ+0hsMy6NeYiR 3qbQC6dLIz08v+MbfnkrZRPe17wc8gY22Sdh4cQLszSwFCJ0LrLVzalGHz+uDPW31mA5 HxMsyTmKGFLAU6pU8SX66arHKEQdw/A3A5fWvLqpIVTd0wPAky+0Sq75sN07SJz0xoKE kYqXR/Vdyl6y9ciCUEzNtnJCYthT+G2s7TTd0I2qqmPWEh/OIJ35rSBy4C+Inruc+h/a ht/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907244; x=1713512044; 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=smvoXLUw3BuxX5tHBSXGd4u7jZ3WHwKVh8sT00cge+w=; b=nqPfdjmQD05RN/s4Ra7V1jjhoIjxDhIbjnoMaI3BRl1Ozph/fNNqy6aiXV0dWgZG24 6q3l6F0Bml9dyAPtcVyy5st6/GZtWbl+/w8ASFVxBhyH9hkLDJKNeOSG7TeD+KAnbGLa Vctb4cAeiICk4hqpoccPvPrDwRFExDxoEjoGchW3nZwwp0tnJNp2RXZt/09WjQws3AUS xHdXfy5wZQAfv67mC1sblxSf21vH59GUV4gVIjxld838QJ4PaXnD/h3saybm+Dt5ZEgQ toTSi+DsMJUuRjNFq+tJv/dGt1oV5F0Q/c8NH4w/J57ekxZ5mxRRFmDQqUSyNCOBtljQ nXPA== X-Gm-Message-State: AOJu0Yx/Qf0yX2rh893H9xYIOBWTAAk6FvkvLZiE5OXTYdADDv/t0JI6 EVNTUM2+hPdEWeTlXeMPDDkCHrvPXAKPapDwiXkJ+BlNLtTCerLnsbqecJy48UaHHmUtztxs8pd x X-Google-Smtp-Source: AGHT+IGPEyDX9nG5og3+3CIWvpV8937VL3jfHqBq8N1bYBXa284gsyifIO6NPa+FteOSTKsMCgsDrA== X-Received: by 2002:a17:902:654b:b0:1e2:578:2c32 with SMTP id d11-20020a170902654b00b001e205782c32mr1743224pln.0.1712907244487; Fri, 12 Apr 2024 00:34:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 21/27] disas/riscv: Use GString in format_inst Date: Fri, 12 Apr 2024 00:33:40 -0700 Message-Id: <20240412073346.458116-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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: 1712907485287100005 Content-Type: text/plain; charset="utf-8" Allocate and fill a GString instead of snprintf and appending to a fixed sized buffer. Signed-off-by: Richard Henderson --- disas/riscv.c | 209 ++++++++++++++++++++++---------------------------- 1 file changed, 92 insertions(+), 117 deletions(-) diff --git a/disas/riscv.c b/disas/riscv.c index e236c8b5b7..f60f9bda43 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -4757,272 +4757,249 @@ static size_t inst_length(rv_inst inst) =20 /* format instruction */ =20 -static void append(char *s1, const char *s2, size_t n) -{ - size_t l1 =3D strlen(s1); - if (n - l1 - 1 > 0) { - strncat(s1, s2, n - l1); - } -} - -static void format_inst(char *buf, size_t buflen, size_t tab, rv_decode *d= ec) +static GString *format_inst(size_t tab, rv_decode *dec) { const rv_opcode_data *opcode_data =3D dec->opcode_data; - char tmp[64]; + GString *buf =3D g_string_sized_new(64); const char *fmt; =20 fmt =3D opcode_data[dec->op].format; while (*fmt) { switch (*fmt) { case 'O': - append(buf, opcode_data[dec->op].name, buflen); + g_string_append(buf, opcode_data[dec->op].name); break; case '(': - append(buf, "(", buflen); - break; case ',': - append(buf, ",", buflen); - break; case ')': - append(buf, ")", buflen); - break; case '-': - append(buf, "-", buflen); + g_string_append_c(buf, *fmt); break; case 'b': - snprintf(tmp, sizeof(tmp), "%d", dec->bs); - append(buf, tmp, buflen); + g_string_append_printf(buf, "%d", dec->bs); break; case 'n': - snprintf(tmp, sizeof(tmp), "%d", dec->rnum); - append(buf, tmp, buflen); + g_string_append_printf(buf, "%d", dec->rnum); break; case '0': - append(buf, rv_ireg_name_sym[dec->rd], buflen); + g_string_append(buf, rv_ireg_name_sym[dec->rd]); break; case '1': - append(buf, rv_ireg_name_sym[dec->rs1], buflen); + g_string_append(buf, rv_ireg_name_sym[dec->rs1]); break; case '2': - append(buf, rv_ireg_name_sym[dec->rs2], buflen); + g_string_append(buf, rv_ireg_name_sym[dec->rs2]); break; case '3': - append(buf, dec->cfg->ext_zfinx ? rv_ireg_name_sym[dec->rd] : - rv_freg_name_sym[dec->rd], - buflen); + if (dec->cfg->ext_zfinx) { + g_string_append(buf, rv_ireg_name_sym[dec->rd]); + } else { + g_string_append(buf, rv_freg_name_sym[dec->rd]); + } break; case '4': - append(buf, dec->cfg->ext_zfinx ? rv_ireg_name_sym[dec->rs1] : - rv_freg_name_sym[dec->rs1], - buflen); + if (dec->cfg->ext_zfinx) { + g_string_append(buf, rv_ireg_name_sym[dec->rs1]); + } else { + g_string_append(buf, rv_freg_name_sym[dec->rs1]); + } break; case '5': - append(buf, dec->cfg->ext_zfinx ? rv_ireg_name_sym[dec->rs2] : - rv_freg_name_sym[dec->rs2], - buflen); + if (dec->cfg->ext_zfinx) { + g_string_append(buf, rv_ireg_name_sym[dec->rs2]); + } else { + g_string_append(buf, rv_freg_name_sym[dec->rs2]); + } break; case '6': - append(buf, dec->cfg->ext_zfinx ? rv_ireg_name_sym[dec->rs3] : - rv_freg_name_sym[dec->rs3], - buflen); + if (dec->cfg->ext_zfinx) { + g_string_append(buf, rv_ireg_name_sym[dec->rs3]); + } else { + g_string_append(buf, rv_freg_name_sym[dec->rs3]); + } break; case '7': - snprintf(tmp, sizeof(tmp), "%d", dec->rs1); - append(buf, tmp, buflen); + g_string_append_printf(buf, "%d", dec->rs1); break; case 'i': - snprintf(tmp, sizeof(tmp), "%d", dec->imm); - append(buf, tmp, buflen); + g_string_append_printf(buf, "%d", dec->imm); break; case 'u': - snprintf(tmp, sizeof(tmp), "%u", ((uint32_t)dec->imm & 0b11111= 1)); - append(buf, tmp, buflen); + g_string_append_printf(buf, "%u", ((uint32_t)dec->imm & 0b1111= 11)); break; case 'j': - snprintf(tmp, sizeof(tmp), "%d", dec->imm1); - append(buf, tmp, buflen); + g_string_append_printf(buf, "%d", dec->imm1); break; case 'o': - snprintf(tmp, sizeof(tmp), "%d", dec->imm); - append(buf, tmp, buflen); - while (strlen(buf) < tab * 2) { - append(buf, " ", buflen); + g_string_append_printf(buf, "%d", dec->imm); + while (buf->len < tab * 2) { + g_string_append_c(buf, ' '); } - snprintf(tmp, sizeof(tmp), "# 0x%" PRIx64, - dec->pc + dec->imm); - append(buf, tmp, buflen); + g_string_append_printf(buf, "# 0x%" PRIx64, dec->pc + dec->imm= ); break; case 'U': fmt++; - snprintf(tmp, sizeof(tmp), "%d", dec->imm >> 12); - append(buf, tmp, buflen); + g_string_append_printf(buf, "%d", dec->imm >> 12); if (*fmt =3D=3D 'o') { - while (strlen(buf) < tab * 2) { - append(buf, " ", buflen); + while (buf->len < tab * 2) { + g_string_append_c(buf, ' '); } - snprintf(tmp, sizeof(tmp), "# 0x%" PRIx64, - dec->pc + dec->imm); - append(buf, tmp, buflen); + g_string_append_printf(buf, "# 0x%" PRIx64, dec->pc + dec-= >imm); } break; case 'c': { const char *name =3D csr_name(dec->imm & 0xfff); if (name) { - append(buf, name, buflen); + g_string_append(buf, name); } else { - snprintf(tmp, sizeof(tmp), "0x%03x", dec->imm & 0xfff); - append(buf, tmp, buflen); + g_string_append_printf(buf, "0x%03x", dec->imm & 0xfff); } break; } case 'r': switch (dec->rm) { case rv_rm_rne: - append(buf, "rne", buflen); + g_string_append(buf, "rne"); break; case rv_rm_rtz: - append(buf, "rtz", buflen); + g_string_append(buf, "rtz"); break; case rv_rm_rdn: - append(buf, "rdn", buflen); + g_string_append(buf, "rdn"); break; case rv_rm_rup: - append(buf, "rup", buflen); + g_string_append(buf, "rup"); break; case rv_rm_rmm: - append(buf, "rmm", buflen); + g_string_append(buf, "rmm"); break; case rv_rm_dyn: - append(buf, "dyn", buflen); + g_string_append(buf, "dyn"); break; default: - append(buf, "inv", buflen); + g_string_append(buf, "inv"); break; } break; case 'p': if (dec->pred & rv_fence_i) { - append(buf, "i", buflen); + g_string_append_c(buf, 'i'); } if (dec->pred & rv_fence_o) { - append(buf, "o", buflen); + g_string_append_c(buf, 'o'); } if (dec->pred & rv_fence_r) { - append(buf, "r", buflen); + g_string_append_c(buf, 'r'); } if (dec->pred & rv_fence_w) { - append(buf, "w", buflen); + g_string_append_c(buf, 'w'); } break; case 's': if (dec->succ & rv_fence_i) { - append(buf, "i", buflen); + g_string_append_c(buf, 'i'); } if (dec->succ & rv_fence_o) { - append(buf, "o", buflen); + g_string_append_c(buf, 'o'); } if (dec->succ & rv_fence_r) { - append(buf, "r", buflen); + g_string_append_c(buf, 'r'); } if (dec->succ & rv_fence_w) { - append(buf, "w", buflen); + g_string_append_c(buf, 'w'); } break; case '\t': - while (strlen(buf) < tab) { - append(buf, " ", buflen); + while (buf->len < tab) { + g_string_append_c(buf, ' '); } break; case 'A': if (dec->aq) { - append(buf, ".aq", buflen); + g_string_append(buf, ".aq"); } break; case 'R': if (dec->rl) { - append(buf, ".rl", buflen); + g_string_append(buf, ".rl"); } break; case 'l': - append(buf, ",v0", buflen); + g_string_append(buf, ",v0"); break; case 'm': if (dec->vm =3D=3D 0) { - append(buf, ",v0.t", buflen); + g_string_append(buf, ",v0.t"); } break; case 'D': - append(buf, rv_vreg_name_sym[dec->rd], buflen); + g_string_append(buf, rv_vreg_name_sym[dec->rd]); break; case 'E': - append(buf, rv_vreg_name_sym[dec->rs1], buflen); + g_string_append(buf, rv_vreg_name_sym[dec->rs1]); break; case 'F': - append(buf, rv_vreg_name_sym[dec->rs2], buflen); + g_string_append(buf, rv_vreg_name_sym[dec->rs2]); break; case 'G': - append(buf, rv_vreg_name_sym[dec->rs3], buflen); + g_string_append(buf, rv_vreg_name_sym[dec->rs3]); break; case 'v': { - char nbuf[32] =3D {0}; const int sew =3D 1 << (((dec->vzimm >> 3) & 0b111) + 3); - sprintf(nbuf, "%d", sew); const int lmul =3D dec->vzimm & 0b11; const int flmul =3D (dec->vzimm >> 2) & 1; const char *vta =3D (dec->vzimm >> 6) & 1 ? "ta" : "tu"; const char *vma =3D (dec->vzimm >> 7) & 1 ? "ma" : "mu"; - append(buf, "e", buflen); - append(buf, nbuf, buflen); - append(buf, ",m", buflen); + + g_string_append_printf(buf, "e%d,m", sew); if (flmul) { switch (lmul) { case 3: - sprintf(nbuf, "f2"); + g_string_append(buf, "f2"); break; case 2: - sprintf(nbuf, "f4"); + g_string_append(buf, "f4"); break; case 1: - sprintf(nbuf, "f8"); - break; + g_string_append(buf, "f8"); + break; } - append(buf, nbuf, buflen); } else { - sprintf(nbuf, "%d", 1 << lmul); - append(buf, nbuf, buflen); + g_string_append_printf(buf, "%d", 1 << lmul); } - append(buf, ",", buflen); - append(buf, vta, buflen); - append(buf, ",", buflen); - append(buf, vma, buflen); + g_string_append_c(buf, ','); + g_string_append(buf, vta); + g_string_append_c(buf, ','); + g_string_append(buf, vma); break; } case 'x': { switch (dec->rlist) { case 4: - snprintf(tmp, sizeof(tmp), "{ra}"); + g_string_append(buf, "{ra}"); break; case 5: - snprintf(tmp, sizeof(tmp), "{ra, s0}"); + g_string_append(buf, "{ra, s0}"); break; case 15: - snprintf(tmp, sizeof(tmp), "{ra, s0-s11}"); + g_string_append(buf, "{ra, s0-s11}"); break; default: - snprintf(tmp, sizeof(tmp), "{ra, s0-s%d}", dec->rlist - 5); + g_string_append_printf(buf, "{ra, s0-s%d}", dec->rlist - 5= ); break; } - append(buf, tmp, buflen); break; } case 'h': - append(buf, rv_fli_name_const[dec->imm], buflen); + g_string_append(buf, rv_fli_name_const[dec->imm]); break; default: break; } fmt++; } + + return buf; } =20 /* lift instruction to pseudo-instruction */ @@ -5108,9 +5085,8 @@ static void decode_inst_decompress(rv_decode *dec, rv= _isa isa) =20 /* disassemble instruction */ =20 -static void -disasm_inst(char *buf, size_t buflen, rv_isa isa, uint64_t pc, rv_inst ins= t, - RISCVCPUConfig *cfg) +static GString *disasm_inst(rv_isa isa, uint64_t pc, rv_inst inst, + RISCVCPUConfig *cfg) { rv_decode dec =3D { 0 }; dec.pc =3D pc; @@ -5157,7 +5133,7 @@ disasm_inst(char *buf, size_t buflen, rv_isa isa, uin= t64_t pc, rv_inst inst, decode_inst_operands(&dec, isa); decode_inst_decompress(&dec, isa); decode_inst_lift_pseudo(&dec); - format_inst(buf, buflen, 24, &dec); + return format_inst(24, &dec); } =20 #define INST_FMT_2 "%04" PRIx64 " " @@ -5168,7 +5144,6 @@ disasm_inst(char *buf, size_t buflen, rv_isa isa, uin= t64_t pc, rv_inst inst, static int print_insn_riscv(bfd_vma memaddr, struct disassemble_info *info, rv_isa is= a) { - char buf[128] =3D { 0 }; bfd_byte packet[2]; rv_inst inst =3D 0; size_t len =3D 2; @@ -5209,9 +5184,9 @@ print_insn_riscv(bfd_vma memaddr, struct disassemble_= info *info, rv_isa isa) } } =20 - disasm_inst(buf, sizeof(buf), isa, memaddr, inst, - (RISCVCPUConfig *)info->target_info); - (*info->fprintf_func)(info->stream, "%s", buf); + g_autoptr(GString) str =3D + disasm_inst(isa, memaddr, inst, (RISCVCPUConfig *)info->target_inf= o); + (*info->fprintf_func)(info->stream, "%s", str->str); =20 return len; } --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907360; cv=none; d=zohomail.com; s=zohoarc; b=lQFa3z/3Nw9bCZuiddlomNy/vmRgg3KLOqXCG62X81VVdgPSB+29O40YGTXVk+PiRPNN9OMruXJZRZd5jkQDqMGvwoB1Vf76YP3wgMFcXR8YAey9ChEAc9JUARj2NWNuKUwLEq4HJcJaCqunvW4Q6tRNksdgy4FH1Mswqm7OQCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907360; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=SD4AFTXyCoH1gQiMjEXl2qngbfpinlSjJhmj7iTFm1s=; b=DyaRo7eod0yVUTmFiZDHAjHxhd/Lxnk0NmSZrcEHCbHrjV0bF6t8k52wgtGvoWMRg9EldY4iUBzhzmMNzRTf9q778HtjtiBNKfaFhehUPE3R0QcQ43I/6POzAQV0H8yiTMa5Rs5apR+1ejperrHRfp42nbx8rKrW5kUDy2yBTEA= 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 1712907360412112.65290434912049; Fri, 12 Apr 2024 00:36:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQO-00076F-Op; Fri, 12 Apr 2024 03:34:16 -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 1rvBQL-00075o-Lr for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:15 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQH-0007Cx-Bu for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:12 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6ecf3943040so590694b3a.0 for ; Fri, 12 Apr 2024 00:34:08 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907245; x=1713512045; darn=nongnu.org; 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=SD4AFTXyCoH1gQiMjEXl2qngbfpinlSjJhmj7iTFm1s=; b=d8kiwJ09tTOoem0RH9l2oMbxyLJKBTUoO0z3VB1eh9vG/Nwc2lCspwuLIMp3MlK3l0 1eKDaiUNHcUBYEdjXX8lTd/qT4Xm7TEGKThRtgFtulHFFQjyAdbkNjc0T/bWnPYY72yU aqvLOIh+l3yuFxzrPXXDvqAa/YqKqYZkzLsii2Ew0sM9Oy7vMP6yUKO6bxucpTESm4qu yJ/3z2nlKXuEtwzlkW/eFIebjPEdJmvd0+6AS6aTfVJ0/2golKD1IDbJfeR3S1Z7xX60 UX3Kp7TWE8ECkPwVmYbAfrH5rjYzI76SldtqpNSO9ZhJAdK26AI2CovzAh+eM3lc5Uw9 JykQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907245; x=1713512045; 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=SD4AFTXyCoH1gQiMjEXl2qngbfpinlSjJhmj7iTFm1s=; b=M6DPhfE1DJRWMa3M9akWKuVPvWbX7DZlsPGnCKlpTX77uaXSHeBrGLWF9+FZ86w/x6 CYIhDVx5WIIWkg6rcPLvP0or8rzD//qpwpxWFFago9m6iggqvmWQOBL0uvWS3Cy4qM+5 Tn1ydAeJDm9YIhA0d/CmL4JR4FhRS6k7286LTEfQKtifmh7onmBgRVKiB/qoJqB+49FH 385Ug6e7+Zi3R5m/lZB7sIRsxlmw9r2SjGNJpb3w6HEZj65zXc+9T/u4EnrHioAOhUsk VNFwWJAKHleo1sqIf0jjpGJf0WNEGGtZc1A+p4pMLfb7iEJTSoIaG6FhySgIU2VAaLms tnWA== X-Gm-Message-State: AOJu0Yxh0zmok7czmxzmoL75LIDFcZsF4nKlHlDQwzhP3sQx0pnt81eE yVSmDrrHDsChFBXcG0MS34NFe1Q9ZbNl3tvZ2Gvhz0abRbVSuUj9j/UbS0/5FWzqmmH3bVRI18Z j X-Google-Smtp-Source: AGHT+IGXw2bxDzoQnxtljKtVtj4Xto5md8qwPUVkUeCmEIb4oNB+jUeyCGUzB8/EZS/+BjjWWo0ceQ== X-Received: by 2002:a05:6300:630e:b0:1a7:a21b:66f9 with SMTP id jn14-20020a056300630e00b001a7a21b66f9mr1823376pzc.43.1712907245187; Fri, 12 Apr 2024 00:34:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 22/27] linux-user/flatload: Replace sprintf() by snprintf() Date: Fri, 12 Apr 2024 00:33:41 -0700 Message-Id: <20240412073346.458116-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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: 1712907360922100007 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1, resulting in painful developper experience. Use snprintf() instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20240411104340.6617-5-philmd@linaro.org> Signed-off-by: Richard Henderson --- linux-user/flatload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 5b62aa0a2b..1bb2f400bc 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -692,7 +692,7 @@ static int load_flat_shared_library(int id, struct lib_= info *libs) char buf[16]; =20 /* Create the file name */ - sprintf(buf, "/lib/lib%d.so", id); + snprintf(buf, sizeof(buf), "/lib/lib%d.so", id); =20 /* Open the file up */ bprm.filename =3D buf; --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907395; cv=none; d=zohomail.com; s=zohoarc; b=lthW6MGUxNbdUItao1Jdwht47eyJHTKMk84LVKCk6Q1LD6cjJWe+1quLRxvbsTncUvwKH9GIWl3NiLv0ZXIrxGbjmQON76hYBm/dbXTLnJRw1VUgCLkq/rrQDWrdd9yPuR8j4G67mE7D9yYV7zdHlgK6S+lLw9UzlX8N/UIh3xY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907395; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=Yt7XTd0PVkVIabRbeCb1YqLB6pmup83tW4MV6eKsa+A=; b=EzI7XP+g0d2bUOlEx3nL1TfieIWnC9LfJIPIDxa4U46px7AXgU6yGEyEPoNyXrEOs0Skbrbgk54StuMsi7Vof+suVCW0zR7Xj0lslDmb2QqeS+i3tfeWC9YMvb3lZ8jDMukZkyGU/Pb4Rr5rJ/7RC7f0SY4EkvZ+TGWnF67j79Y= 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 1712907394996870.0229046192007; Fri, 12 Apr 2024 00:36:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQN-00076D-Pm; Fri, 12 Apr 2024 03:34:15 -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 1rvBQJ-00074k-Et for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:11 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQF-0007D3-DV for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:09 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1e3cf5b171eso5656715ad.0 for ; Fri, 12 Apr 2024 00:34:06 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907246; x=1713512046; darn=nongnu.org; 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=Yt7XTd0PVkVIabRbeCb1YqLB6pmup83tW4MV6eKsa+A=; b=VHio1MKAPNeHvgol8km1xhIArWWaWECtb38vXpWymSJsrkFWe/vPWgbed1WmHv+7pl X5g92+qaFIhzCabPh9CC74SvhK1Pegae2GuZA65vAi4E7Qy4lMGxpk0NaeOeZ6dAvNz6 ewU0l2eudYVDUrOGHItGX0pLgVxZ9Gr1X/X+l4xs/UtKruO4R4vWgoaVIRu3lf5PAwox NlDV5hlTAMud5P3cHaX7TwFoAoj3YtSS/I3wiXpnv67Eac/5RXKblb3go3cRxeumeM8E U7IFXgXRrR3PqWTdlQLm1VDIpFzskm9wQDe5K3OlKAUijDcZEQ9JN8MRxA6i+E9WHfCR VwOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907246; x=1713512046; 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=Yt7XTd0PVkVIabRbeCb1YqLB6pmup83tW4MV6eKsa+A=; b=Fw3ZORSuFV0D3WtvxTFH1dNlpGip+CHLsrxU1OwLURivoHJCAnU2/2JgXcg/jzTeyy 5ies9edKA9cIh+9TSJ7RiX7Am5OTvQtWM7/gA/mxOQSFDi/46i7kmgv5M7ES7q/ICaDt aNksF66jsnGEimeQr810BaH5zdx2bf9jlvX+O9ctACUFRWqSMahkSxpkQq/Q4nJhIWpw ylzulcsGJlDfNpR9DkvRlsFCAG1GSsN35j/YpGdY52ldzLgs642kWDfjJw2w15fhD6KU DaqFPhSwWgH/k0YR/fVHMvJRyl7Uw1AAyjSLRnDTrB4mRmUGXHVIaUGrueo0re9o9piC ydYw== X-Gm-Message-State: AOJu0YxVbCoQcoOhsMIA9ekUF2gitc4AecQsUNMzNBcF8104TJk1IkGo Likpc6sVvb5w0kfNf5Hu9ayAWlQn/+LMBqEICNYlflWZDMDF8mQrGLKL9uRBqw9n6sb3RB8f24m W X-Google-Smtp-Source: AGHT+IFZL5JxsmgYd738dc7lGyEGmsx/XulierN2ofYZTndjeKdOPMYIh5tXEAGGufE49LMYwS+Y0w== X-Received: by 2002:a17:902:ebc4:b0:1e2:96d3:1bc1 with SMTP id p4-20020a170902ebc400b001e296d31bc1mr2001016plg.1.1712907245985; Fri, 12 Apr 2024 00:34:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v3 23/27] hw/misc/imx: Replace sprintf() by snprintf() Date: Fri, 12 Apr 2024 00:33:42 -0700 Message-Id: <20240412073346.458116-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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: 1712907397046100003 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1, resulting in painful developper experience. Use snprintf() instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Message-Id: <20240411104340.6617-6-philmd@linaro.org> Signed-off-by: Richard Henderson --- hw/misc/imx25_ccm.c | 2 +- hw/misc/imx31_ccm.c | 2 +- hw/misc/imx6_ccm.c | 4 ++-- hw/misc/imx6_src.c | 2 +- hw/misc/imx6ul_ccm.c | 4 ++-- hw/misc/imx7_src.c | 2 +- hw/net/imx_fec.c | 2 +- hw/ssi/imx_spi.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c index d888966014..faa726a86a 100644 --- a/hw/misc/imx25_ccm.c +++ b/hw/misc/imx25_ccm.c @@ -91,7 +91,7 @@ static const char *imx25_ccm_reg_name(uint32_t reg) case IMX25_CCM_LPIMR1_REG: return "lpimr1"; default: - sprintf(unknown, "[%u ?]", reg); + snprintf(unknown, sizeof(unknown), "[%u ?]", reg); return unknown; } } diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c index a9059bb1f7..125d4fceeb 100644 --- a/hw/misc/imx31_ccm.c +++ b/hw/misc/imx31_ccm.c @@ -89,7 +89,7 @@ static const char *imx31_ccm_reg_name(uint32_t reg) case IMX31_CCM_PDR2_REG: return "PDR2"; default: - sprintf(unknown, "[%u ?]", reg); + snprintf(unknown, sizeof(unknown), "[%u ?]", reg); return unknown; } } diff --git a/hw/misc/imx6_ccm.c b/hw/misc/imx6_ccm.c index 56489d8b57..b1def7f05b 100644 --- a/hw/misc/imx6_ccm.c +++ b/hw/misc/imx6_ccm.c @@ -85,7 +85,7 @@ static const char *imx6_ccm_reg_name(uint32_t reg) case CCM_CMEOR: return "CMEOR"; default: - sprintf(unknown, "%u ?", reg); + snprintf(unknown, sizeof(unknown), "%u ?", reg); return unknown; } } @@ -224,7 +224,7 @@ static const char *imx6_analog_reg_name(uint32_t reg) case USB_ANALOG_DIGPROG: return "USB_ANALOG_DIGPROG"; default: - sprintf(unknown, "%u ?", reg); + snprintf(unknown, sizeof(unknown), "%u ?", reg); return unknown; } } diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c index 0c6003559f..3766bdf561 100644 --- a/hw/misc/imx6_src.c +++ b/hw/misc/imx6_src.c @@ -68,7 +68,7 @@ static const char *imx6_src_reg_name(uint32_t reg) case SRC_GPR10: return "SRC_GPR10"; default: - sprintf(unknown, "%u ?", reg); + snprintf(unknown, sizeof(unknown), "%u ?", reg); return unknown; } } diff --git a/hw/misc/imx6ul_ccm.c b/hw/misc/imx6ul_ccm.c index bbc0be9921..0ac49ea34b 100644 --- a/hw/misc/imx6ul_ccm.c +++ b/hw/misc/imx6ul_ccm.c @@ -143,7 +143,7 @@ static const char *imx6ul_ccm_reg_name(uint32_t reg) case CCM_CMEOR: return "CMEOR"; default: - sprintf(unknown, "%u ?", reg); + snprintf(unknown, sizeof(unknown), "%u ?", reg); return unknown; } } @@ -274,7 +274,7 @@ static const char *imx6ul_analog_reg_name(uint32_t reg) case USB_ANALOG_DIGPROG: return "USB_ANALOG_DIGPROG"; default: - sprintf(unknown, "%u ?", reg); + snprintf(unknown, sizeof(unknown), "%u ?", reg); return unknown; } } diff --git a/hw/misc/imx7_src.c b/hw/misc/imx7_src.c index b3725ff6e7..d19f0450d4 100644 --- a/hw/misc/imx7_src.c +++ b/hw/misc/imx7_src.c @@ -75,7 +75,7 @@ static const char *imx7_src_reg_name(uint32_t reg) case SRC_GPR10: return "SRC_GPR10"; default: - sprintf(unknown, "%u ?", reg); + snprintf(unknown, sizeof(unknown), "%u ?", reg); return unknown; } } diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index cee84af7ba..8c91d20d44 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -41,7 +41,7 @@ static const char *imx_default_reg_name(IMXFECState *s, uint32_t index) { static char tmp[20]; - sprintf(tmp, "index %d", index); + snprintf(tmp, sizeof(tmp), "index %d", index); return tmp; } =20 diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c index d8a7583ff3..12d897d306 100644 --- a/hw/ssi/imx_spi.c +++ b/hw/ssi/imx_spi.c @@ -53,7 +53,7 @@ static const char *imx_spi_reg_name(uint32_t reg) case ECSPI_MSGDATA: return "ECSPI_MSGDATA"; default: - sprintf(unknown, "%u ?", reg); + snprintf(unknown, sizeof(unknown), "%u ?", reg); return unknown; } } --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907358; cv=none; d=zohomail.com; s=zohoarc; b=VbDo5pvcfkV0SoKOXqLl01Ejag6ubNuwmqxqWSN/JWj41ny765WNgsDKRA/Y2za5FTeiyI144HUdRD//U42Sj8uK2sD82W7ao7c1n0yF/otTqW4hVzGoKNOqUFf1GQIxAdTRSpjRPZu6Bi0+z8wNExuHThMWI65hrKiEMaYnoMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907358; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=wEe+ZpGNanZOUW1LiPHIpYdRRTuUQOyTjtk3qA26K5Y=; b=h81SZqQ47b6sOoVI2UWmhUyQ2Qx+y/jHiZutaVT4JWtxn/Tay7Or7ikz+Xer5TqrvMki/+qTED7UMxZtGoiGuAOI2ui6fm8Ysz5LCZ51K1vzre/5tD9fzFF+TH64ctg4NoDnob03i1o2q6OZ6rG7PJ9s51MNeDHdt9Ik3RTfSL4= 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 1712907358179489.93669768838765; Fri, 12 Apr 2024 00:35:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQS-00078V-MV; Fri, 12 Apr 2024 03:34:20 -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 1rvBQK-00075e-Qr for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:13 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQH-0007DE-A7 for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:12 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1e2c725e234so12523275ad.1 for ; Fri, 12 Apr 2024 00:34:07 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907247; x=1713512047; darn=nongnu.org; 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=wEe+ZpGNanZOUW1LiPHIpYdRRTuUQOyTjtk3qA26K5Y=; b=ju+CyyB8H/xP0uZt1P/D835pJdNc16qzsApQ9QFWceiOsBgAfjxqUgI8qCK1N5/TC+ idjaYceaQXRjQ1Stf3QLaHhK4OjXmdbwE8Jx+xm3mFhnZvOB8VklnGAplSGiTqR55wON 9MWVwH7qCf0Y+q2HqeEaTk6sHrmneLuiLbxkfTdvXcZJvk/HyXpgrYcGt9owRWgnSzE7 kBrHdECCAcQwvJhYkrqvP7zfF9U3FAJElwQhwQS53Ct8FhDbj8Muk5/aWtfSuWO7Zuf9 vB2LsFL3KWv17dtAZOMo3MF1SN2jJDDHoAzr2iO+xZ9bI7YOJYIFtKAgTnxC6JKXFAO9 qm7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907247; x=1713512047; 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=wEe+ZpGNanZOUW1LiPHIpYdRRTuUQOyTjtk3qA26K5Y=; b=RihPQAYOAdCIYXPkHdgJpkr/2x5XTaIH5NOzJiEmw0431EkW9qq/SJkQDIJIX5rXAA +yi+llV3lfL8nRnQ7Xndss3afYvlaPpWglXX19Df888iUcmV/Fk1+cSKiWWSbE7SASsB kox0NQC6sxrdEaOlcZZhGht4KNbKj20A4b2e5GyDXJfsuSpo0v5mX+g7tXlkqfKQjb2G 8BHk4QJE/XoJIPF5yMeAet9Mma7fY9Qbl0zOQpBrb5ZtZqTfrusgtHEQyFRgEdaLxwKw 7NLLrCU/+H2NSLzkdyvYvmPNyQZEIJPsWYdJDsuYlHtt0CCsJNF/tyaXN0+/x/drzPTx h2/Q== X-Gm-Message-State: AOJu0YxQunpUGjeAlRJQwtaZ1uXONBJVxQLlGN6SUrU2PBGFz0mXjNkW +UtN0bvDbxq/+c/74SOYpYloQ5BKaSYKB9p4URGYmB9GvvgqN0SugjDYUWMlYLe7kaOhcH5zTbs u X-Google-Smtp-Source: AGHT+IHuhVGrq5n4NjaSxaRQ/0l1Q0QggKAXcrQ88ciRNKUE+1o+eK1PiluK8d47FhBNrnOPAmQ28w== X-Received: by 2002:a17:902:e542:b0:1e4:320b:4311 with SMTP id n2-20020a170902e54200b001e4320b4311mr6221348plf.34.1712907246671; Fri, 12 Apr 2024 00:34:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 24/27] hw/net/rocker: Replace sprintf() by snprintf() Date: Fri, 12 Apr 2024 00:33:43 -0700 Message-Id: <20240412073346.458116-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: 1712907358949100003 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1, resulting in painful developper experience. Use snprintf() instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20240411104340.6617-7-philmd@linaro.org> Signed-off-by: Richard Henderson --- hw/net/rocker/rocker.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 7ea8eb6ba5..03ac7a7ae9 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -915,40 +915,40 @@ static const char *rocker_reg_name(void *opaque, hwad= dr addr) =20 switch (index) { case 0: - sprintf(ring_name, "cmd"); + snprintf(ring_name, sizeof(ring_name), "cmd"); break; case 1: - sprintf(ring_name, "event"); + snprintf(ring_name, sizeof(ring_name), "event"); break; default: - sprintf(ring_name, "%s-%d", index % 2 ? "rx" : "tx", - (index - 2) / 2); + snprintf(ring_name, sizeof(ring_name), "%s-%d", + index % 2 ? "rx" : "tx", (index - 2) / 2); } =20 switch (offset) { case ROCKER_DMA_DESC_ADDR_OFFSET: - sprintf(buf, "Ring[%s] ADDR", ring_name); + snprintf(buf, sizeofbuf), "Ring[%s] ADDR", ring_name); return buf; case ROCKER_DMA_DESC_ADDR_OFFSET+4: - sprintf(buf, "Ring[%s] ADDR+4", ring_name); + snprintf(buf, sizeofbuf), "Ring[%s] ADDR+4", ring_name); return buf; case ROCKER_DMA_DESC_SIZE_OFFSET: - sprintf(buf, "Ring[%s] SIZE", ring_name); + snprintf(buf, sizeofbuf), "Ring[%s] SIZE", ring_name); return buf; case ROCKER_DMA_DESC_HEAD_OFFSET: - sprintf(buf, "Ring[%s] HEAD", ring_name); + snprintf(buf, sizeofbuf), "Ring[%s] HEAD", ring_name); return buf; case ROCKER_DMA_DESC_TAIL_OFFSET: - sprintf(buf, "Ring[%s] TAIL", ring_name); + snprintf(buf, sizeofbuf), "Ring[%s] TAIL", ring_name); return buf; case ROCKER_DMA_DESC_CTRL_OFFSET: - sprintf(buf, "Ring[%s] CTRL", ring_name); + snprintf(buf, sizeofbuf), "Ring[%s] CTRL", ring_name); return buf; case ROCKER_DMA_DESC_CREDITS_OFFSET: - sprintf(buf, "Ring[%s] CREDITS", ring_name); + snprintf(buf, sizeofbuf), "Ring[%s] CREDITS", ring_name); return buf; default: - sprintf(buf, "Ring[%s] ???", ring_name); + snprintf(buf, sizeofbuf), "Ring[%s] ???", ring_name); return buf; } } else { --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907408; cv=none; d=zohomail.com; s=zohoarc; b=DRNU7MPCaTw3hzRAsmhQw3Q3F+aemfvUUvz0p5J2yTm+34jtHGV9spwHzdRclwAnG3UFLnuulnxopVb24pxFKngB8sQJphk/UTDGEDnvU2zg7d3BuCJAOAv6b2c6/ihXkG+IJ060z+dlfwICwnI0SVNxhYIgzdcGAj5aKbUZH0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907408; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=eRXCXUY4I/jEqq87nwbnLzBZIzxiWLj4iUBZS7Znhy0=; b=MeC3erYx0h8QChnH9W2oh4NkmbNxLk3oxTUOcjAggQTLZDzLyucWPxIX8uifqsB6RILWtzZ3RZTdtJ2oWTiEu/z/QSitPiZWLyB8TMVoATOdv/TKLpKvPFQs+i626h7z4JmFOKkKr0nMiXbKTvP6dopK4zoYofv4NkQ2Njil7uA= 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 1712907408023187.46221230859487; Fri, 12 Apr 2024 00:36:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQR-00078D-3O; Fri, 12 Apr 2024 03:34: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 1rvBQP-00076b-6e for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:17 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQJ-0007DW-4P for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:16 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1e220e40998so4537685ad.1 for ; Fri, 12 Apr 2024 00:34:08 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907247; x=1713512047; darn=nongnu.org; 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=eRXCXUY4I/jEqq87nwbnLzBZIzxiWLj4iUBZS7Znhy0=; b=luqGkJIMFNSaoXXMI7IAIDBSz1wvp3ZHFtASxtg7unvnkkxUcmsQ7Q4xbBVnkUVItV AV9tUxdLbCJwsqjfrdUYZUaYAa/pmfL5NpZ3ywwINw8GRKFvU8oGYL3VKaw7TWTnal+1 +JG7xCJtnmu1ex8veBWf6yC7vbqjv/m2UpUm4ejGVRWhxOpNFSl0HUktr7ccZZdSxE3P BWcWhNe1JaXL74ZOxa7QzQmvl2rZrMNbd+DLcIYpTgYdcnz1gSzBbuBlGh/PFH2ECMS5 1AKpbYI52v+ka4mDeOHKm5iXoWFktn6T24BFgMjswHA0yTGYcKS6SFgYxIX2yHR0G/I0 SY2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907247; x=1713512047; 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=eRXCXUY4I/jEqq87nwbnLzBZIzxiWLj4iUBZS7Znhy0=; b=jhraScrkZZImigQoYfdMCQpUS9TCv0nmmMFaemyBlucj6REtrxf+yxHYZqAK+6ai/L RtGUbGmJY/PzQp5QsCWYZ60LHmL6VqGSFS/Vtp1qgNVOge3zZa8JebFPV31MRP+oWfRU 8UrwHvV6CX0STFrd8XJMvcNVll1xmCV5t7sL8js2wE+DOWJXeSYqfEng0AYmf1kWvOtG 5pFXekn+egNcI8cktWzMjjCz3dFVJhMVcH9hpBJPPMmACmJ9Q0+SxBj8eEiIe/Xu8xdJ ROMDRXgOUlEixpu1yOr0soGe9afchiPYjxnOMlM8iuW2s7jIINn8HH9FBcsQ8SgrAlcA DoAg== X-Gm-Message-State: AOJu0YzL3/ZyMJOKQ1bVszpANujlSN2Sjv2eZRTpMa8vqLGjuNsrhxru vAZmtyJ9y4bXjej8WuTFhmRRSpYsMhVqacnV+tsQ6BTYK+qmuEBK7BG9dn1C/GA302JqsXFVHot a X-Google-Smtp-Source: AGHT+IHnopKwfYYPUykV9ULcOCPgthiwJZVXaMAX99aKQSxR/BuOjQCmWyqVEGqW40HpyY3Im1Ro/Q== X-Received: by 2002:a17:902:c101:b0:1e2:a5ee:c0a2 with SMTP id 1-20020a170902c10100b001e2a5eec0a2mr1613846pli.31.1712907247436; Fri, 12 Apr 2024 00:34:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 25/27] hw/riscv/virt: Replace sprintf by g_strdup_printf Date: Fri, 12 Apr 2024 00:33:44 -0700 Message-Id: <20240412073346.458116-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1712907409034100002 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Use g_strdup_printf instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20240411104340.6617-8-philmd@linaro.org> [rth: Use g_strdup_printf] Signed-off-by: Richard Henderson --- hw/riscv/virt.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d171e74f7b..4fdb660525 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1617,10 +1617,8 @@ static void virt_machine_instance_init(Object *obj) static char *virt_get_aia_guests(Object *obj, Error **errp) { RISCVVirtState *s =3D RISCV_VIRT_MACHINE(obj); - char val[32]; =20 - sprintf(val, "%d", s->aia_guests); - return g_strdup(val); + return g_strdup_printf("%d", s->aia_guests); } =20 static void virt_set_aia_guests(Object *obj, const char *val, Error **errp) @@ -1741,7 +1739,6 @@ static void virt_machine_device_plug_cb(HotplugHandle= r *hotplug_dev, =20 static void virt_machine_class_init(ObjectClass *oc, void *data) { - char str[128]; MachineClass *mc =3D MACHINE_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); =20 @@ -1767,7 +1764,6 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); #endif =20 - object_class_property_add_bool(oc, "aclint", virt_get_aclint, virt_set_aclint); object_class_property_set_description(oc, "aclint", @@ -1785,9 +1781,14 @@ static void virt_machine_class_init(ObjectClass *oc,= void *data) object_class_property_add_str(oc, "aia-guests", virt_get_aia_guests, virt_set_aia_guests); - sprintf(str, "Set number of guest MMIO pages for AIA IMSIC. Valid valu= e " - "should be between 0 and %d.", VIRT_IRQCHIP_MAX_GUESTS); - object_class_property_set_description(oc, "aia-guests", str); + { + g_autofree char *str =3D + g_strdup_printf("Set number of guest MMIO pages for AIA IMSIC.= " + "Valid value should be between 0 and %d.", + VIRT_IRQCHIP_MAX_GUESTS); + object_class_property_set_description(oc, "aia-guests", str); + } + object_class_property_add(oc, "acpi", "OnOffAuto", virt_get_acpi, virt_set_acpi, NULL, NULL); --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907437; cv=none; d=zohomail.com; s=zohoarc; b=gbw86FU4LByx7EtpmUJobKpN9TMLfmnBDzcUOv0hmWj3n99vM9gCrNv0bETYYaL/ExW/jycVsrUFX1O0mzDfnqor1Vq1ZtKNLX8SyhdMhHrs+TXymTiqnOA5HPsH0XGNYIP0uoWmYcIILOPwydkNYVf3x/w7Mxo7gVeba8rRTd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907437; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=qYC/ppUfzbE2OTFde4QzYfLBrlyxo0ZotFcSEeLzOeA=; b=JPpxRKW77BilOxye3TC6ril+q33nqgyarH27gbvl7xYJBd7DwP5UIgUFmd47Jg8dnO3L42Woj6d/xKFKzUvfhugZbo5wPvKmL1A6x2pG6QaI29PhO7fqSOG4gxonuOiqCexo13aZ3cC5zRwmUfgchgQeoUhzYTnKjILGvtJJVOA= 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 1712907437492164.31734572503217; Fri, 12 Apr 2024 00:37:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQP-00076p-Eh; Fri, 12 Apr 2024 03:34:17 -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 1rvBQM-00075t-0K for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:15 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQJ-0007Di-5Y for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:13 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1e424bd30fbso5372505ad.0 for ; Fri, 12 Apr 2024 00:34:09 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907248; x=1713512048; darn=nongnu.org; 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=qYC/ppUfzbE2OTFde4QzYfLBrlyxo0ZotFcSEeLzOeA=; b=E9qaUephsaRJywbRSBnjfLIYMfTX8068vuSeuVDnoL6h5cbdSB2HlVBIXk1ElXsZ1w Kh1CWxeH2GFs89QTCFwzup+NSgEaNPjjhu+yYheHX9oOXNXlFDwrfUJF87lxGnyCxDWT kHFJnvAQ7lEpqKduizTQA61v41gxMDnqC/naoSGTJwY8yYKNVlI6/kPLBdbzqJU+JbuA F6/GAlnFmfzTvTboyj+zA+78LpMbsIPQtguyaRk20lNcVvigRbLPdo66NtzalYccXJRv 7MZSts1aUeDSmiQHr1H/Eg2BvYLbHgaFDZ+tl0JorODKTNraDFLSYbwtfaG/G0vywT+v LTSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907248; x=1713512048; 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=qYC/ppUfzbE2OTFde4QzYfLBrlyxo0ZotFcSEeLzOeA=; b=o0Vyef+86dVdDiGtnH56r7xgjAuV+4/LLZtiZ6f2Gajuz3xkNz1gkXDi7bGr2lCsHo fmqsGLyDLa2E0TXSGM1fmtgauZ9TbTfl2Jaxou+p6F6qaBHdH6In37Qqikz+UPyHVz5G +xjvp7WsIYtdMyYtzQPyY85pymJ5bEiEbpeRITwF9OsUPpP1YKAtg72yfjPjJatfEap3 EzZfsS3ZAPePQ1wEDjhnVpNfaL/260DhkXsh75o1fjV1nFWknb8R0vox6b2OuMo+e4e1 +oveI3SxqSqx1TEaq0mqCyusv1qVbJol7+dQHB1NGY6l1hi2FO6X512d/kOxZuUVDAnT razQ== X-Gm-Message-State: AOJu0Yz+9KswDaSAFO0cNX7Ji2W4SsXYBRheb82grzfST5t4fGTDz1fi dwHeLwiaEsZJmiGGewl++XLJ6VPhPbf23W1AfnQyTz6jl4g3g6SmaX3OHNHbHud08cIpLokR6zX P X-Google-Smtp-Source: AGHT+IEt571N9TEentdL6d3VO8DyRx5v6HP0TKv6LTupAt+6BKEpjzNqHI94hQj+FZEx6GFctKY69A== X-Received: by 2002:a17:903:230b:b0:1e2:9676:c326 with SMTP id d11-20020a170903230b00b001e29676c326mr2221309plh.29.1712907248262; Fri, 12 Apr 2024 00:34:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v3 26/27] target/arm: Replace sprintf() by snprintf() Date: Fri, 12 Apr 2024 00:33:45 -0700 Message-Id: <20240412073346.458116-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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: 1712907439153100002 From: Philippe Mathieu-Daud=C3=A9 sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1, resulting in painful developper experience. Use snprintf() instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Peter Maydell Message-Id: <20240411104340.6617-9-philmd@linaro.org> Signed-off-by: Richard Henderson --- target/arm/cpu64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 985b1efe16..f0f4fe6714 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -433,7 +433,7 @@ void aarch64_add_sve_properties(Object *obj) =20 for (vq =3D 1; vq <=3D ARM_MAX_VQ; ++vq) { char name[8]; - sprintf(name, "sve%d", vq * 128); + snprintf(name, sizeof(name), "sve%d", vq * 128); object_property_add(obj, name, "bool", cpu_arm_get_vq, cpu_arm_set_vq, NULL, &cpu->sve_vq); } @@ -458,7 +458,7 @@ void aarch64_add_sme_properties(Object *obj) =20 for (vq =3D 1; vq <=3D ARM_MAX_VQ; vq <<=3D 1) { char name[8]; - sprintf(name, "sme%d", vq * 128); + snprintf(name, sizeof(name), "sme%d", vq * 128); object_property_add(obj, name, "bool", cpu_arm_get_vq, cpu_arm_set_vq, NULL, &cpu->sme_vq); } --=20 2.34.1 From nobody Thu May 16 05:32:58 2024 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=1712907431; cv=none; d=zohomail.com; s=zohoarc; b=j/BVLLheWNZkQ3iUsewIVMiOsAdjz1eq0cdfQBPBC3Tx4819wAewGFx3S2/VylRV9DUXMDuCncJ90mc3C3mcLXpjH+H4S19yb38RrABmCU4Ss9TJjolU5rXPDihpccY0aD/xrzvOFTypbr9fOEQbn4Arp531i8gT7GQrW29HvTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712907431; 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=3QxLZpCYn/H6Te2A9HVNEOscia45z8pGQiv2WcFZT0s=; b=VHJ2h8N6/utiy+WT8TL/g7l3o89qeHeKYYPADtczpwsjLKA/LkoK9Fbl6X5+QHsRwVJjVngCV1Da5kxt7eICiiSiU26YkYH4/g0yISaPaz2+pcmYTvoX0hyMOaZHcV3ARKJ4ii/iS9KQfgBXxTjUVrFf7uTK1Ce02E+Bs7DRdck= 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 1712907431279863.6764600556221; Fri, 12 Apr 2024 00:37:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBQU-00079P-DF; Fri, 12 Apr 2024 03:34:22 -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 1rvBQT-00078Z-7c for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:21 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQJ-0007Dr-5S for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:20 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1e3f17c64daso5128175ad.3 for ; Fri, 12 Apr 2024 00:34:09 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907249; x=1713512049; 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=3QxLZpCYn/H6Te2A9HVNEOscia45z8pGQiv2WcFZT0s=; b=sqmwV4bcV2mM3oMSICPtAvruRkJsxnk65pSTxClQmxUHHaRai22N9eQ9LJUT5vwie1 52MGSDVhIRL33nrl52nR5BpV224k+2zShb8eLuNQPdakNotfBRGFz0nz1kuZkRmdwnUI XyKAF3M+r9AbB7TLdVyf16TiQzpvw2RfX1XP0geMZuacpXbTunV6uJIs46cZHkLgEpv2 x30OuoVf1N6AvW4H1B+swjmU+bTTTRAAJygk/agqloXCnOURIZo7shVk43171+un6d1T rdDTzjKygy00fQgwUThsBAhNTGzCk9lnxXPDb4iwn5+owii4NiYVPaCXGQcAOQfWqJAn GxnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907249; x=1713512049; 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=3QxLZpCYn/H6Te2A9HVNEOscia45z8pGQiv2WcFZT0s=; b=gO6UitRlUFFPy2Y5kl8KEnYLboqXOCc7slKnVGutn9APgNz0SKuwGtwNozIhGQQN0P JQ6/h7JVkWzwpWD8kZyM0TRlsm7B/TXGREtI4T2unMmhZCCiXllJ5rgkQ+xFDGXKilgc Jj2HFXdFqvsSbLqwwgcHzgoY2g8Za89pM7Yga+Ud6+f1QWBP00VXrfewGExNs0788DkD GgemT+gbhLHpQs8rDhS5W0ufjcaW+deRB5e4VzxuJNU9UyYA+a0i+QhWcAfcMFqQlYYN SmcmR2vm5usMcklGfmKmadoc9h0G0vN8Yi2VVLG1tz1nyaP0S3pA1qL6ouzwCbJrurhz KAnA== X-Gm-Message-State: AOJu0YzJzlDjCJNPEZ5gEd1JqM6exMNEq7gamlQndKOST/e/qsxuoYzg 2Fg5qghuX3jPEjd6/tXstPwPU21/dj2ZJpCWrKpiNI/JIfneapJvXm8e7ORwG/LxLE0ZOSoZYdh 9 X-Google-Smtp-Source: AGHT+IG5RBGt5Un9YK75iOBNtHp3ZYReVPH39LObGB0GWouGYiwCRgbyffJJEM8+R9qOEXv7q56dQg== X-Received: by 2002:a17:902:7008:b0:1e2:a5b3:e7 with SMTP id y8-20020a170902700800b001e2a5b300e7mr1477387plk.58.1712907249051; Fri, 12 Apr 2024 00:34:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 27/27] target/i386/kvm: Improve KVM_EXIT_NOTIFY warnings Date: Fri, 12 Apr 2024 00:33:46 -0700 Message-Id: <20240412073346.458116-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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: 1712907433128100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhao Liu --- target/i386/kvm/kvm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index e68cbe9293..1fc809b2f9 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -5275,7 +5275,6 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run= *run) uint64_t code; int ret; bool ctx_invalid; - char str[256]; KVMState *state; =20 switch (run->exit_reason) { @@ -5335,15 +5334,16 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_r= un *run) case KVM_EXIT_NOTIFY: ctx_invalid =3D !!(run->notify.flags & KVM_NOTIFY_CONTEXT_INVALID); state =3D KVM_STATE(current_accel()); - sprintf(str, "Encounter a notify exit with %svalid context in" - " guest. There can be possible misbehaves in guest." - " Please have a look.", ctx_invalid ? "in" : ""); if (ctx_invalid || state->notify_vmexit =3D=3D NOTIFY_VMEXIT_OPTION_INTERNAL_ERRO= R) { - warn_report("KVM internal error: %s", str); + warn_report("KVM internal error: Encountered a notify exit " + "with invalid context in guest."); ret =3D -1; } else { - warn_report_once("KVM: %s", str); + warn_report_once("KVM: Encounterd a notify exit with valid " + "context in guest. " + "The guest could be misbehaving. " + "Please have a look."); ret =3D 0; } break; --=20 2.34.1