mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/m68k: Use explicit big-endian LD/ST API

Browse Source 
The M68K architecture uses big endianness. Directly use
the big-endian LD/ST API.

Mechanical change using:

  $ end=be; \
    for acc in uw w l q tul; do \
      sed -i -e "s/ld${acc}_p(/ld${acc}_${end}_p(/" \
             -e "s/st${acc}_p(/st${acc}_${end}_p(/" \
        $(git grep -wlE '(ld|st)t?u?[wlq]_p' hw/m68k/); \
    done

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20241004163042.85922-18-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-10-04 13:30:33 -03:00 committed by Thomas Huth
parent 7e9503f504
commit 77b535cfdd
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/m68k/bootinfo.h
View File

@ -14,39 +14,39 @@
#define BOOTINFO0(base, id) \ #define BOOTINFO0(base, id) \
do { \ do { \
stw_p(base, id); \ stw_be_p(base, id); \
base += 2; \ base += 2; \
stw_p(base, sizeof(struct bi_record)); \ stw_be_p(base, sizeof(struct bi_record)); \
base += 2; \ base += 2; \
} while (0) } while (0)
#define BOOTINFO1(base, id, value) \ #define BOOTINFO1(base, id, value) \
do { \ do { \
stw_p(base, id); \ stw_be_p(base, id); \
base += 2; \ base += 2; \
stw_p(base, sizeof(struct bi_record) + 4); \ stw_be_p(base, sizeof(struct bi_record) + 4); \
base += 2; \ base += 2; \
stl_p(base, value); \ stl_be_p(base, value); \
base += 4; \ base += 4; \
} while (0) } while (0)
#define BOOTINFO2(base, id, value1, value2) \ #define BOOTINFO2(base, id, value1, value2) \
do { \ do { \
stw_p(base, id); \ stw_be_p(base, id); \
base += 2; \ base += 2; \
stw_p(base, sizeof(struct bi_record) + 8); \ stw_be_p(base, sizeof(struct bi_record) + 8); \
base += 2; \ base += 2; \
stl_p(base, value1); \ stl_be_p(base, value1); \
base += 4; \ base += 4; \
stl_p(base, value2); \ stl_be_p(base, value2); \
base += 4; \ base += 4; \
} while (0) } while (0)
#define BOOTINFOSTR(base, id, string) \ #define BOOTINFOSTR(base, id, string) \
do { \ do { \
stw_p(base, id); \ stw_be_p(base, id); \
base += 2; \ base += 2; \
stw_p(base, \ stw_be_p(base, \
(sizeof(struct bi_record) + strlen(string) + \ (sizeof(struct bi_record) + strlen(string) + \
1 /* null termination */ + 3 /* padding */) & ~3); \ 1 /* null termination */ + 3 /* padding */) & ~3); \
base += 2; \ base += 2; \
@ -59,13 +59,13 @@
#define BOOTINFODATA(base, id, data, len) \ #define BOOTINFODATA(base, id, data, len) \
do { \ do { \
stw_p(base, id); \ stw_be_p(base, id); \
base += 2; \ base += 2; \
stw_p(base, \ stw_be_p(base, \
(sizeof(struct bi_record) + len + \ (sizeof(struct bi_record) + len + \
2 /* length field */ + 3 /* padding */) & ~3); \ 2 /* length field */ + 3 /* padding */) & ~3); \
base += 2; \ base += 2; \
stw_p(base, len); \ stw_be_p(base, len); \
base += 2; \ base += 2; \
for (unsigned i_ = 0; i_ < len; ++i_) { \ for (unsigned i_ = 0; i_ < len; ++i_) { \
stb_p(base++, data[i_]); \ stb_p(base++, data[i_]); \

2
hw/m68k/mcf5208.c
View File

@ -359,7 +359,7 @@ static void mcf5208evb_init(MachineState *machine)
/* Initial PC is always at offset 4 in firmware binaries */ /* Initial PC is always at offset 4 in firmware binaries */
ptr = rom_ptr(0x4, 4); ptr = rom_ptr(0x4, 4);
assert(ptr != NULL); assert(ptr != NULL);
env->pc = ldl_p(ptr); env->pc = ldl_be_p(ptr);
} }
/* Load kernel. */ /* Load kernel. */

2
hw/m68k/next-cube.c
View File

@ -1036,7 +1036,7 @@ static void next_cube_init(MachineState *machine)
/* Initial PC is always at offset 4 in firmware binaries */ /* Initial PC is always at offset 4 in firmware binaries */
ptr = rom_ptr(0x01000004, 4); ptr = rom_ptr(0x01000004, 4);
g_assert(ptr != NULL); g_assert(ptr != NULL);
env->pc = ldl_p(ptr); env->pc = ldl_be_p(ptr);
if (env->pc >= 0x01020000) { if (env->pc >= 0x01020000) {
error_report("'%s' does not seem to be a valid firmware image.", error_report("'%s' does not seem to be a valid firmware image.",
bios_name); bios_name);

4
hw/m68k/q800.c
View File

@ -684,9 +684,9 @@ static void q800_machine_init(MachineState *machine)
ptr = rom_ptr(MACROM_ADDR, bios_size); ptr = rom_ptr(MACROM_ADDR, bios_size);
assert(ptr != NULL); assert(ptr != NULL);
stl_phys(cs->as, 0, ldl_p(ptr)); /* reset initial SP */ stl_phys(cs->as, 0, ldl_be_p(ptr)); /* reset initial SP */
stl_phys(cs->as, 4, stl_phys(cs->as, 4,
MACROM_ADDR + ldl_p(ptr + 4)); /* reset initial PC */ MACROM_ADDR + ldl_be_p(ptr + 4)); /* reset initial PC */
} }
} }
} }