motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-08 16:07:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/xtensa/xtfpga: Remove TARGET_BIG_ENDIAN #ifdef'ry

Browse source 
Move code evaluation from preprocessor to compiler so
both if() ladders are processed. Mostly style change.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240930073450.33195-8-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-09-27 23:14:46 +02:00
parent cebf9b0da2
commit dc696c6c34
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hw/xtensa/xtfpga.c
View file

@ -415,8 +415,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
} }
} }
if (entry_point != env->pc) { if (entry_point != env->pc) {
uint8_t boot[] = { uint8_t boot_be[] = {
#if TARGET_BIG_ENDIAN
0x60, 0x00, 0x08, /* j 1f */ 0x60, 0x00, 0x08, /* j 1f */
0x00, /* .literal_position */ 0x00, /* .literal_position */
0x00, 0x00, 0x00, 0x00, /* .literal entry_pc */ 0x00, 0x00, 0x00, 0x00, /* .literal entry_pc */
@ -425,7 +424,8 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
0x10, 0xff, 0xfe, /* l32r a0, entry_pc */ 0x10, 0xff, 0xfe, /* l32r a0, entry_pc */
0x12, 0xff, 0xfe, /* l32r a2, entry_a2 */ 0x12, 0xff, 0xfe, /* l32r a2, entry_a2 */
0x0a, 0x00, 0x00, /* jx a0 */ 0x0a, 0x00, 0x00, /* jx a0 */
#else };
uint8_t boot_le[] = {
0x06, 0x02, 0x00, /* j 1f */ 0x06, 0x02, 0x00, /* j 1f */
0x00, /* .literal_position */ 0x00, /* .literal_position */
0x00, 0x00, 0x00, 0x00, /* .literal entry_pc */ 0x00, 0x00, 0x00, 0x00, /* .literal entry_pc */
@ -434,14 +434,16 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
0x01, 0xfe, 0xff, /* l32r a0, entry_pc */ 0x01, 0xfe, 0xff, /* l32r a0, entry_pc */
0x21, 0xfe, 0xff, /* l32r a2, entry_a2 */ 0x21, 0xfe, 0xff, /* l32r a2, entry_a2 */
0xa0, 0x00, 0x00, /* jx a0 */ 0xa0, 0x00, 0x00, /* jx a0 */
#endif
}; };
const size_t boot_sz = TARGET_BIG_ENDIAN ? sizeof(boot_be)
: sizeof(boot_le);
uint8_t *boot = TARGET_BIG_ENDIAN ? boot_be : boot_le;
uint32_t entry_pc = tswap32(entry_point); uint32_t entry_pc = tswap32(entry_point);
uint32_t entry_a2 = tswap32(tagptr); uint32_t entry_a2 = tswap32(tagptr);
memcpy(boot + 4, &entry_pc, sizeof(entry_pc)); memcpy(boot + 4, &entry_pc, sizeof(entry_pc));
memcpy(boot + 8, &entry_a2, sizeof(entry_a2)); memcpy(boot + 8, &entry_a2, sizeof(entry_a2));
cpu_physical_memory_write(env->pc, boot, sizeof(boot)); cpu_physical_memory_write(env->pc, boot, boot_sz);
} }
} else { } else {
if (flash) { if (flash) {