{"id":1992921,"url":"http://patchwork.ozlabs.org/api/patches/1992921/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20241004163042.85922-18-philmd@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20241004163042.85922-18-philmd@linaro.org>","list_archive_url":null,"date":"2024-10-04T16:30:33","name":"[v2,17/25] hw/m68k: Use explicit big-endian LD/ST API","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8ad43ebb6fb297e4ae59e23a56ec3453f293fea9","submitter":{"id":85046,"url":"http://patchwork.ozlabs.org/api/people/85046/?format=json","name":"Philippe Mathieu-Daudé","email":"philmd@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20241004163042.85922-18-philmd@linaro.org/mbox/","series":[{"id":426623,"url":"http://patchwork.ozlabs.org/api/series/426623/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=426623","date":"2024-10-04T16:30:18","name":"misc: Use explicit endian LD/ST API","version":2,"mbox":"http://patchwork.ozlabs.org/series/426623/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1992921/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1992921/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=qpnimFtK;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4XKvTR5DPkz1xv2\n\tfor ; Sat, 5 Oct 2024 02:42:03 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1swlJ2-0003fG-PC; Fri, 04 Oct 2024 12:37:29 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1swlGr-0007PB-TG\n for qemu-devel@nongnu.org; Fri, 04 Oct 2024 12:35:14 -0400","from mail-lj1-x236.google.com ([2a00:1450:4864:20::236])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1swlGo-0006P4-M8\n for qemu-devel@nongnu.org; Fri, 04 Oct 2024 12:35:13 -0400","by mail-lj1-x236.google.com with SMTP id\n 38308e7fff4ca-2facf40737eso28347201fa.0\n for ; Fri, 04 Oct 2024 09:35:08 -0700 (PDT)","from localhost.localdomain ([91.223.100.150])\n by smtp.gmail.com with ESMTPSA id\n 38308e7fff4ca-2faf9b3b441sm195821fa.139.2024.10.04.09.35.01\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Fri, 04 Oct 2024 09:35:06 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1728059707; x=1728664507; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=FMPHX1jqQUTWI4pf2r0FuqonzJoCTqpttYtMaDPMSzU=;\n b=qpnimFtK6rIxbKY9VVh/UCpMRuYEjoz4H1C7JOAP81QG0G9FcUSbKagjEey/fvKg03\n +p06zPEI2eHHgLh9LR9RWxi1F0yO/2BcRm2KXGqyO3Irdp1yFLatTJwbG0L6fea8CN5y\n 5TvjxyBw6jkYx3CfbUzu9Qw7CtGewyQI5umFtbnB3F1JnDpk6/17xtmeplV+5G+k3Zkf\n XmJBAqqRg5Lc66H52GbsNjwDs2uq8V/ySkbypIE6ksvZLtQ7xiNKX5qGWVZdJBseShTS\n xorJa2JKR5GZFzIffzteIV+XRiccqkDMJCZj3MBIENxdIaY37YV/7KKYxfZ4lVhLVdlI\n ji+A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1728059707; x=1728664507;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=FMPHX1jqQUTWI4pf2r0FuqonzJoCTqpttYtMaDPMSzU=;\n b=Ngv5aJrV+HVabhHMddBbZa4zkJlRBPF9nvw+dMZHsiYbeCN4cWhzizMTffqbrfK8xT\n k5ebqBGzXUhvzBJRVECAugYOvM9YLIpNCBLLhgj2wzJ8tLPwsz9NpEqHkQO8eY2y9IjE\n +93BMNOYygcqOxi9tagrhoGyM5OwmtUUPDxN9TX3o4VZBkpilH/phcMuweRTq4EAUSMH\n 6+OFYHQjjg3j2+xhKWaxMaBsjxKBrckg3oR3tkbuocSUZvPWKZSDAxBh9Ngw5Vlg8eQH\n RzNmWcp7eCjyDJyHLEOdwsTHFPkxYjZazPwkcCIGeXhqi204BXhTimpJNSEvo3adqPmg\n /JvA==","X-Gm-Message-State":"AOJu0Yz3feTxC9SiRpOQ8lW7FN0nzrik8QmwFYl5o+BZ7D14/ZYspFVM\n yp2OfjkA51Io1BfUtJR34h4DEzua0YrPv5+Uwd4VKpHKbJzAP6gyUei6ZL301P8hJXlH5cu37QN\n 77RcGfg==","X-Google-Smtp-Source":"\n AGHT+IGx7YQ9AludivP/JgpYsPv0iqZu3pTCEacheY6CQHjkkwcmkF+BNjJ5qSRXCNW56q6LonKaKg==","X-Received":"by 2002:a2e:3806:0:b0:2f3:b8dc:7d24 with SMTP id\n 38308e7fff4ca-2faf3c5f4f3mr16451211fa.17.1728059707174;\n Fri, 04 Oct 2024 09:35:07 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"qemu-devel@nongnu.org","Cc":"qemu-riscv@nongnu.org, qemu-s390x@nongnu.org,\n Thomas Huth ,\n Richard Henderson ,\n Pierrick Bouvier , qemu-ppc@nongnu.org,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","Subject":"[PATCH v2 17/25] hw/m68k: Use explicit big-endian LD/ST API","Date":"Fri, 4 Oct 2024 13:30:33 -0300","Message-ID":"<20241004163042.85922-18-philmd@linaro.org>","X-Mailer":"git-send-email 2.45.2","In-Reply-To":"<20241004163042.85922-1-philmd@linaro.org>","References":"<20241004163042.85922-1-philmd@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::236;\n envelope-from=philmd@linaro.org; helo=mail-lj1-x236.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=unavailable 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"The M68K architecture uses big endianness. Directly use\nthe big-endian LD/ST API.\n\nMechanical change using:\n\n $ end=be; \\\n for acc in uw w l q tul; do \\\n sed -i -e \"s/ld${acc}_p(/ld${acc}_${end}_p(/\" \\\n -e \"s/st${acc}_p(/st${acc}_${end}_p(/\" \\\n $(git grep -wlE '(ld|st)t?u?[wlq]_p' hw/m68k/); \\\n done\n\nSigned-off-by: Philippe Mathieu-Daudé \n---\n hw/m68k/bootinfo.h | 28 ++++++++++++++--------------\n hw/m68k/mcf5208.c | 2 +-\n hw/m68k/next-cube.c | 2 +-\n hw/m68k/q800.c | 4 ++--\n 4 files changed, 18 insertions(+), 18 deletions(-)","diff":"diff --git a/hw/m68k/bootinfo.h b/hw/m68k/bootinfo.h\nindex 70c1dc0e8c3..0b3e7c4ea01 100644\n--- a/hw/m68k/bootinfo.h\n+++ b/hw/m68k/bootinfo.h\n@@ -14,39 +14,39 @@\n \n #define BOOTINFO0(base, id) \\\n do { \\\n- stw_p(base, id); \\\n+ stw_be_p(base, id); \\\n base += 2; \\\n- stw_p(base, sizeof(struct bi_record)); \\\n+ stw_be_p(base, sizeof(struct bi_record)); \\\n base += 2; \\\n } while (0)\n \n #define BOOTINFO1(base, id, value) \\\n do { \\\n- stw_p(base, id); \\\n+ stw_be_p(base, id); \\\n base += 2; \\\n- stw_p(base, sizeof(struct bi_record) + 4); \\\n+ stw_be_p(base, sizeof(struct bi_record) + 4); \\\n base += 2; \\\n- stl_p(base, value); \\\n+ stl_be_p(base, value); \\\n base += 4; \\\n } while (0)\n \n #define BOOTINFO2(base, id, value1, value2) \\\n do { \\\n- stw_p(base, id); \\\n+ stw_be_p(base, id); \\\n base += 2; \\\n- stw_p(base, sizeof(struct bi_record) + 8); \\\n+ stw_be_p(base, sizeof(struct bi_record) + 8); \\\n base += 2; \\\n- stl_p(base, value1); \\\n+ stl_be_p(base, value1); \\\n base += 4; \\\n- stl_p(base, value2); \\\n+ stl_be_p(base, value2); \\\n base += 4; \\\n } while (0)\n \n #define BOOTINFOSTR(base, id, string) \\\n do { \\\n- stw_p(base, id); \\\n+ stw_be_p(base, id); \\\n base += 2; \\\n- stw_p(base, \\\n+ stw_be_p(base, \\\n (sizeof(struct bi_record) + strlen(string) + \\\n 1 /* null termination */ + 3 /* padding */) & ~3); \\\n base += 2; \\\n@@ -59,13 +59,13 @@\n \n #define BOOTINFODATA(base, id, data, len) \\\n do { \\\n- stw_p(base, id); \\\n+ stw_be_p(base, id); \\\n base += 2; \\\n- stw_p(base, \\\n+ stw_be_p(base, \\\n (sizeof(struct bi_record) + len + \\\n 2 /* length field */ + 3 /* padding */) & ~3); \\\n base += 2; \\\n- stw_p(base, len); \\\n+ stw_be_p(base, len); \\\n base += 2; \\\n for (unsigned i_ = 0; i_ < len; ++i_) { \\\n stb_p(base++, data[i_]); \\\ndiff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c\nindex b6677ad6bc3..e37cd50d189 100644\n--- a/hw/m68k/mcf5208.c\n+++ b/hw/m68k/mcf5208.c\n@@ -359,7 +359,7 @@ static void mcf5208evb_init(MachineState *machine)\n /* Initial PC is always at offset 4 in firmware binaries */\n ptr = rom_ptr(0x4, 4);\n assert(ptr != NULL);\n- env->pc = ldl_p(ptr);\n+ env->pc = ldl_be_p(ptr);\n }\n \n /* Load kernel. */\ndiff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c\nindex 9b78767ea8e..9832213e7ec 100644\n--- a/hw/m68k/next-cube.c\n+++ b/hw/m68k/next-cube.c\n@@ -1036,7 +1036,7 @@ static void next_cube_init(MachineState *machine)\n /* Initial PC is always at offset 4 in firmware binaries */\n ptr = rom_ptr(0x01000004, 4);\n g_assert(ptr != NULL);\n- env->pc = ldl_p(ptr);\n+ env->pc = ldl_be_p(ptr);\n if (env->pc >= 0x01020000) {\n error_report(\"'%s' does not seem to be a valid firmware image.\",\n bios_name);\ndiff --git a/hw/m68k/q800.c b/hw/m68k/q800.c\nindex fa7683bf76f..556604e1dcf 100644\n--- a/hw/m68k/q800.c\n+++ b/hw/m68k/q800.c\n@@ -684,9 +684,9 @@ static void q800_machine_init(MachineState *machine)\n \n ptr = rom_ptr(MACROM_ADDR, bios_size);\n assert(ptr != NULL);\n- stl_phys(cs->as, 0, ldl_p(ptr)); /* reset initial SP */\n+ stl_phys(cs->as, 0, ldl_be_p(ptr)); /* reset initial SP */\n stl_phys(cs->as, 4,\n- MACROM_ADDR + ldl_p(ptr + 4)); /* reset initial PC */\n+ MACROM_ADDR + ldl_be_p(ptr + 4)); /* reset initial PC */\n }\n }\n }\n","prefixes":["v2","17/25"]}