hexagon: add semihosting support
Subsystems (2)
PATCH 1/14 target/hexagon: fix get_phys_addr_debug with in-page offset
In reply to Matheus Tavares BernardinoAs documented:
* @get_phys_addr_debug: Callback for obtaining a physical address.
* This must be able to handle a non-page-aligned address, and will
* return the physical address corresponding to that address.
When MMU is enabled, hexagon_cpu_get_phys_addr_debug() returns the physical address page-aligned, not corrected to reflect the exact byte the virtual addr maps to within the page. Let's fix that. The MMU-disabled case is already correct.
This would break semihosting argument reads when it is added for Hexagon.
--- target/hexagon/cpu.c | 2 ++ 1 file changed, 2 insertions(+)
target/hexagon/cpu.c +2 -0
@@ -569,7 +569,9 @@ static hwaddr hexagon_cpu_get_phys_addr_debug(CPUState *cs, vaddr addr)if (get_physical_address (env, &phys_addr, &prot, &page_size, &excp, addr,0 , mmu_idx)) { +vaddr page_offset = addr & (TARGET_PAGE_SIZE -1 );find_qemu_subpage (&addr, &phys_addr, page_size); + phys_addr +=hexagon_cpu_mmu_enabled (env) ? page_offset :0 ;return phys_addr; }
Signature · 1 line
2.37.2
PATCH 2/14 target/hexagon: fix PC advancement for non-COF TB terminators
In reply to Matheus Tavares BernardinoSome packets end a translation block without a change-of-flow. These do not update the PC during commit, so gen_end_tb() leaves hex_gpr[HEX_REG_PC] pointing at the same packet and the block gets re-entered forever. Set PC explicitly to next_PC in that gen_end_tb() branch to fix execution of next blocks.
Note that gen_start_packet() used to have a special case for tlblock/k0lock, setting ctx->next_PC to the packet's own address. This relies on the tlblock/k0lock helpers to properly advance the PC, which is never done (only env->next_PC is updated, but that never reaches hex_gpr[HEX_REG_PC]). Drop the special case so these packets advance to the following packet like any other non-COF TB terminator.
--- target/hexagon/translate.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
target/hexagon/translate.c +9 -4
@@ -210,6 +210,12 @@ static void gen_end_tb(DisasContext *ctx)gen_goto_tb (ctx,0 , ctx->base.tb->pc, true);gen_set_label (skip);gen_goto_tb (ctx,1 , ctx->next_PC, false); + }else if (!ctx->pkt.pkt_has_cof) { +/* +* Packet with no deferred COF that still ends the TB. PC is +* not updated during commit, so set it explicitly to next_PC. +*/ +gen_goto_tb (ctx,0 , ctx->next_PC, true); }else {tcg_gen_lookup_and_goto_ptr (); }
@@ -282,6 +288,7 @@ static bool check_for_attrib(Packet *pkt, int attrib)return false; } +#ifndef CONFIG_USER_ONLY static bool check_for_opcode (Packet *pkt,uint16_t opcode) {for (int i =0 ; i < pkt->num_insns; i++) {
@@ -291,6 +298,7 @@ static bool check_for_opcode(Packet *pkt, uint16_t opcode) }return false; } +#endif static bool need_slot_cancelled (Packet *pkt) {
@@ -562,10 +570,7 @@ static void analyze_packet(DisasContext *ctx)static void gen_start_packet (DisasContext *ctx) {Packet *pkt = &ctx->pkt; -target_ulong next_PC = (check_for_opcode (pkt, Y2_k0lock) || -check_for_opcode (pkt, Y2_tlblock)) ? - ctx->base.pc_next : - ctx->base.pc_next + pkt->encod_pkt_size_in_bytes; +target_ulong next_PC = ctx->base.pc_next + pkt->encod_pkt_size_in_bytes;int i;/* Clear out the disassembly context */
Signature · 1 line
2.37.2
PATCH 4/14 hexagon: cpu_helper: add reg reading/writing helpers
In reply to Matheus Tavares BernardinoAnd adjust op_helper to use those. They will also be used on upcoming semihosting commits.
--- target/hexagon/cpu_helper.h | 18 +++++++++++++++++ target/hexagon/cpu_helper.c | 40 +++++++++++++++++++++++++++++++++++++ target/hexagon/op_helper.c | 18 ++--------------- 3 files changed, 60 insertions(+), 16 deletions(-)
target/hexagon/cpu_helper.h +18 -0
@@ -7,6 +7,24 @@#ifndef HEXAGON_CPU_HELPER_H #define HEXAGON_CPU_HELPER_H +static inline void arch_set_thread_reg (CPUHexagonState *env,uint32_t reg, +uint32_t val) +{ +g_assert (reg <TOTAL_PER_THREAD_REGS ); + env->gpr[reg] = val; +} + +static inline uint32_t arch_get_thread_reg (CPUHexagonState *env,uint32_t reg) +{ +g_assert (reg <TOTAL_PER_THREAD_REGS ); +return env->gpr[reg]; +} + +void arch_set_system_reg (CPUHexagonState *env,uint32_t reg,uint32_t val); +void arch_set_system_reg_masked (CPUHexagonState *env,uint32_t reg, +uint32_t val); +uint32_t arch_get_system_reg (CPUHexagonState *env,uint32_t reg); +void hexagon_read_memory (CPUHexagonState *env,target_ulong vaddr,int size,void *retptr,uintptr_t retaddr); void hexagon_write_memory(CPUHexagonState *env, target_ulong vaddr,
target/hexagon/cpu_helper.c +40 -0
@@ -27,6 +27,46 @@#ifndef CONFIG_USER_ONLY +uint32_t arch_get_system_reg (CPUHexagonState *env,uint32_t reg) +{ +if (reg ==HEX_SREG_PCYCLELO ) { +return hexagon_get_sys_pcycle_count_low (env); + }else if (reg ==HEX_SREG_PCYCLEHI ) { +return hexagon_get_sys_pcycle_count_high (env); + } + +g_assert (reg <NUM_SREGS ); +if (reg <HEX_SREG_GLB_START ) { +return env->t_sreg[reg]; + }else { +HexagonCPU *cpu =env_archcpu (env); +return hexagon_globalreg_read (cpu->globalregs, reg, env->threadId); + } +} + +void arch_set_system_reg (CPUHexagonState *env,uint32_t reg,uint32_t val) +{ +g_assert (reg <NUM_SREGS ); +if (reg <HEX_SREG_GLB_START ) { + env->t_sreg[reg] = val; + }else { +HexagonCPU *cpu =env_archcpu (env); +hexagon_globalreg_write (cpu->globalregs, reg, val, env->threadId); + } +} + +void arch_set_system_reg_masked (CPUHexagonState *env,uint32_t reg, +uint32_t val) +{ +g_assert (reg <NUM_SREGS ); +if (reg <HEX_SREG_GLB_START ) { + env->t_sreg[reg] = val; + }else { +HexagonCPU *cpu =env_archcpu (env); +hexagon_globalreg_write_masked (cpu->globalregs, reg, val); + } +} +static bool hexagon_read_memory_small (CPUHexagonState *env,target_ulong addr,int byte_count,unsigned char *dstbuf,int mmu_idx,uintptr_t retaddr)
target/hexagon/op_helper.c +2 -16
@@ -1839,28 +1839,14 @@ void HELPER(setimask)(CPUHexagonState *env, uint32_t tid, uint32_t imask)void HELPER (sreg_write_masked )(CPUHexagonState *env,uint32_t reg,uint32_t val) {BQL_LOCK_GUARD (); -if (reg <HEX_SREG_GLB_START ) { - env->t_sreg[reg] = val; - }else { -HexagonCPU *cpu =env_archcpu (env); -if (cpu->globalregs) { -hexagon_globalreg_write_masked (cpu->globalregs, reg, val); - } - } +arch_set_system_reg_masked (env, reg, val); } static inline QEMU_ALWAYS_INLINE uint32_t sreg_read(CPUHexagonState *env,uint32_t reg) { -HexagonCPU *cpu; -g_assert (bql_locked ()); -if (reg <HEX_SREG_GLB_START ) { -return env->t_sreg[reg]; - } - cpu =env_archcpu (env); -return cpu->globalregs ? -hexagon_globalreg_read (cpu->globalregs, reg, env->threadId) :0 ; +return arch_get_system_reg (env, reg); }uint32_t HELPER (sreg_read )(CPUHexagonState *env,uint32_t reg)
Signature · 1 line
2.37.2
PATCH 8/14 semihosting: add ftruncate helper (to be used for hexagon)
In reply to Matheus Tavares BernardinoThe common semihosting syscall layer has no ftruncate helper, but the Hexagon semihosting ABI includes an FTRUNC operation. Add semihost_sys_ftruncate() so that Hexagon can delegate to it rather than calling ftruncate directly.
--- include/semihosting/syscalls.h | 2 ++ semihosting/syscalls.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)
include/semihosting/syscalls.h +2 -0
@@ -75,4 +75,6 @@ void semihost_sys_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,void semihost_sys_poll_one (CPUState *cs,gdb_syscall_complete_cb complete,int fd,GIOCondition cond,int timeout); +void semihost_sys_ftruncate (CPUState *cs,gdb_syscall_complete_cb complete, +int fd,off_t len);#endif /* SEMIHOSTING_SYSCALLS_H */
semihosting/syscalls.c +29 -0
@@ -8,10 +8,12 @@#include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/error-report.h" #include "gdbstub/syscalls.h" #include "semihosting/guestfd.h" #include "semihosting/syscalls.h" #include "semihosting/console.h" +#include "semihosting/semihost.h" #ifdef CONFIG_USER_ONLY #include "qemu.h" #else
@@ -541,6 +543,13 @@ static void host_poll_one(CPUState *cs, gdb_syscall_complete_cb complete, }#endif +static void host_ftruncate (CPUState *cs,gdb_syscall_complete_cb complete, +GuestFD *gf,off_t len) +{ +int err =ftruncate (gf->hostfd, len); +complete (cs, err, err <0 ? errno :0 ); +} +/* * Static file semihosting syscall implementations. */
@@ -982,3 +991,23 @@ void semihost_sys_poll_one(CPUState *cs, gdb_syscall_complete_cb complete, } }#endif + +void semihost_sys_ftruncate (CPUState *cs,gdb_syscall_complete_cb complete, +int fd,off_t len) +{ +GuestFD *gf =get_guestfd (fd); +if (!gf) { +complete (cs,-1 ,EBADF ); +return ; + } + +switch (gf->type) { +case GuestFDHost: +host_ftruncate (cs, complete, gf, len); +break ; +default : +error_report ("ftruncate call not implemented " +"for this semihosting mode." ); +g_assert_not_reached (); + } +}
Signature · 1 line
2.37.2
PATCH 9/14 target/hexagon: add main arch-specific semihosting operations
In reply to Matheus Tavares BernardinoThe Hexagon semihosting ABI extends the arm-compatible set with operations like OPEN, WRITECREG, WRITE0, ISTTY, STAT, FSTAT, FTELL, SEEK, FTRUNC, ACCESS, and GETCWD. Implement these trap0 handlers so that baremetal programs using the standard Hexagon simulator ABI can perform file I/O when running on qemu-system-hexagon.
--- include/semihosting/common-semi.h | 1 + semihosting/arm-compat-semi.c | 2 +- target/hexagon/hexswi.c | 293 +++++++++++++++++++++++++++++- 3 files changed, 294 insertions(+), 2 deletions(-)
include/semihosting/common-semi.h +1 -0
@@ -34,6 +34,7 @@#ifndef COMMON_SEMI_H #define COMMON_SEMI_H +void common_semi_cb (CPUState *cs,uint64_t ret,int err);void do_common_semihosting (CPUState *cs);uint64_t common_semi_arg (CPUState *cs,int argno);void common_semi_set_ret (CPUState *cs,uint64_t ret);
semihosting/arm-compat-semi.c +1 -1
@@ -229,7 +229,7 @@ static inline uint32_t get_swi_errno(CPUState *cs)#endif } -static void common_semi_cb (CPUState *cs,uint64_t ret,int err) +void common_semi_cb (CPUState *cs,uint64_t ret,int err) {if (err) {#ifdef CONFIG_USER_ONLY
target/hexagon/hexswi.c +292 -1
305 lines not on this page · raw message
Signature · 1 line
2.37.2
cover hexagon: add semihosting support
This series adds semihosting support to hexagon system emulation, together with functional tests for the added operations.
The Hexagon semihosting spec can be found at:
https://docs.qualcomm.com/doc/80-N2040-101_102648/topic/semihosting-specification.html
Brian Cain (4):
semihosting: add APIs for chardev-aware guest fd routing target/hexagon: Add an errno mapping
python/machine: support routing semihosting output to the test console tests/functional: Add hexagon semihosting systests
Matheus Tavares Bernardino (10):
target/hexagon: fix get_phys_addr_debug with in-page offset target/hexagon: fix PC advancement for non-COF TB terminators target/hexagon: add aux functions for guest mem load/store
hexagon: cpu_helper: add reg reading/writing helpers
semihosting: add callback to set error target/hexagon: add semihosting support
semihosting: add ftruncate helper (to be used for hexagon) target/hexagon: add main arch-specific semihosting operations target/hexagon: add COREDUMP semihosting operation target/hexagon: add OPEN/READ/CLOSE_DIR semihosting operations
configs/targets/hexagon-softmmu.mak | 2 + include/semihosting/common-semi.h | 2 + include/semihosting/console.h | 9 + include/semihosting/guestfd.h | 9 + include/semihosting/syscalls.h | 2 + target/hexagon/cpu.h | 1 + target/hexagon/cpu_helper.h | 24 + target/hexagon/internal.h | 1 + hw/hexagon/hexagon_dsp.c | 7 + hw/hexagon/virt.c | 5 + semihosting/arm-compat-semi.c | 3 +- semihosting/console.c | 5 + semihosting/guestfd.c | 8 + semihosting/syscalls.c | 29 + target/arm/common-semi-target.c | 4 + target/hexagon/common-semi-target.c | 51 ++ target/hexagon/cpu.c | 4 +- target/hexagon/cpu_helper.c | 173 +++++ target/hexagon/hexswi.c | 728 +++++++++++++++++++++- target/hexagon/op_helper.c | 18 +- target/hexagon/translate.c | 13 +- target/riscv/common-semi-target.c | 4 + hw/hexagon/Kconfig | 1 + python/qemu/machine/machine.py | 10 +- qemu-options.hx | 8 +- target/hexagon/meson.build | 3 + tests/functional/hexagon/meson.build | 9 + tests/functional/hexagon/test_systests.py | 133 ++++ tests/functional/meson.build | 1 + 29 files changed, 1236 insertions(+), 31 deletions(-) create mode 100644 target/hexagon/common-semi-target.c create mode 100644 tests/functional/hexagon/meson.build create mode 100644 tests/functional/hexagon/test_systests.py
Signature · 1 line
2.37.2
PATCH 7/14 target/hexagon: add semihosting support
From: Matheus Tavares Bernardino <[email protected]>
Baremetal Hexagon programs use trap0 #0 to invoke semihosting calls for I/O and process control. Wire up the arm-compatible semihosting framework for softmmu by enabling CONFIG_ARM_COMPATIBLE_SEMIHOSTING and routing trap0 to the semihosting handler.
--- configs/targets/hexagon-softmmu.mak | 2 + hw/hexagon/hexagon_dsp.c | 2 + target/hexagon/common-semi-target.c | 51 +++++++++ target/hexagon/hexswi.c | 164 +++++++++++++++++++++++++++- hw/hexagon/Kconfig | 1 + qemu-options.hx | 8 +- target/hexagon/meson.build | 3 + 7 files changed, 224 insertions(+), 7 deletions(-) create mode 100644 target/hexagon/common-semi-target.c
configs/targets/hexagon-softmmu.mak +2 -0
@@ -6,3 +6,5 @@ TARGET_LONG_BITS=32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=y TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=y TARGET_NEED_FDT=y +CONFIG_SEMIHOSTING=y +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
hw/hexagon/hexagon_dsp.c +2 -0
@@ -27,6 +27,7 @@#include "target/hexagon/internal.h" #include "system/physmem.h" #include "system/reset.h" +#include "semihosting/semihost.h" #include "machine_cfg_v66g_1024.h.inc"
@@ -178,6 +179,7 @@ static void init_mc(MachineClass *mc) mc->no_serial =1 ; mc->is_default = false; mc->max_cpus =8 ; +qemu_semihosting_enable (); }/* ----------------------------------------------------------------- */
target/hexagon/common-semi-target.c new file +51 -0
51 lines not on this page · raw message
target/hexagon/hexswi.c +161 -3
178 lines not on this page · raw message
hw/hexagon/Kconfig +1 -0
@@ -2,6 +2,7 @@ config HEX_DSP bool default y depends on HEXAGON + select ARM_COMPATIBLE_SEMIHOSTING config HEX_VIRT bool
qemu-options.hx +4 -4
@@ -5507,7 +5507,7 @@ ERST DEF("semihosting", 0, QEMU_OPTION_semihosting, "-semihosting semihosting mode\n", QEMU_ARCH_ARM | QEMU_ARCH_M68K | QEMU_ARCH_XTENSA | - QEMU_ARCH_MIPS | QEMU_ARCH_RISCV) + QEMU_ARCH_MIPS | QEMU_ARCH_RISCV | QEMU_ARCH_HEXAGON) SRST ``-semihosting`` Enable :ref:`Semihosting` mode (ARM, M68K, Xtensa, MIPS, RISC-V only).
@@ -5523,11 +5523,11 @@ DEF("semihosting-config", HAS_ARG, QEMU_OPTION_semihosting_config, "-semihosting-config [enable=on|off][,target=native|gdb|auto][,chardev=id][,userspace=on|off][,arg=str[,...]]\n" \ " semihosting configuration\n", QEMU_ARCH_ARM | QEMU_ARCH_M68K | QEMU_ARCH_XTENSA | -QEMU_ARCH_MIPS | QEMU_ARCH_RISCV) +QEMU_ARCH_MIPS | QEMU_ARCH_RISCV | QEMU_ARCH_HEXAGON) SRST ``-semihosting-config [enable=on|off][,target=native|gdb|auto][,chardev=id][,userspace=on|off][,arg=str[,...]]`` - Enable and configure :ref:`Semihosting` (ARM, M68K, Xtensa, MIPS, RISC-V - only). + Enable and configure :ref:`Semihosting` (ARM, M68K, Xtensa, MIPS, RISC-V, + Hexagon only). .. warning:: Note that this allows guest direct access to the host filesystem, so
target/hexagon/meson.build +3 -0
@@ -262,6 +262,9 @@ hexagon_softmmu_ss.add(files( 'machine.c', )) +hexagon_softmmu_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', + if_true: files('common-semi-target.c')) + # # Step 4.5 # We use flex/bison based idef-parser to generate TCG code for a lot
Signature · 1 line
2.37.2
PATCH 6/14 semihosting: add APIs for chardev-aware guest fd routing
In reply to Matheus Tavares BernardinoFrom: Brian Cain <[email protected]>
Add qemu_semihosting_console_has_chardev() to query whether the semihosting console is backed by a chardev, and console_guestfd() to initialize a guest file descriptor as GuestFDConsole.
These APIs enable callers to route semihosting I/O through a chardev rather than directly to host stdio.
--- include/semihosting/console.h | 9 +++++++++ include/semihosting/guestfd.h | 9 +++++++++ semihosting/console.c | 5 +++++ semihosting/guestfd.c | 8 ++++++++ 4 files changed, 31 insertions(+)
include/semihosting/console.h +9 -0
@@ -54,4 +54,13 @@ void qemu_semihosting_console_block_until_ready(CPUState *cs);*/ bool qemu_semihosting_console_ready (void ); +/** +* qemu_semihosting_console_has_chardev: +* +* Return true if the semihosting console is backed by a chardev. +* When true, console I/O goes through the chardev rather than +* host stdio. +*/ +bool qemu_semihosting_console_has_chardev (void ); +#endif /* SEMIHOST_CONSOLE_H */
include/semihosting/guestfd.h +9 -0
@@ -70,6 +70,15 @@ GuestFD *get_guestfd(int guestfd);*/ void associate_guestfd (int guestfd,int hostfd); +/** +* console_guestfd: +* @guestfd: GuestFD index +* +* Initialize the GuestFD for @guestfd to GuestFDConsole. +* I/O will be routed through the semihosting console chardev. +*/ +void console_guestfd (int guestfd); +/** * staticfile_guestfd: * @guestfd: GuestFD index
semihosting/console.c +5 -0
@@ -108,6 +108,11 @@ int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)return ret; } +bool qemu_semihosting_console_has_chardev (void ) +{ +return console.chr !=NULL ; +} +int qemu_semihosting_console_write (void *buf,int len) {if (console.chr) {
semihosting/guestfd.c +8 -0
@@ -117,6 +117,14 @@ void associate_guestfd(int guestfd, int hostfd) gf->hostfd = hostfd; } +void console_guestfd (int guestfd) +{ +GuestFD *gf =do_get_guestfd (guestfd); + +assert (gf); + gf->type = GuestFDConsole; +} +void staticfile_guestfd (int guestfd,const uint8_t *data,size_t len) {GuestFD *gf =do_get_guestfd (guestfd);
Signature · 1 line
2.37.2
PATCH 11/14 target/hexagon: add OPEN/READ/CLOSE_DIR semihosting operations
In reply to Matheus Tavares BernardinoFrom: Matheus Tavares Bernardino <[email protected]>
Baremetal Hexagon programs use semihosting to enumerate host directories via OPENDIR, READDIR, and CLOSEDIR calls. Track open directory handles per-CPU in a GList so that guest index values map back to host DIR pointers across calls.
--- target/hexagon/cpu.h | 1 + hw/hexagon/hexagon_dsp.c | 5 +++ hw/hexagon/virt.c | 5 +++ target/hexagon/hexswi.c | 79 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+)
target/hexagon/cpu.h +1 -0
@@ -144,6 +144,7 @@ typedef struct CPUArchState {uint32_t tlb_lock_count;uint32_t k0_lock_count;uint64_t t_cycle_count; +GList **g_dir_list;#endif uint32_t next_PC;target_ulong new_value_usr;
hw/hexagon/hexagon_dsp.c +5 -0
@@ -147,6 +147,7 @@ static void hexagon_common_init(MachineState *machine, Rev_t rev,for (int i =0 ; i < machine->smp.cpus; i++) {HexagonCPU *cpu =HEXAGON_CPU (object_new (machine->cpu_type)); +CPUHexagonState *env = &cpu->env;qemu_register_reset (do_cpu_reset, cpu);/*
@@ -156,6 +157,10 @@ static void hexagon_common_init(MachineState *machine, Rev_t rev,qdev_prop_set_bit (DEVICE (cpu),"start-powered-off" , (i !=0 ));if (i ==0 ) {hexagon_init_bootstrap (dms, cpu); + env->g_dir_list =g_malloc0 (sizeof (GList *)); + }else { +CPUHexagonState *env0 =cpu_env (qemu_get_cpu (0 )); + env->g_dir_list = env0->g_dir_list; }object_property_set_link (OBJECT (cpu),"global-regs" ,OBJECT (glob_regs_dev), &error_fatal);
hw/hexagon/virt.c +5 -0
@@ -283,10 +283,12 @@ static void virt_init(MachineState *ms) cpu0 =NULL ;for (int i =0 ; i < ms->smp.cpus; i++) {HexagonCPU *cpu =HEXAGON_CPU (object_new (ms->cpu_type)); +CPUHexagonState *env = &cpu->env;qemu_register_reset (do_cpu_reset, cpu);if (i ==0 ) { cpu0 =DEVICE (cpu); + env->g_dir_list =g_malloc0 (sizeof (GList *));if (ms->kernel_filename) {uint64_t entry =load_kernel (vms);qdev_prop_set_uint32 (cpu0,"exec-start-addr" , entry);
@@ -294,6 +296,9 @@ static void virt_init(MachineState *ms)uint64_t entry =load_bios (vms);qdev_prop_set_uint32 (cpu0,"exec-start-addr" , entry); } + }else { +CPUHexagonState *env0 =cpu_env (qemu_get_cpu (0 )); + env->g_dir_list = env0->g_dir_list; }qdev_prop_set_uint32 (DEVICE (cpu),"htid" , i);qdev_prop_set_bit (DEVICE (cpu),"start-powered-off" , (i !=0 ));
target/hexagon/hexswi.c +79 -0
91 lines not on this page · raw message
Signature · 1 line
2.37.2
PATCH 13/14 python/machine: support routing semihosting output to the test console
In reply to Matheus Tavares BernardinoFrom: Brian Cain <[email protected]>
The hexagon semihosting systests will wait for output on the semihosting console.
--- python/qemu/machine/machine.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
python/qemu/machine/machine.py +8 -2
@@ -186,6 +186,7 @@ def __init__(self, self._console_index = 0 self._console_set = False self._console_device_type: Optional[str] = None + self._console_semihosting = False self._console_socket: Optional[socket.socket] = None self._console_file: Optional[socket.SocketIO] = None self._remove_files: List[str] = []
@@ -321,7 +322,10 @@ def _console_args(self, interactive: bool = False) -> List[str]: fd = self._cons_sock_pair[0].fileno() chardev = f"socket,id=console,fd={fd}" args.extend(['-chardev', chardev]) - if self._console_device_type is None: + if self._console_semihosting: + args.extend(['-semihosting-config', + 'enable=on,chardev=console']) + elif self._console_device_type is None: args.extend(['-serial', 'chardev:console']) else: device = '%s,chardev=console' % self._console_device_type
@@ -892,7 +896,8 @@ def set_machine(self, machine_type: str) -> None: def set_console(self, device_type: Optional[str] = None, - console_index: int = 0) -> None: + console_index: int = 0, + semihosting: bool = False) -> None: """ Sets the device type for a console device
@@ -921,6 +926,7 @@ def set_console(self, self._console_set = True self._console_device_type = device_type self._console_index = console_index + self._console_semihosting = semihosting @property def console_socket(self) -> socket.socket:
Signature · 1 line
2.37.2
PATCH 10/14 target/hexagon: add COREDUMP semihosting operation
In reply to Matheus Tavares BernardinoFrom: Matheus Tavares Bernardino <[email protected]>
Baremetal Hexagon programs invoke SYS_COREDUMP (0xCD) through semihosting to dump CPU state on a fatal exception. Implement the handler to decode the SSR cause field and print the full register file, matching hexagon-sim behavior.
--- target/hexagon/internal.h | 1 + target/hexagon/cpu.c | 2 +- target/hexagon/hexswi.c | 143 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 1 deletion(-)
target/hexagon/internal.h +1 -0
@@ -28,6 +28,7 @@ int hexagon_hvx_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n);void hexagon_debug_vreg (CPUHexagonState *env,int regnum);void hexagon_debug_qreg (CPUHexagonState *env,int regnum);void hexagon_debug (CPUHexagonState *env); +void hexagon_dump (CPUHexagonState *env,FILE *f,int flags);extern const char *const hexagon_regnames[TOTAL_PER_THREAD_REGS ];#ifndef CONFIG_USER_ONLY
target/hexagon/cpu.c +1 -1
@@ -232,7 +232,7 @@ void hexagon_debug_qreg(CPUHexagonState *env, int regnum)print_qreg (stdout, env, regnum, false); } -static void hexagon_dump (CPUHexagonState *env,FILE *f,int flags) +void hexagon_dump (CPUHexagonState *env,FILE *f,int flags) {HexagonCPU *cpu =env_archcpu (env);
target/hexagon/hexswi.c +143 -0
155 lines not on this page · raw message
Signature · 1 line
2.37.2
PATCH 14/14 tests/functional: Add hexagon semihosting systests
In reply to Matheus Tavares BernardinoFrom: Brian Cain <[email protected]>
--- tests/functional/hexagon/meson.build | 9 ++ tests/functional/hexagon/test_systests.py | 133 ++++++++++++++++++++++ tests/functional/meson.build | 1 + 3 files changed, 143 insertions(+) create mode 100644 tests/functional/hexagon/meson.build create mode 100644 tests/functional/hexagon/test_systests.py
tests/functional/hexagon/meson.build new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_hexagon_timeouts = { + 'systests': 180, +} + +tests_hexagon_system_thorough = [ + 'systests', +]
tests/functional/hexagon/test_systests.py new file +133 -0
133 lines not on this page · raw message
tests/functional/meson.build +1 -0
@@ -14,6 +14,7 @@ subdir('aarch64') subdir('alpha') subdir('arm') subdir('avr') +subdir('hexagon') subdir('hppa') subdir('i386') subdir('loongarch64')
Signature · 1 line
2.37.2
PATCH 3/14 target/hexagon: add aux functions for guest mem load/store
In reply to Matheus Tavares BernardinoFrom: Matheus Tavares Bernardino <[email protected]>
Will be used for semihosting.
--- target/hexagon/cpu_helper.h | 6 ++ target/hexagon/cpu_helper.c | 133 ++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+)
target/hexagon/cpu_helper.h +6 -0
@@ -7,6 +7,12 @@#ifndef HEXAGON_CPU_HELPER_H #define HEXAGON_CPU_HELPER_H +void hexagon_read_memory (CPUHexagonState *env,target_ulong vaddr,int size, +void *retptr,uintptr_t retaddr); +void hexagon_write_memory (CPUHexagonState *env,target_ulong vaddr, +int size,uint64_t data,uintptr_t retaddr); +void hexagon_touch_memory (CPUHexagonState *env,uint32_t start_addr, +uint32_t length,uintptr_t retaddr);uint32_t hexagon_get_pmu_counter (CPUHexagonState *cur_env,int index);void hexagon_modify_ssr (CPUHexagonState *env,uint32_t new,uint32_t old);int get_cpu_mode (CPUHexagonState *env);
target/hexagon/cpu_helper.c +133 -0
139 lines not on this page · raw message
Signature · 1 line
2.37.2
PATCH 5/14 semihosting: add callback to set error
In reply to Matheus Tavares BernardinoThis is currently unused by existing semihosting targets, but it will be used by hexagon.
--- include/semihosting/common-semi.h | 1 + semihosting/arm-compat-semi.c | 1 + target/arm/common-semi-target.c | 4 ++++ target/riscv/common-semi-target.c | 4 ++++ 4 files changed, 10 insertions(+)
include/semihosting/common-semi.h +1 -0
@@ -37,6 +37,7 @@void do_common_semihosting (CPUState *cs);uint64_t common_semi_arg (CPUState *cs,int argno);void common_semi_set_ret (CPUState *cs,uint64_t ret); +void common_semi_set_err (CPUState *cs,int err);bool is_64bit_semihosting (CPUArchState *env);bool common_semi_sys_exit_is_extended (CPUState *cs);uint64_t common_semi_stack_bottom (CPUState *cs);
semihosting/arm-compat-semi.c +1 -0
@@ -237,6 +237,7 @@ static void common_semi_cb(CPUState *cs, uint64_t ret, int err) ts->swi_errno = err;#else syscall_err = err; +common_semi_set_err (cs, err);#endif }common_semi_set_ret (cs, ret);
target/arm/common-semi-target.c +4 -0
@@ -34,6 +34,10 @@ void common_semi_set_ret(CPUState *cs, uint64_t ret) } } +void common_semi_set_err (CPUState *cs,int err) +{ +} +bool common_semi_sys_exit_is_extended (CPUState *cs) {return is_a64 (cpu_env (cs));
target/riscv/common-semi-target.c +4 -0
@@ -26,6 +26,10 @@ void common_semi_set_ret(CPUState *cs, uint64_t ret) env->gpr[xA0] = ret; } +void common_semi_set_err (CPUState *cs,int err) +{ +} +bool is_64bit_semihosting (CPUArchState *env) {return riscv_cpu_mxl (env) !=MXL_RV32 ;
Signature · 1 line
2.37.2
PATCH 12/14 target/hexagon: Add an errno mapping
In reply to Matheus Tavares BernardinoFrom: Brian Cain <[email protected]>
The Hexagon semihosting ABI defines its own errno values which may differ from the host's. Translate host errno to the Hexagon-specific values before returning results to the guest so that baremetal programs see the expected error codes.
--- target/hexagon/hexswi.c | 81 +++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 15 deletions(-)
target/hexagon/hexswi.c +66 -15
@@ -122,12 +122,63 @@ static void do_preload(CPUHexagonState *env, target_ulong swi_info, bool load)hexagon_touch_memory (env, addr, count, retaddr); } +/* Hexagon semihosting errno values */ +#define HEX_EINVAL 22 +#define HEX_ERRNOS \ + HEX_ERRNO(EPERM, 1) \ + HEX_ERRNO(ENOENT, 2) \ + HEX_ERRNO(EINTR, 4) \ + HEX_ERRNO(EIO, 5) \ + HEX_ERRNO(ENXIO, 6) \ + HEX_ERRNO(EBADF, 9) \ + HEX_ERRNO(EAGAIN, 11) \ + HEX_ERRNO(ENOMEM, 12) \ + HEX_ERRNO(EACCES, 13) \ + HEX_ERRNO(EFAULT, 14) \ + HEX_ERRNO(EBUSY, 16) \ + HEX_ERRNO(EEXIST, 17) \ + HEX_ERRNO(EXDEV, 18) \ + HEX_ERRNO(ENODEV, 19) \ + HEX_ERRNO(ENOTDIR, 20) \ + HEX_ERRNO(EISDIR, 21) \ + HEX_ERRNO(EINVAL, HEX_EINVAL) \ + HEX_ERRNO(ENFILE, 23) \ + HEX_ERRNO(EMFILE, 24) \ + HEX_ERRNO(ENOTTY, 25) \ + HEX_ERRNO(ETXTBSY, 26) \ + HEX_ERRNO(EFBIG, 27) \ + HEX_ERRNO(ENOSPC, 28) \ + HEX_ERRNO(ESPIPE, 29) \ + HEX_ERRNO(EROFS, 30) \ + HEX_ERRNO(EMLINK, 31) \ + HEX_ERRNO(EPIPE, 32) \ + HEX_ERRNO(ERANGE, 34) \ + HEX_ERRNO(ENAMETOOLONG, 36) \ + HEX_ERRNO(ENOSYS, 38) \ + HEX_ERRNO(ELOOP, 40) \ + HEX_ERRNO(EOVERFLOW, 75) + +/* Map host errno to hexagon semihosting errno */ +static void semi_cb (CPUState *cs,uint64_t ret,int err) +{ +#define HEX_ERRNO (NAME ,CODE ) case NAME: err = CODE; break; +switch (err) { +case 0 : +break ; +HEX_ERRNOS + default: + err =HEX_EINVAL ; +break ; + } +common_semi_cb (cs, ret, err); +} +static void common_semi_ftell_cb (CPUState *cs,uint64_t ret,int err) {if (err) { ret =-1 ; } -common_semi_cb (cs, ret, err); +semi_cb (cs, ret, err); }static void coredump (CPUHexagonState *env)
@@ -360,7 +411,7 @@ static void sim_handle_trap0(CPUHexagonState *env)qemu_log_mask (LOG_GUEST_ERROR ,"%s: filename too large (%d)\n" , __func__, length); -common_semi_cb (cs,-1 ,ENAMETOOLONG ); +semi_cb (cs,-1 ,ENAMETOOLONG );break ; }
@@ -377,7 +428,7 @@ static void sim_handle_trap0(CPUHexagonState *env)qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid OPEN mode: %u\n" , __func__, filemode); -common_semi_cb (cs,-1 ,EINVAL ); +semi_cb (cs,-1 ,EINVAL );break ; }
@@ -396,7 +447,7 @@ static void sim_handle_trap0(CPUHexagonState *env) ret = guestfd; } } -common_semi_cb (cs, ret, err); +semi_cb (cs, ret, err); }break ;
@@ -415,7 +466,7 @@ static void sim_handle_trap0(CPUHexagonState *env) {int fd;hexagon_read_memory (env, swi_info,4 , &fd, retaddr); -common_semi_cb (cs,isatty (fd),0 ); +semi_cb (cs,isatty (fd),0 ); }break ;
@@ -496,7 +547,7 @@ static void sim_handle_trap0(CPUHexagonState *env)hexagon_write_memory (env, statBufferAddr + i,1 , st_bufptr[i], retaddr); } -common_semi_cb (cs, rc, rc ==0 ?0 : err); +semi_cb (cs, rc, rc ==0 ?0 : err); }break ;
@@ -506,7 +557,7 @@ static void sim_handle_trap0(CPUHexagonState *env)off_t size_limit;hexagon_read_memory (env, swi_info,4 , &fd, retaddr);hexagon_read_memory (env, swi_info +4 ,8 , &size_limit, retaddr); -semihost_sys_ftruncate (cs, common_semi_cb, fd, size_limit); +semihost_sys_ftruncate (cs, semi_cb, fd, size_limit); }break ;
@@ -530,7 +581,7 @@ static void sim_handle_trap0(CPUHexagonState *env)hexagon_read_memory (env, swi_info +4 ,4 , &BufferMode, retaddr); rc =access (filename, BufferMode); -common_semi_cb (cs, rc, rc ==0 ?0 : errno); +semi_cb (cs, rc, rc ==0 ?0 : errno); }break ;
@@ -558,14 +609,14 @@ static void sim_handle_trap0(CPUHexagonState *env) rc = BufferAddr; } } -common_semi_cb (cs, rc, rc !=0 ?0 : err); +semi_cb (cs, rc, rc !=0 ?0 : err);break ; }case HEX_SYS_EXEC : {qemu_log_mask (LOG_UNIMP ,"SYS_EXEC is deprecated\n" ); -common_semi_cb (cs,-1 ,ENOSYS ); +semi_cb (cs,-1 ,ENOSYS ); }break ;
@@ -588,7 +639,7 @@ static void sim_handle_trap0(CPUHexagonState *env) }else { err = errno; } -common_semi_cb (cs, rc, rc !=0 ?0 : err); +semi_cb (cs, rc, rc !=0 ?0 : err);break ; }
@@ -622,7 +673,7 @@ static void sim_handle_trap0(CPUHexagonState *env) } rc = guest_dir_entry; } -common_semi_cb (cs, rc, err); +semi_cb (cs, rc, err);break ; }
@@ -641,7 +692,7 @@ static void sim_handle_trap0(CPUHexagonState *env) }else { err =EBADF ; } -common_semi_cb (cs, ret, ret ==0 ?0 : err); +semi_cb (cs, ret, ret ==0 ?0 : err);break ; }
@@ -680,7 +731,7 @@ static void sim_handle_trap0(CPUHexagonState *env)case HEX_SYS_PROF_STATSRESET :case HEX_SYS_DUMP_PMU_STATS :case HEX_SYS_HEAPINFO : -common_semi_cb (cs,-1 ,ENOSYS ); +semi_cb (cs,-1 ,ENOSYS ); qemu_log_mask(LOG_UNIMP, "SWI call %" PRIx32 " is unimplemented in QEMU\n",
@@ -693,7 +744,7 @@ static void sim_handle_trap0(CPUHexagonState *env)qemu_log_mask (LOG_GUEST_ERROR ,"unknown swi request: 0x%" PRIx32"\n" , (uint32_t )what_swi); -common_semi_cb (cs,-1 ,ENOSYS ); +semi_cb (cs,-1 ,ENOSYS ); } }
Signature · 1 line
2.37.2
Re: [PATCH 01/14] target/hexagon: fix get_phys_addr_debug with in-page offset
In reply to Matheus Tavares BernardinoQuoted 11 lines · Matheus Tavares Bernardino
As documented:
* @get_phys_addr_debug: Callback for obtaining a physical address.
* This must be able to handle a non-page-aligned address, and will
* return the physical address corresponding to that address.When MMU is enabled,
hexagon_cpu_get_phys_addr_debug()returns the physical address page-aligned, not corrected to reflect the exact byte the virtual addr maps to within the page. Let's fix that. The MMU-disabled case is already correct.
Quoted 7 lines
This would break semihosting argument reads when it is added for Hexagon.
Signed-off-by Matheus Tavares Bernardino <[email protected]>--- target/hexagon/cpu.c | 2 ++ 1 file changed, 2 insertions(+)
Hi Matheus,
Quoted 49 lines · Matheus Tavares Bernardino
This series adds semihosting support to hexagon system emulation, together with functional tests for the added operations.
The Hexagon semihosting spec can be found at:
https://docs.qualcomm.com/doc/80-N2040-101_102648/topic/semihosting-specification.htmlBrian Cain (4):
semihosting: add APIs for chardev-aware guest fd routing target/hexagon: Add an errno mapping
python/machine: support routing semihosting output to the test console tests/functional: Add hexagon semihosting systestsMatheus Tavares Bernardino (10):
target/hexagon: fixget_phys_addr_debugwith in-page offset target/hexagon: fix PC advancement for non-COF TB terminators target/hexagon: add aux functions for guest mem load/store
hexagon:cpu_helper: add reg reading/writing helpers
semihosting: add callback to set error target/hexagon: add semihosting support
semihosting: add ftruncate helper (to be used for hexagon) target/hexagon: add main arch-specific semihosting operations target/hexagon: add COREDUMP semihosting operation target/hexagon: add OPEN/READ/CLOSE_DIR semihosting operationsconfigs/targets/hexagon-softmmu.mak | 2 + include/semihosting/common-semi.h | 2 + include/semihosting/console.h | 9 + include/semihosting/guestfd.h | 9 + include/semihosting/syscalls.h | 2 + target/hexagon/cpu.h | 1 + target/hexagon/cpu_helper.h | 24 + target/hexagon/internal.h | 1 + hw/hexagon/hexagon_dsp.c | 7 + hw/hexagon/virt.c | 5 + semihosting/arm-compat-semi.c | 3 +- semihosting/console.c | 5 + semihosting/guestfd.c | 8 + semihosting/syscalls.c | 29 + target/arm/common-semi-target.c | 4 + target/hexagon/common-semi-target.c | 51 ++ target/hexagon/cpu.c | 4 +- target/hexagon/cpu_helper.c | 173 +++++ target/hexagon/hexswi.c | 728 +++++++++++++++++++++- target/hexagon/op_helper.c | 18 +- target/hexagon/translate.c | 13 +- target/riscv/common-semi-target.c | 4 + hw/hexagon/Kconfig | 1 + python/qemu/machine/machine.py | 10 +- qemu-options.hx | 8 +-
Quoted 9 lines
target/hexagon/meson.build | 3 + tests/functional/hexagon/meson.build | 9 + tests/functional/hexagon/test_systests.py | 133 ++++ tests/functional/meson.build | 1 + 29 files changed, 1236 insertions(+), 31 deletions(-) create mode 100644 target/hexagon/common-semi-target.c create mode 100644 tests/functional/hexagon/meson.build create mode 100644 tests/functional/hexagon/test_systests.py
see some build failures on windows and macos.
(feel free to ignore other one, seems to be a network outage issue). Also, a few checkpatch style issues.
https://github.com/p-b-o/qemu-ci/actions/runs/29283651823
Regards,
Pierrick
Re: [PATCH 02/14] target/hexagon: fix PC advancement for non-COF TB terminators
In reply to Matheus Tavares BernardinoQuoted 13 lines · Matheus Tavares Bernardino
Some packets end a translation block without a change-of-flow. These do not update the PC during commit, so
gen_end_tb()leaves hex_gpr[HEX_REG_PC] pointing at the same packet and the block gets re-entered forever. Set PC explicitly tonext_PCin thatgen_end_tb()branch to fix execution of next blocks.Note that
gen_start_packet()used to have a special case for tlblock/k0lock, settingctx->next_PCto the packet's own address. This relies on the tlblock/k0lock helpers to properly advance the PC, which is never done (onlyenv->next_PCis updated, but that never reaches hex_gpr[HEX_REG_PC]). Drop the special case so these packets advance to the following packet like any other non-COF TB terminator.
Quoted 5 lines
Signed-off-by Matheus Tavares Bernardino <[email protected]>--- target/hexagon/translate.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
Re: [PATCH 03/14] target/hexagon: add aux functions for guest mem load/store
In reply to Matheus Tavares BernardinoQuoted 158 lines · Matheus Tavares Bernardino
From: Matheus Tavares Bernardino <[email protected]>
Will be used for semihosting.
Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>--- target/hexagon/cpu_helper.h | 6 ++ target/hexagon/cpu_helper.c | 133 ++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+)target/hexagon/cpu_helper.h +6
-0@@ -7,6 +7,12 @@#ifndef HEXAGON_CPU_HELPER_H #define HEXAGON_CPU_HELPER_H +void hexagon_read_memory (CPUHexagonState *env,target_ulong vaddr,int size, +void *retptr,uintptr_t retaddr); +void hexagon_write_memory (CPUHexagonState *env,target_ulong vaddr, +int size,uint64_t data,uintptr_t retaddr); +void hexagon_touch_memory (CPUHexagonState *env,uint32_t start_addr, +uint32_t length,uintptr_t retaddr);uint32_t hexagon_get_pmu_counter (CPUHexagonState *cur_env,int index);void hexagon_modify_ssr (CPUHexagonState *env,uint32_t new,uint32_t old);int get_cpu_mode (CPUHexagonState *env);target/hexagon/cpu_helper.c +122
-0@@ -25,6 +25,139 @@#include "sys_macros.h" #include "arch.h" +#ifndef CONFIG_USER_ONLY + +static bool hexagon_read_memory_small (CPUHexagonState *env,target_ulong addr, +int byte_count,unsigned char *dstbuf, +int mmu_idx,uintptr_t retaddr) + { +/* handle small sizes */ +switch (byte_count) { +case 1 : + *dstbuf =cpu_ldub_mmuidx_ra (env, addr, mmu_idx, retaddr); +return true; + +case 2 : +if (QEMU_IS_ALIGNED (addr,2 )) { + *(unsigned short *)dstbuf = +cpu_lduw_le_mmuidx_ra (env, addr, mmu_idx, retaddr); +return true; + } +break ; + +case 4 : +if (QEMU_IS_ALIGNED (addr,4 )) { + *(uint32_t *)dstbuf = +cpu_ldl_le_mmuidx_ra (env, addr, mmu_idx, retaddr); +return true; + } +break ; + +case 8 : +if (QEMU_IS_ALIGNED (addr,8 )) { + *(uint64_t *)dstbuf = +cpu_ldq_le_mmuidx_ra (env, addr, mmu_idx, retaddr); +return true; + } +break ; + +default : +/* larger request, handle elsewhere */ +return false; + } + +/* not aligned, copy bytes */ +for (int i =0 ; i < byte_count; ++i) { + *dstbuf++ =cpu_ldub_mmuidx_ra (env, addr++, mmu_idx, retaddr); + } +return true; +} + +void hexagon_read_memory (CPUHexagonState *env,target_ulong vaddr,int size, +void *retptr,uintptr_t retaddr) +{ +BQL_LOCK_GUARD (); +CPUState *cs =env_cpu (env); +unsigned mmu_idx =cpu_mmu_index (cs, false); +if (!hexagon_read_memory_small (env, vaddr, size, retptr, mmu_idx, + retaddr)) { +cpu_abort (cs,"%s: ERROR: bad size = %d!\n" , __func__, size); + } +} + +static bool hexagon_write_memory_small (CPUHexagonState *env,target_ulong addr, +int byte_count,unsigned char *srcbuf, +int mmu_idx,uintptr_t retaddr) +{ +/* handle small sizes */ +switch (byte_count) { +case 1 : +cpu_stb_mmuidx_ra (env, addr, *srcbuf, mmu_idx, retaddr); +return true; + +case 2 : +if (QEMU_IS_ALIGNED (addr,2 )) { +cpu_stw_le_mmuidx_ra (env, addr, *(uint16_t *)srcbuf, mmu_idx, retaddr); +return true; + } +break ; + +case 4 : +if (QEMU_IS_ALIGNED (addr,4 )) { +cpu_stl_le_mmuidx_ra (env, addr, *(uint32_t *)srcbuf, mmu_idx, retaddr); +return true; + } +break ; + +case 8 : +if (QEMU_IS_ALIGNED (addr,8 )) { +cpu_stq_le_mmuidx_ra (env, addr, *(uint64_t *)srcbuf, mmu_idx, retaddr); +return true; + } +break ; + +default : +/* larger request, handle elsewhere */ +return false; + } + +/* not aligned, copy bytes */ +for (int i =0 ; i < byte_count; ++i) { +cpu_stb_mmuidx_ra (env, addr++, *srcbuf++, mmu_idx, retaddr); + } + +return true; +} + +void hexagon_write_memory (CPUHexagonState *env,target_ulong vaddr, +int size,uint64_t data,uintptr_t retaddr) +{ +CPUState *cs =env_cpu (env); +unsigned mmu_idx =cpu_mmu_index (cs, false); +if (!hexagon_write_memory_small (env, vaddr, size, (unsigned char *)&data, + mmu_idx, retaddr)) { +cpu_abort (cs,"%s: ERROR: bad size = %d!\n" , __func__, size); + } +} + +static inline uint32_t page_start (uint32_t addr) +{ +uint32_t page_align = ~(TARGET_PAGE_SIZE -1 ); +return addr & page_align; +} + +void hexagon_touch_memory(CPUHexagonState *env, uint32_t start_addr,
target/hexagon/cpu_helper.c line 159
Quoted 10 lines
target/hexagon/cpu_helper.c +10
-0+ uint32_t length, uintptr_t retaddr) +{ +unsigned int warm; +uint32_t first =page_start (start_addr); +uint32_t last =page_start (start_addr + length -1 ); +for (uint32_t page = first; page <= last; page +=TARGET_PAGE_SIZE ) { +hexagon_read_memory (env, page,1 , &warm, retaddr); + } +} +
Name could be misleading, I would be expectng to see a read/write sequence in each page instead of just reading.
Maybe hexagon_peek_memory_range?
target/hexagon/cpu_helper.c line 163
Quoted 4 lines
target/hexagon/cpu_helper.c +1
-0+#endif uint32_t hexagon_get_pmu_counter (CPUHexagonState *cur_env,int index) {
Regards,
Pierrick
Re: [PATCH 04/14] hexagon: cpu_helper: add reg reading/writing helpers
In reply to Matheus Tavares BernardinoQuoted 10 lines · Matheus Tavares Bernardino
And adjust
op_helperto use those. They will also be used on upcoming semihosting commits.Signed-off-by Matheus Tavares Bernardino <[email protected]>--- target/hexagon/cpu_helper.h | 18 +++++++++++++++++ target/hexagon/cpu_helper.c | 40 +++++++++++++++++++++++++++++++++++++ target/hexagon/op_helper.c | 18 ++--------------- 3 files changed, 60 insertions(+), 16 deletions(-)
Re: [PATCH 05/14] semihosting: add callback to set error
In reply to Matheus Tavares BernardinoQuoted 12 lines · Matheus Tavares Bernardino
This is currently unused by existing semihosting targets, but it will be used by hexagon.
Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>--- include/semihosting/common-semi.h | 1 + semihosting/arm-compat-semi.c | 1 + target/arm/common-semi-target.c | 4 ++++ target/riscv/common-semi-target.c | 4 ++++ 4 files changed, 10 insertions(+)
Is it used in this series?
Regards,
Pierrick
Re: [PATCH 06/14] semihosting: add APIs for chardev-aware guest fd routing
In reply to Matheus Tavares BernardinoQuoted 9 lines · Matheus Tavares Bernardino
From: Brian Cain <[email protected]>
Add
qemu_semihosting_console_has_chardev()to query whether the semihosting console is backed by a chardev, andconsole_guestfd()to initialize a guest file descriptor as GuestFDConsole.These APIs enable callers to route semihosting I/O through a chardev rather than directly to host stdio.
Quoted 8 lines
Signed-off-by Brian Cain <[email protected]>--- include/semihosting/console.h | 9 +++++++++ include/semihosting/guestfd.h | 9 +++++++++ semihosting/console.c | 5 +++++ semihosting/guestfd.c | 8 ++++++++ 4 files changed, 31 insertions(+)
Re: [PATCH 07/14] target/hexagon: add semihosting support
In reply to Matheus Tavares BernardinoQuoted 21 lines · Matheus Tavares Bernardino
From: Matheus Tavares Bernardino <[email protected]>
Baremetal Hexagon programs use trap0 #0 to invoke semihosting calls for I/O and process control. Wire up the arm-compatible semihosting framework for softmmu by enabling
CONFIG_ARM_COMPATIBLE_SEMIHOSTINGand routing trap0 to the semihosting handler.Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>--- configs/targets/hexagon-softmmu.mak | 2 + hw/hexagon/hexagon_dsp.c | 2 + target/hexagon/common-semi-target.c | 51 +++++++++ target/hexagon/hexswi.c | 164 +++++++++++++++++++++++++++- hw/hexagon/Kconfig | 1 + qemu-options.hx | 8 +- target/hexagon/meson.build | 3 + 7 files changed, 224 insertions(+), 7 deletions(-) create mode 100644 target/hexagon/common-semi-target.c
...
target/hexagon/hexswi.c line 125
Quoted 4 lines
target/hexagon/hexswi.c +4
-0+static void sim_handle_trap0 (CPUHexagonState *env) +{ +target_ulong what_swi, swi_info; + G_GNUC_UNUSED uintptr_t retaddr = 0;
leftover?
For the rest:
Regards,
Pierrick
Re: [PATCH 08/14] semihosting: add ftruncate helper (to be used for hexagon)
In reply to Matheus Tavares BernardinoQuoted 5 lines · Matheus Tavares Bernardino
The common semihosting syscall layer has no ftruncate helper, but the Hexagon semihosting ABI includes an FTRUNC operation. Add
semihost_sys_ftruncate()so that Hexagon can delegate to it rather than calling ftruncate directly.
Quoted 7 lines
Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>--- include/semihosting/syscalls.h | 2 ++ semihosting/syscalls.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)
Re: [PATCH 09/14] target/hexagon: add main arch-specific semihosting operations
In reply to Matheus Tavares BernardinoQuoted 59 lines · Matheus Tavares Bernardino
The Hexagon semihosting ABI extends the arm-compatible set with operations like OPEN, WRITECREG, WRITE0, ISTTY, STAT, FSTAT, FTELL, SEEK, FTRUNC, ACCESS, and GETCWD. Implement these trap0 handlers so that baremetal programs using the standard Hexagon simulator ABI can perform file I/O when running on qemu-system-hexagon.
Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>--- include/semihosting/common-semi.h | 1 + semihosting/arm-compat-semi.c | 2 +- target/hexagon/hexswi.c | 293 +++++++++++++++++++++++++++++- 3 files changed, 294 insertions(+), 2 deletions(-)include/semihosting/common-semi.h +1
-0@@ -34,6 +34,7 @@#ifndef COMMON_SEMI_H #define COMMON_SEMI_H +void common_semi_cb (CPUState *cs,uint64_t ret,int err);void do_common_semihosting (CPUState *cs);uint64_t common_semi_arg (CPUState *cs,int argno);void common_semi_set_ret (CPUState *cs,uint64_t ret);semihosting/arm-compat-semi.c +1
-1@@ -229,7 +229,7 @@ static inline uint32_t get_swi_errno(CPUState *cs)#endif } -static void common_semi_cb (CPUState *cs,uint64_t ret,int err) +void common_semi_cb (CPUState *cs,uint64_t ret,int err) {if (err) {#ifdef CONFIG_USER_ONLY target/hexagon/hexswi.c +8
-0@@ -119,6 +119,14 @@ static void do_preload(CPUHexagonState *env, target_ulong swi_info, bool load)hexagon_touch_memory (env, addr, count, retaddr); } +static void common_semi_ftell_cb (CPUState *cs,uint64_t ret,int err) +{ +if (err) { + ret =-1 ; + } +common_semi_cb (cs, ret, err); +} +static void sim_handle_trap0 (CPUHexagonState *env) {target_ulong what_swi, swi_info;
target/hexagon/hexswi.c static void sim_handle_trap0(CPUHexagonState *env) · line 189
Quoted 9 lines
target/hexagon/hexswi.c +5
-1@@ -174,7 +182,290 @@ static void sim_handle_trap0(CPUHexagonState *env)qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_SHUTDOWN );break ; -/* TODO: implement other hexagon-specific semihosting calls */ +#ifndef _WIN32 +case HEX_SYS_OPEN : + { +char filename[BUFSIZ ]; +target_ulong physicalFilenameAddr;
style: physical_filename_addr;
Quoted 12 lines
target/hexagon/hexswi.c +12
-0+unsigned int filemode; +int length; +int real_openmode; +int ret, err =0 ; +int i =0 ; +static const unsigned int mode_table[] = { +O_RDONLY , +O_RDONLY |O_BINARY , +O_RDWR , +O_RDWR |O_BINARY , +O_WRONLY |O_CREAT |O_TRUNC , +O_WRONLY |O_CREAT |O_TRUNC |O_BINARY ,
target/hexagon/hexswi.c static void sim_handle_trap0(CPUHexagonState *env) · line 211
Quoted 10 lines
target/hexagon/hexswi.c +10
-0+O_RDWR |O_CREAT |O_TRUNC , +O_RDWR |O_CREAT |O_TRUNC |O_BINARY , +O_WRONLY |O_APPEND |O_CREAT , +O_WRONLY |O_APPEND |O_CREAT |O_BINARY , +O_RDWR |O_APPEND |O_CREAT , +O_RDWR |O_APPEND |O_CREAT |O_BINARY , +O_RDWR |O_CREAT , + O_RDWR | O_CREAT | O_EXCL + }; +
Better to extract this with a static const, and a useful name. angel_to_host_filemode_table.
Quoted 11 lines
target/hexagon/hexswi.c +11
-0+ +hexagon_read_memory (env, swi_info,4 , &physicalFilenameAddr, retaddr); +hexagon_read_memory (env, swi_info +4 ,4 , &filemode, retaddr); +hexagon_read_memory (env, swi_info +8 ,4 , &length, retaddr); + +if (length >=BUFSIZ ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: filename too large (%d)\n" , + __func__, length); +common_semi_cb (cs,-1 ,ENAMETOOLONG ); +break ;
target/hexagon/hexswi.c static void sim_handle_trap0(CPUHexagonState *env) · line 232
Quoted 10 lines
target/hexagon/hexswi.c +10
-0+ } + +do { +hexagon_read_memory (env, physicalFilenameAddr + i,1 , &filename[i], + retaddr); + i++; + }while (filename[i -1 ]); + +/* convert ARM ANGEL filemode into host filemode */ +if (filemode <14 ) {
Also, compare to sizeof table introduced, or define a constant. ANGEL_FILEMODE_MAX = 13.
Quoted 29 lines
target/hexagon/hexswi.c +29
-0+ real_openmode = mode_table[filemode]; + }else { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: invalid OPEN mode: %u\n" , + __func__, filemode); +common_semi_cb (cs,-1 ,EINVAL ); +break ; + } + +if (strcmp (filename,":tt" ) ==0 && +qemu_semihosting_console_has_chardev ()) { + ret =alloc_guestfd (); +console_guestfd (ret); + }else { + ret =open (filename, real_openmode |O_BINARY ,0644 ); + +if (ret ==-1 ) { + err = errno; + }else { +int guestfd =alloc_guestfd (); +associate_guestfd (guestfd, ret); + ret = guestfd; + } + } +common_semi_cb (cs, ret, err); + } +break ; + +case HEX_SYS_WRITECREG :
target/hexagon/hexswi.c static void sim_handle_trap0(CPUHexagonState *env) · line 271
Quoted 10 lines
target/hexagon/hexswi.c +10
-0+ { +char c = swi_info; +qemu_semihosting_console_write (&c,1 ); + } +break ; + +/* +* Hexagon's SYS_ISTTY is a bit different than arm's: we do not return -1 +* on error, neither errno. So we override with out own implementation. +*/
s/out/our
Quoted 16 lines
target/hexagon/hexswi.c +16
-0+case HEX_SYS_ISTTY : + { +int fd; +hexagon_read_memory (env, swi_info,4 , &fd, retaddr); +common_semi_cb (cs,isatty (fd),0 ); + } +break ; + +case HEX_SYS_SEEK : + { +int fd; +target_ulong off; +hexagon_read_memory (env, swi_info,4 , &fd, retaddr); +hexagon_read_memory (env, swi_info +4 ,4 , &off, retaddr); +semihost_sys_lseek (env_cpu (env), common_semi_ftell_cb, fd, off, +GDB_SEEK_SET );
target/hexagon/hexswi.c static void sim_handle_trap0(CPUHexagonState *env) · line 297
Quoted 10 lines
target/hexagon/hexswi.c +10
-0+ } +break ; + +case HEX_SYS_STAT : +case HEX_SYS_FSTAT : + { +/* +* This must match the caller's definition, it would be in the +* caller's angel.h or equivalent header. +*/
It would be great to move this definition out of this function also.
Quoted 174 lines
target/hexagon/hexswi.c +171
-0+struct __SYS_STAT { +uint64_t dev; +uint64_t ino; +uint32_t mode; +uint32_t nlink; +uint64_t rdev; +uint32_t size; +uint32_t __pad1; +uint32_t atime; +uint32_t mtime; +uint32_t ctime; +uint32_t __pad2; + } sys_stat; +struct stat st_buf; +uint8_t *st_bufptr = (uint8_t *)&sys_stat; +int rc, err =0 ; +char filename[BUFSIZ ]; +target_ulong physicalFilenameAddr; +target_ulong statBufferAddr; +hexagon_read_memory (env, swi_info,4 , &physicalFilenameAddr, retaddr); + +if (what_swi ==HEX_SYS_STAT ) { +int i =0 ; +do { +hexagon_read_memory (env, physicalFilenameAddr + i,1 , + &filename[i], retaddr); + i++; + }while ((i <BUFSIZ ) && filename[i -1 ]); + rc =stat (filename, &st_buf); + err = errno; + }else { +int fd = physicalFilenameAddr; +GuestFD *gf =get_guestfd (fd); +if (!gf || gf->type != GuestFDHost) { +qemu_log_mask (LOG_UNIMP , +"fstat semihosting only implemented" +" for native mode\n" ); +g_assert_not_reached (); + } + rc =fstat (gf->hostfd, &st_buf); + err = errno; + } +if (rc ==0 ) { + sys_stat.dev = st_buf.st_dev; + sys_stat.ino = st_buf.st_ino; + sys_stat.mode = st_buf.st_mode; + sys_stat.nlink = (uint32_t ) st_buf.st_nlink; + sys_stat.rdev = st_buf.st_rdev; + sys_stat.size = (uint32_t ) st_buf.st_size; + sys_stat.atime = (uint32_t ) st_buf.st_atim.tv_sec; + sys_stat.mtime = (uint32_t ) st_buf.st_mtim.tv_sec; + sys_stat.ctime = (uint32_t ) st_buf.st_ctim.tv_sec; + } +hexagon_read_memory (env, swi_info +4 ,4 , &statBufferAddr, retaddr); + +for (int i =0 ; i <sizeof (sys_stat); i++) { +hexagon_write_memory (env, statBufferAddr + i,1 , st_bufptr[i], + retaddr); + } +common_semi_cb (cs, rc, rc ==0 ?0 : err); + } +break ; + +case HEX_SYS_FTRUNC : + { +int fd; +off_t size_limit; +hexagon_read_memory (env, swi_info,4 , &fd, retaddr); +hexagon_read_memory (env, swi_info +4 ,8 , &size_limit, retaddr); +semihost_sys_ftruncate (cs, common_semi_cb, fd, size_limit); + } +break ; + +case HEX_SYS_ACCESS : + { +char filename[BUFSIZ ]; +uint32_t FileNameAddr; +uint32_t BufferMode; +int rc; + +int i =0 ; + +hexagon_read_memory (env, swi_info,4 , &FileNameAddr, retaddr); +do { +hexagon_read_memory (env, FileNameAddr + i,1 , &filename[i], + retaddr); + i++; + }while ((i <BUFSIZ ) && (filename[i -1 ])); + filename[i] =0 ; + +hexagon_read_memory (env, swi_info +4 ,4 , &BufferMode, retaddr); + + rc =access (filename, BufferMode); +common_semi_cb (cs, rc, rc ==0 ?0 : errno); + } +break ; + +case HEX_SYS_GETCWD : + { +char cwdPtr[PATH_MAX ]; +uint32_t BufferAddr; +uint32_t BufferSize; +uint32_t rc =0 , err =0 ; + +hexagon_read_memory (env, swi_info,4 , &BufferAddr, retaddr); +hexagon_read_memory (env, swi_info +4 ,4 , &BufferSize, retaddr); + +if (!getcwd (cwdPtr,PATH_MAX )) { + err = errno; + }else { +size_t cwd_size =strlen (cwdPtr); +if (cwd_size > BufferSize) { + err =ERANGE ; + }else { +for (int i =0 ; i < cwd_size; i++) { +hexagon_write_memory (env, BufferAddr + i,1 , + (uint64_t )cwdPtr[i], retaddr); + } + rc = BufferAddr; + } + } +common_semi_cb (cs, rc, rc !=0 ?0 : err); +break ; + } + +case HEX_SYS_EXEC : + { +qemu_log_mask (LOG_UNIMP ,"SYS_EXEC is deprecated\n" ); +common_semi_cb (cs,-1 ,ENOSYS ); + } +break ; + +case HEX_SYS_FTELL : + { +int fd; +hexagon_read_memory (env, swi_info,4 , &fd, retaddr); +semihost_sys_lseek (cs, common_semi_ftell_cb, fd,0 ,GDB_SEEK_CUR ); + } +break ; + +case HEX_SYS_READ_CYCLES : +case HEX_SYS_READ_TCYCLES : +case HEX_SYS_READ_ICOUNT : + { +arch_set_thread_reg (env,HEX_REG_R00 ,0 ); +arch_set_thread_reg (env,HEX_REG_R01 ,0 ); +break ; + } + +case HEX_SYS_READ_PCYCLES : + { +arch_set_thread_reg (env,HEX_REG_R00 , +arch_get_system_reg (env,HEX_SREG_PCYCLELO )); +arch_set_thread_reg (env,HEX_REG_R01 , +arch_get_system_reg (env,HEX_SREG_PCYCLEHI )); +break ; + } + +case HEX_SYS_PROF_ON : +case HEX_SYS_PROF_OFF : +case HEX_SYS_PROF_STATSRESET : +case HEX_SYS_DUMP_PMU_STATS : +case HEX_SYS_HEAPINFO : +common_semi_cb (cs,-1 ,ENOSYS ); +qemu_log_mask (LOG_UNIMP , +"SWI call %" PRIx32 +" is unimplemented in QEMU\n" , + (uint32_t )what_swi); +break ; + +#endif /* ! _WIN32 */ default : qemu_log_mask(LOG_GUEST_ERROR,
Re: [PATCH 10/14] target/hexagon: add COREDUMP semihosting operation
In reply to Matheus Tavares BernardinoQuoted 7 lines · Matheus Tavares Bernardino
From: Matheus Tavares Bernardino <[email protected]>
Baremetal Hexagon programs invoke
SYS_COREDUMP(0xCD) through semihosting to dump CPU state on a fatal exception. Implement the handler to decode the SSR cause field and print the full register file, matching hexagon-sim behavior.
Quoted 8 lines
Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>--- target/hexagon/internal.h | 1 + target/hexagon/cpu.c | 2 +- target/hexagon/hexswi.c | 143 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 1 deletion(-)
Re: [PATCH 12/14] target/hexagon: Add an errno mapping
In reply to Matheus Tavares BernardinoQuoted 7 lines · Matheus Tavares Bernardino
From: Brian Cain <[email protected]>
The Hexagon semihosting ABI defines its own errno values which may differ from the host's. Translate host errno to the Hexagon-specific values before returning results to the guest so that baremetal programs see the expected error codes.
Quoted 6 lines
Signed-off-by Brian Cain <[email protected]>Signed-off-by Matheus Tavares Bernardino <[email protected]>--- target/hexagon/hexswi.c | 81 +++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 15 deletions(-)
Re: [PATCH 13/14] python/machine: support routing semihosting output to the test console
In reply to Matheus Tavares BernardinoQuoted 11 lines · Matheus Tavares Bernardino
From: Brian Cain <[email protected]>
The hexagon semihosting systests will wait for output on the semihosting console.
Signed-off-by Brian Cain <[email protected]>Signed-off-by Matheus Tavares Bernardino <[email protected]>--- python/qemu/machine/machine.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Re: [PATCH 14/14] tests/functional: Add hexagon semihosting systests
In reply to Matheus Tavares BernardinoQuoted 77 lines · Matheus Tavares Bernardino
From: Brian Cain <[email protected]>
Signed-off-by Brian Cain <[email protected]>Signed-off-by Matheus Tavares Bernardino <[email protected]>--- tests/functional/hexagon/meson.build | 9 ++ tests/functional/hexagon/test_systests.py | 133 ++++++++++++++++++++++ tests/functional/meson.build | 1 + 3 files changed, 143 insertions(+) create mode 100644 tests/functional/hexagon/meson.build create mode 100644 tests/functional/hexagon/test_systests.pytests/functional/hexagon/meson.build new file +9
-0@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_hexagon_timeouts = { + 'systests': 180, +} + +tests_hexagon_system_thorough = [ + 'systests', +]tests/functional/hexagon/test_systests.py new file +44
-0@@ -0,0 +1,133 @@ +#!/usr/bin/env python3 +# +# Copyright(c) Qualcomm Innovation Center, Inc. All Rights Reserved. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import re +import time +import unittest + +from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern + + +_TARBALL_BIN_PATH = os.path.join( + "systests_standalone_package", + "StandaloneSysTests_6.4.0.2_v68", + "bin", +) + + +class SysTestsStandaloneTests(QemuSystemTest): + SYSTEST_TIMEOUT_SEC = 30 + + ASSET_TARBALL = Asset( + "https://github.com/qualcomm/qemu-hexagon-testing/releases/download/v0.2.9/systests_standalone.tar.gz", + "db961ea3fcc389b478b3d5c2f3bac60bec87e7f3d7efef5e58a9ae8ee78d0e40", + ) + + def setUp(self): + super().setUp() + self.archive_extract(self.ASSET_TARBALL) + self.bin_dir = os.path.join(self.workdir, _TARBALL_BIN_PATH) + self._orig_cwd = os.getcwd() + os.chdir(self.workdir) + self.addCleanup(os.chdir, self._orig_cwd) + + def tearDown(self): + if hasattr(self, "_orig_cwd"): + os.chdir(self._orig_cwd) + super().tearDown() + + def binary(self, name): + """Return the full path to binary *name* inside bin_dir."""
tests/functional/hexagon/test_systests.py line 54
Quoted 10 lines
tests/functional/hexagon/test_systests.py new file +10
-0+ return os.path.join(self.bin_dir, name) + + def run_exit_zero(self, binary_name, *extra_args, machine="V66G_1024"): + """Launch *binary_name* and assert it exits with code 0. + + :param binary_name: name of the binary inside bin_dir. + :param extra_args: optional pairs of (flag, value) strings passed + to set_vm_arg(), e.g. ('-append', 'myarg'). + :param machine: QEMU machine type (default "V66G_1024"). + """
We could check self.binary(binary_name) exists to provide a useful error message.
Quoted 84 lines
tests/functional/hexagon/test_systests.py new file +79
-0+ self.set_machine(machine) + self.set_vm_arg("-display", "none") + self.set_vm_arg("-kernel", self.binary(binary_name)) + for flag, value in zip(extra_args[::2], extra_args[1::2]): + self.set_vm_arg(flag, value) + self.vm.launch() + self.vm.wait(timeout=60.0) + self.assertEqual(self.vm.exitcode(), 0, + f"Test {binary_name} exited with " + f"code {self.vm.exitcode()}, expected 0") + + def run_console_pattern(self, binary_name, pattern, *extra_args, + machine="V66G_1024"): + """Launch *binary_name* and wait for *pattern* on the semihosting console. + + :param binary_name: name of the binary inside bin_dir. + :param pattern: string pattern to wait for via wait_for_console_pattern. + :param extra_args: optional pairs of (flag, value) strings passed + to set_vm_arg(), e.g. ('-append', 'myarg'). + :param machine: QEMU machine type (default "V66G_1024"). + """ + self.set_machine(machine) + self.set_vm_arg("-display", "none") + self.set_vm_arg("-kernel", self.binary(binary_name)) + for flag, value in zip(extra_args[::2], extra_args[1::2]): + self.set_vm_arg(flag, value) + self.vm.set_console(semihosting=True) + self.vm.launch() + try: + wait_for_console_pattern(self, pattern) + finally: + self.vm.kill() + + def test_fopen(self): + """fopen reads a file passed via --append and verifies its contents.""" + with open(os.path.join(self.workdir, "dummy.so"), "w") as f: + f.write("valid\n") + self.run_exit_zero("fopen", "-append", "dummy.so") + + def test_ftrunc(self): + """ftrunc truncates _testfile_ftrunc from 6 bytes to 1 byte.""" + ftrunc_path = os.path.join(self.workdir, "_testfile_ftrunc") + with open(ftrunc_path, "w") as f: + f.write("valid\n") + # Sleep 1 s so mtime change is observable + time.sleep(1) + self.run_exit_zero("ftrunc") + self.assertEqual( + os.path.getsize(ftrunc_path), + 1, + "_testfile_ftrunc should be 1 byte after ftrunc", + ) + + def test_dirent(self): + """dirent lists a directory passed via --append; output must be + '. .. fileA fileB'.""" + dirent_dir = os.path.join(self.workdir, "_dirent_testdir") + os.makedirs(dirent_dir, exist_ok=True) + open(os.path.join(dirent_dir, "fileA"), "w").close() + open(os.path.join(dirent_dir, "fileB"), "w").close() + self.run_console_pattern( + "dirent", ". .. fileA fileB", "-append", "_dirent_testdir" + ) + + def test_access(self): + """access checks R_OK|W_OK on _testfile_access.""" + with open(os.path.join(self.workdir, "_testfile_access"), "w") as f: + f.write("valid\n") + self.run_exit_zero("access") + + def test_semihost(self): + semihost_dir = os.path.join(self.workdir, "_semihost_dir") + os.makedirs(semihost_dir, exist_ok=True) + open(os.path.join(semihost_dir, "fileA"), "w").close() + open(os.path.join(semihost_dir, "fileB"), "w").close() + self.run_console_pattern("semihost", "PASS", "-append", "arg1", "arg2") + +if __name__ == "__main__": + QemuSystemTest.main()tests/functional/meson.build +0
-0
tests/functional/meson.build subdir('aarch64') · line 20
Quoted 7 lines
tests/functional/meson.build +1
-0@@ -14,6 +14,7 @@ subdir('aarch64') subdir('alpha') subdir('arm') subdir('avr') +subdir('hexagon') subdir('hppa') subdir('i386') subdir('loongarch64')
Re: [PATCH 11/14] target/hexagon: add OPEN/READ/CLOSE_DIR semihosting operations
In reply to Matheus Tavares BernardinoQuoted 7 lines · Matheus Tavares Bernardino
From: Matheus Tavares Bernardino <[email protected]>
Baremetal Hexagon programs use semihosting to enumerate host directories via OPENDIR, READDIR, and CLOSEDIR calls. Track open directory handles per-CPU in a GList so that guest index values map back to host DIR pointers across calls.
Quoted 9 lines
Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>--- target/hexagon/cpu.h | 1 + hw/hexagon/hexagon_dsp.c | 5 +++ hw/hexagon/virt.c | 5 +++ target/hexagon/hexswi.c | 79 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+)
Re: [PATCH 14/14] tests/functional: Add hexagon semihosting systests
In reply to Matheus Tavares Bernardinotests/functional/hexagon/test_systests.py
Quoted 30 lines · Matheus Tavares Bernardino
From: Brian Cain <[email protected]>
Signed-off-by Brian Cain <[email protected]>Signed-off-by Matheus Tavares Bernardino <[email protected]>--- tests/functional/hexagon/meson.build | 9 ++ tests/functional/hexagon/test_systests.py | 133 ++++++++++++++++++++++ tests/functional/meson.build | 1 + 3 files changed, 143 insertions(+) create mode 100644 tests/functional/hexagon/meson.build create mode 100644 tests/functional/hexagon/test_systests.pytests/functional/hexagon/meson.build new file +9
-0@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_hexagon_timeouts = { + 'systests': 180, +} + +tests_hexagon_system_thorough = [ + 'systests', +]tests/functional/hexagon/test_systests.py new file +0
-0
Test files should have execute permissions.
Quoted 12 lines
tests/functional/hexagon/test_systests.py new file +9
-0@@ -0,0 +1,133 @@ +#!/usr/bin/env python3 +# +# Copyright(c) Qualcomm Innovation Center, Inc. All Rights Reserved. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import re +import time
tests/functional/hexagon/test_systests.py line 19
Quoted 10 lines
tests/functional/hexagon/test_systests.py new file +10
-0+import unittest + +from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern + + +_TARBALL_BIN_PATH = os.path.join( + "systests_standalone_package", + "StandaloneSysTests_6.4.0.2_v68", + "bin", +)
Don't use os.path.join to refer to files needed by the test suite - always use one of the helper methods on the QemuBaseTest class....
Quoted 4 lines
tests/functional/hexagon/test_systests.py new file +4
-0+ + +class SysTestsStandaloneTests(QemuSystemTest): + SYSTEST_TIMEOUT_SEC = 30
tests/functional/hexagon/test_systests.py line 33
Quoted 10 lines
tests/functional/hexagon/test_systests.py new file +10
-0+ + ASSET_TARBALL = Asset( + "https://github.com/qualcomm/qemu-hexagon-testing/releases/download/v0.2.9/systests_standalone.tar.gz", + "db961ea3fcc389b478b3d5c2f3bac60bec87e7f3d7efef5e58a9ae8ee78d0e40", + ) + + def setUp(self): + super().setUp() + self.archive_extract(self.ASSET_TARBALL) + self.bin_dir = os.path.join(self.workdir, _TARBALL_BIN_PATH)
...so also skip this...
tests/functional/hexagon/test_systests.py line 36
Quoted 3 lines
tests/functional/hexagon/test_systests.py new file +3
-0+ self._orig_cwd = os.getcwd() + os.chdir(self.workdir) + self.addCleanup(os.chdir, self._orig_cwd)
Don't change directory during tests - use properly qualified paths to files.
tests/functional/hexagon/test_systests.py line 45
Quoted 9 lines
tests/functional/hexagon/test_systests.py new file +9
-0+ + def tearDown(self): + if hasattr(self, "_orig_cwd"): + os.chdir(self._orig_cwd) + super().tearDown() + + def binary(self, name): + """Return the full path to binary *name* inside bin_dir.""" + return os.path.join(self.bin_dir, name)
This should be just:
return self.scratch_file("systests_standalone_package",
"StandaloneSysTests_6.4.0.2_v68", "bin", name)
Quoted 35 lines
tests/functional/hexagon/test_systests.py new file +35
-0+ + def run_exit_zero(self, binary_name, *extra_args, machine="V66G_1024"): + """Launch *binary_name* and assert it exits with code 0. + + :param binary_name: name of the binary inside bin_dir. + :param extra_args: optional pairs of (flag, value) strings passed + to set_vm_arg(), e.g. ('-append', 'myarg'). + :param machine: QEMU machine type (default "V66G_1024"). + """ + self.set_machine(machine) + self.set_vm_arg("-display", "none") + self.set_vm_arg("-kernel", self.binary(binary_name)) + for flag, value in zip(extra_args[::2], extra_args[1::2]): + self.set_vm_arg(flag, value) + self.vm.launch() + self.vm.wait(timeout=60.0) + self.assertEqual(self.vm.exitcode(), 0, + f"Test {binary_name} exited with " + f"code {self.vm.exitcode()}, expected 0") + + def run_console_pattern(self, binary_name, pattern, *extra_args, + machine="V66G_1024"): + """Launch *binary_name* and wait for *pattern* on the semihosting console. + + :param binary_name: name of the binary inside bin_dir. + :param pattern: string pattern to wait for via wait_for_console_pattern. + :param extra_args: optional pairs of (flag, value) strings passed + to set_vm_arg(), e.g. ('-append', 'myarg'). + :param machine: QEMU machine type (default "V66G_1024"). + """ + self.set_machine(machine) + self.set_vm_arg("-display", "none") + self.set_vm_arg("-kernel", self.binary(binary_name)) + for flag, value in zip(extra_args[::2], extra_args[1::2]): + self.set_vm_arg(flag, value)
tests/functional/hexagon/test_systests.py line 90
Quoted 10 lines
tests/functional/hexagon/test_systests.py new file +10
-0+ self.vm.set_console(semihosting=True) + self.vm.launch() + try: + wait_for_console_pattern(self, pattern) + finally: + self.vm.kill() + + def test_fopen(self): + """fopen reads a file passed via --append and verifies its contents.""" + with open(os.path.join(self.workdir, "dummy.so"), "w") as f:
self.scratch_file("dummy.so")
tests/functional/hexagon/test_systests.py line 92
Quoted 2 lines
tests/functional/hexagon/test_systests.py new file +2
-0+ f.write("valid\n") + self.run_exit_zero("fopen", "-append", "dummy.so")
How is this working ? You've created a file dummy.so on the host OS, and you're passing a filename "dummy.so" to -append which is a kernel arg. The implication is the kenrel opens this file, but how is the guest kernel accessing the file from the host ?!?!??
tests/functional/hexagon/test_systests.py line 96
Quoted 4 lines
tests/functional/hexagon/test_systests.py new file +4
-0+ + def test_ftrunc(self): + """ftrunc truncates _testfile_ftrunc from 6 bytes to 1 byte.""" + ftrunc_path = os.path.join(self.workdir, "_testfile_ftrunc")
self.scratch_file("_testfile_ftrunc")
Quoted 5 lines
tests/functional/hexagon/test_systests.py new file +5
-0+ with open(ftrunc_path, "w") as f: + f.write("valid\n") + # Sleep 1 s so mtime change is observable + time.sleep(1) + self.run_exit_zero("ftrunc")
tests/functional/hexagon/test_systests.py line 111
Quoted 10 lines
tests/functional/hexagon/test_systests.py new file +10
-0+ self.assertEqual( + os.path.getsize(ftrunc_path), + 1, + "_testfile_ftrunc should be 1 byte after ftrunc", + ) + + def test_dirent(self): + """dirent lists a directory passed via --append; output must be + '. .. fileA fileB'.""" + dirent_dir = os.path.join(self.workdir, "_dirent_testdir")
self.scratch_file("_dirent_testdir")
tests/functional/hexagon/test_systests.py line 114
Quoted 3 lines
tests/functional/hexagon/test_systests.py new file +3
-0+ os.makedirs(dirent_dir, exist_ok=True) + open(os.path.join(dirent_dir, "fileA"), "w").close() + open(os.path.join(dirent_dir, "fileB"), "w").close()
self.scratch_file("_dirent_testdir", "fileA")
tests/functional/hexagon/test_systests.py line 116
Quoted 2 lines
tests/functional/hexagon/test_systests.py new file +2
-0+ self.run_console_pattern( + "dirent", ". .. fileA fileB", "-append", "_dirent_testdir"
Again I'm wondering how the guest OS accesses _dirent_testdir which is a location on the host OS ?
tests/functional/hexagon/test_systests.py line 122
Quoted 6 lines
tests/functional/hexagon/test_systests.py new file +6
-0+ ) + + def test_access(self): + """access checks R_OK|W_OK on _testfile_access.""" + with open(os.path.join(self.workdir, "_testfile_access"), "w") as f: + f.write("valid\n")
self.scratch_file("_testfile_access")
tests/functional/hexagon/test_systests.py line 129
Quoted 7 lines
tests/functional/hexagon/test_systests.py new file +7
-0+ self.run_exit_zero("access") + + def test_semihost(self): + semihost_dir = os.path.join(self.workdir, "_semihost_dir") + os.makedirs(semihost_dir, exist_ok=True) + open(os.path.join(semihost_dir, "fileA"), "w").close() + open(os.path.join(semihost_dir, "fileB"), "w").close()
The intermediate dir feels redunddant - why not just create fileA & fileB directly ? ie
self.scratch_file("fileA")self.scratch_file("fileB")
Quoted 19 lines
tests/functional/hexagon/test_systests.py new file +4
-0+ self.run_console_pattern("semihost", "PASS", "-append", "arg1", "arg2") + +if __name__ == "__main__": + QemuSystemTest.main()tests/functional/meson.build +1
-0@@ -14,6 +14,7 @@ subdir('aarch64') subdir('alpha') subdir('arm') subdir('avr') +subdir('hexagon') subdir('hppa') subdir('i386') subdir('loongarch64')Signature · 1 line
2.37.2
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com ~~ https://hachyderm.io/@berrange :| |: https://libvirt.org ~~ https://entangle-photo.org :| |: https://pixelfed.art/berrange ~~ https://fstop138.berrange.com :|
Re: [PATCH 05/14] semihosting: add callback to set error
In reply to Matheus Tavares BernardinoQuoted 6 lines · Matheus Tavares Bernardino
This is currently unused by existing semihosting targets, but it will be used by hexagon.
Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>---
I suggest making it patch 06 in the series, right before you use in patch 7. You can even mention "next patch will use it" in the commit msg for extra clarity.
As for the code:
Quoted 60 lines
include/semihosting/common-semi.h | 1 + semihosting/arm-compat-semi.c | 1 + target/arm/common-semi-target.c | 4 ++++ target/riscv/common-semi-target.c | 4 ++++ 4 files changed, 10 insertions(+)include/semihosting/common-semi.h +1
-0@@ -37,6 +37,7 @@void do_common_semihosting (CPUState *cs);uint64_t common_semi_arg (CPUState *cs,int argno);void common_semi_set_ret (CPUState *cs,uint64_t ret); +void common_semi_set_err (CPUState *cs,int err);bool is_64bit_semihosting (CPUArchState *env);bool common_semi_sys_exit_is_extended (CPUState *cs);uint64_t common_semi_stack_bottom (CPUState *cs);semihosting/arm-compat-semi.c +1
-0@@ -237,6 +237,7 @@ static void common_semi_cb(CPUState *cs, uint64_t ret, int err) ts->swi_errno = err;#else syscall_err = err; +common_semi_set_err (cs, err);#endif }common_semi_set_ret (cs, ret);target/arm/common-semi-target.c +4
-0@@ -34,6 +34,10 @@ void common_semi_set_ret(CPUState *cs, uint64_t ret) } } +void common_semi_set_err (CPUState *cs,int err) +{ +} +bool common_semi_sys_exit_is_extended (CPUState *cs) {return is_a64 (cpu_env (cs));target/riscv/common-semi-target.c +4
-0@@ -26,6 +26,10 @@ void common_semi_set_ret(CPUState *cs, uint64_t ret) env->gpr[xA0] = ret; } +void common_semi_set_err (CPUState *cs,int err) +{ +} +bool is_64bit_semihosting (CPUArchState *env) {return riscv_cpu_mxl (env) !=MXL_RV32 ;
Re: [PATCH 05/14] semihosting: add callback to set error
Quoted 11 lines · On Tue, 14 Jul 2026 06:50:19 -0300 Daniel Henrique Barboza…
Quoted 6 lines · Matheus Tavares Bernardino
This is currently unused by existing semihosting targets, but it will be used by hexagon.
Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>---
I suggest making it patch 06 in the series, right before you use in patch 7. You can even mention "next patch will use it" in the commit msg for extra clarity.
Good idea, will do. Thanks
Re: [PATCH 09/14] target/hexagon: add main arch-specific semihosting operations
In reply to Pierrick BouvierQuoted 22 lines · On Mon, 13 Jul 2026 15:20:29 -0700 Pierrick Bouvier…
Quoted 1 line · Matheus Tavares Bernardino
+
target_ulongphysicalFilenameAddr;style:
physical_filename_addr;
[...]Quoted 1 line
+ static const unsigned int mode_table[] = {
[...]
Better to extract this with a static const, and a useful name.angel_to_host_filemode_table.
[...]Quoted 2 lines
/* convert ARM ANGEL filemode into host filemode */+ if (filemode < 14) {
Also, compare to sizeof table introduced, or define a constant.
ANGEL_FILEMODE_MAX= 13.
[...]target/hexagon/hexswi.c static void sim_handle_trap0(CPUHexagonState *env) · line 271
Quoted 4 lines
target/hexagon/hexswi.c +4
-0+/* +* Hexagon's SYS_ISTTY is a bit different than arm's: we do not return -1 +* on error, neither errno. So we override with out own implementation. +*/
Quoted 8 lines
s/out/our
[...]target/hexagon/hexswi.c static void sim_handle_trap0(CPUHexagonState *env) · line 297
Quoted 4 lines
target/hexagon/hexswi.c +4
-0+/* +* This must match the caller's definition, it would be in the +* caller's angel.h or equivalent header. +*/ It would be great to move this definition out of this function also.
Thanks, Pierrick! I'll apply all comments.
Re: [PATCH 07/14] target/hexagon: add semihosting support
In reply to Pierrick BouvierQuoted 24 lines · On Mon, 13 Jul 2026 15:11:18 -0700 Pierrick Bouvier…
Quoted 10 lines · Matheus Tavares Bernardino
From: Matheus Tavares Bernardino <[email protected]>
Baremetal Hexagon programs use trap0 #0 to invoke semihosting calls for I/O and process control. Wire up the arm-compatible semihosting framework for softmmu by enabling
CONFIG_ARM_COMPATIBLE_SEMIHOSTINGand routing trap0 to the semihosting handler.Signed-off-by Matheus Tavares Bernardino <[email protected]>Signed-off-by Brian Cain <[email protected]>Quoted 11 lines
--- configs/targets/hexagon-softmmu.mak | 2 + hw/hexagon/hexagon_dsp.c | 2 + target/hexagon/common-semi-target.c | 51 +++++++++ target/hexagon/hexswi.c | 164 +++++++++++++++++++++++++++- hw/hexagon/Kconfig | 1 + qemu-options.hx | 8 +- target/hexagon/meson.build | 3 + 7 files changed, 224 insertions(+), 7 deletions(-) create mode 100644 target/hexagon/common-semi-target.c
Quoted 8 lines
...
target/hexagon/hexswi.c line 125
Quoted 4 lines
target/hexagon/hexswi.c +4
-0+static void sim_handle_trap0 (CPUHexagonState *env) +{ +target_ulong what_swi, swi_info; + G_GNUC_UNUSED uintptr_t retaddr = 0;leftover?
Actually, this is used in the next commit. Let me add move it.
Re: [PATCH 03/14] target/hexagon: add aux functions for guest mem load/store
In reply to Pierrick BouvierQuoted 19 lines · On Mon, 13 Jul 2026 14:58:46 -0700 Pierrick Bouvier…
target/hexagon/cpu_helper.c line 159
Quoted 13 lines · Matheus Tavares Bernardino
target/hexagon/cpu_helper.c +12
-0+ +void hexagon_touch_memory (CPUHexagonState *env,uint32_t start_addr, +uint32_t length,uintptr_t retaddr) +{ +unsigned int warm; +uint32_t first =page_start (start_addr); +uint32_t last =page_start (start_addr + length -1 ); +for (uint32_t page = first; page <= last; page +=TARGET_PAGE_SIZE ) { +hexagon_read_memory (env, page,1 , &warm, retaddr); + } +} +Name could be misleading, I would be expectng to see a read/write sequence in each page instead of just reading.
Maybehexagon_peek_memory_range?
Good call, will do.
Re: [PATCH 14/14] tests/functional: Add hexagon semihosting systests
In reply to Pierrick BouvierQuoted 85 lines · On Mon, 13 Jul 2026 15:28:46 -0700 Pierrick Bouvier…
Quoted 83 lines · Matheus Tavares Bernardino
From: Brian Cain <[email protected]>
Signed-off-by Brian Cain <[email protected]>Signed-off-by Matheus Tavares Bernardino <[email protected]>--- tests/functional/hexagon/meson.build | 9 ++ tests/functional/hexagon/test_systests.py | 133 ++++++++++++++++++++++ tests/functional/meson.build | 1 + 3 files changed, 143 insertions(+) create mode 100644 tests/functional/hexagon/meson.build create mode 100644 tests/functional/hexagon/test_systests.pytests/functional/hexagon/meson.build new file +9
-0@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_hexagon_timeouts = { + 'systests': 180, +} + +tests_hexagon_system_thorough = [ + 'systests', +]tests/functional/hexagon/test_systests.py new file +50
-0@@ -0,0 +1,133 @@ +#!/usr/bin/env python3 +# +# Copyright(c) Qualcomm Innovation Center, Inc. All Rights Reserved. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import re +import time +import unittest + +from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern + + +_TARBALL_BIN_PATH = os.path.join( + "systests_standalone_package", + "StandaloneSysTests_6.4.0.2_v68", + "bin", +) + + +class SysTestsStandaloneTests(QemuSystemTest): + SYSTEST_TIMEOUT_SEC = 30 + + ASSET_TARBALL = Asset( + "https://github.com/qualcomm/qemu-hexagon-testing/releases/download/v0.2.9/systests_standalone.tar.gz", + "db961ea3fcc389b478b3d5c2f3bac60bec87e7f3d7efef5e58a9ae8ee78d0e40", + ) + + def setUp(self): + super().setUp() + self.archive_extract(self.ASSET_TARBALL) + self.bin_dir = os.path.join(self.workdir, _TARBALL_BIN_PATH) + self._orig_cwd = os.getcwd() + os.chdir(self.workdir) + self.addCleanup(os.chdir, self._orig_cwd) + + def tearDown(self): + if hasattr(self, "_orig_cwd"): + os.chdir(self._orig_cwd) + super().tearDown() + + def binary(self, name): + """Return the full path to binary *name* inside bin_dir.""" + return os.path.join(self.bin_dir, name) + + def run_exit_zero(self, binary_name, *extra_args, machine="V66G_1024"): + """Launch *binary_name* and assert it exits with code 0. + + :param binary_name: name of the binary inside bin_dir.
Quoted 8 lines
tests/functional/hexagon/test_systests.py line 54
Quoted 4 lines
tests/functional/hexagon/test_systests.py new file +4
-0+ :param extra_args: optional pairs of (flag, value) strings passed + to set_vm_arg(), e.g. ('-append', 'myarg'). + :param machine: QEMU machine type (default "V66G_1024"). + """We could check
self.binary(binary_name)exists to provide a useful error message.
Ok, good idea. I'll add the following:
tests/functional/hexagon/test_systests.py +3 -1
@@ -42,7 +42,9 @@ def tearDown(self): def binary(self, name): """Return the full path to binary *name* inside bin_dir.""" - return os.path.join(self.bin_dir, name) + path = os.path.join(self.bin_dir, name) + self.assertTrue(os.path.exists(path)) + return path def run_exit_zero(self, binary_name, *extra_args, machine="V66G_1024"): """Launch *binary_name* and assert it exits with code 0
Quoted 5 lines · Matheus Tavares Bernardino
This series adds semihosting support to hexagon system emulation, together with functional tests for the added operations.
The Hexagon semihosting spec can be found at:
https://docs.qualcomm.com/doc/80-N2040-101_102648/topic/semihosting-specification.html
Please also update docs/system/target-hexagon.rst to remove "Semihosting is not yet implemented in QEMU hexagon" and add a link to the spec.
Quoted 52 lines
Brian Cain (4):
semihosting: add APIs for chardev-aware guest fd routing target/hexagon: Add an errno mapping
python/machine: support routing semihosting output to the test console tests/functional: Add hexagon semihosting systestsMatheus Tavares Bernardino (10):
target/hexagon: fixget_phys_addr_debugwith in-page offset target/hexagon: fix PC advancement for non-COF TB terminators target/hexagon: add aux functions for guest mem load/store
hexagon:cpu_helper: add reg reading/writing helpers
semihosting: add callback to set error target/hexagon: add semihosting support
semihosting: add ftruncate helper (to be used for hexagon) target/hexagon: add main arch-specific semihosting operations target/hexagon: add COREDUMP semihosting operation target/hexagon: add OPEN/READ/CLOSE_DIR semihosting operationsconfigs/targets/hexagon-softmmu.mak | 2 + include/semihosting/common-semi.h | 2 + include/semihosting/console.h | 9 + include/semihosting/guestfd.h | 9 + include/semihosting/syscalls.h | 2 + target/hexagon/cpu.h | 1 + target/hexagon/cpu_helper.h | 24 + target/hexagon/internal.h | 1 + hw/hexagon/hexagon_dsp.c | 7 + hw/hexagon/virt.c | 5 + semihosting/arm-compat-semi.c | 3 +- semihosting/console.c | 5 + semihosting/guestfd.c | 8 + semihosting/syscalls.c | 29 + target/arm/common-semi-target.c | 4 + target/hexagon/common-semi-target.c | 51 ++ target/hexagon/cpu.c | 4 +- target/hexagon/cpu_helper.c | 173 +++++ target/hexagon/hexswi.c | 728 +++++++++++++++++++++- target/hexagon/op_helper.c | 18 +- target/hexagon/translate.c | 13 +- target/riscv/common-semi-target.c | 4 + hw/hexagon/Kconfig | 1 + python/qemu/machine/machine.py | 10 +- qemu-options.hx | 8 +- target/hexagon/meson.build | 3 + tests/functional/hexagon/meson.build | 9 + tests/functional/hexagon/test_systests.py | 133 ++++ tests/functional/meson.build | 1 + 29 files changed, 1236 insertions(+), 31 deletions(-)create mode 100644
target/hexagon/common-semi-target.ccreate mode 100644 tests/functional/hexagon/meson.build create mode 100644tests/functional/hexagon/test_systests.py
Re: [PATCH 14/14] tests/functional: Add hexagon semihosting systests
In reply to Daniel P. BerrangéQuoted 21 lines · On Tue, 14 Jul 2026 09:25:08 +0100 Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=…
Quoted 19 lines · Matheus Tavares Bernardino
tests/functional/hexagon/test_systests.py new file +15
-0@@ -0,0 +1,133 @@ +#!/usr/bin/env python3 +# +# Copyright(c) Qualcomm Innovation Center, Inc. All Rights Reserved. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import re +import time +import unittest + +from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern + + +_TARBALL_BIN_PATH = os.path.join(
Quoted 8 lines
tests/functional/hexagon/test_systests.py line 19
Quoted 4 lines
tests/functional/hexagon/test_systests.py new file +4
-0+ "systests_standalone_package", + "StandaloneSysTests_6.4.0.2_v68", + "bin", +)Don't use os.path.join to refer to files needed by the test suite - always use one of the helper methods on the QemuBaseTest class....
I'll use self.scratch_file, like you suggested below, thanks.
Quoted 17 lines
Quoted 4 lines
tests/functional/hexagon/test_systests.py new file +4
-0+ + +class SysTestsStandaloneTests(QemuSystemTest): + SYSTEST_TIMEOUT_SEC = 30tests/functional/hexagon/test_systests.py line 33
Quoted 10 lines
tests/functional/hexagon/test_systests.py new file +10
-0+ + ASSET_TARBALL = Asset( + "https://github.com/qualcomm/qemu-hexagon-testing/releases/download/v0.2.9/systests_standalone.tar.gz", + "db961ea3fcc389b478b3d5c2f3bac60bec87e7f3d7efef5e58a9ae8ee78d0e40", + ) + + def setUp(self): + super().setUp() + self.archive_extract(self.ASSET_TARBALL) + self.bin_dir = os.path.join(self.workdir, _TARBALL_BIN_PATH)...so also skip this...
Quoted 6 lines
tests/functional/hexagon/test_systests.py line 36
Quoted 3 lines
tests/functional/hexagon/test_systests.py new file +3
-0+ self._orig_cwd = os.getcwd() + os.chdir(self.workdir) + self.addCleanup(os.chdir, self._orig_cwd)Don't change directory during tests - use properly qualified paths to files.
Our test kernels from systests_standalone.tar.gz expect the files to be in the current working directory. But if changing dir is not advisable, I'll modify the binaries to receive the paths from argv.
Quoted 7 lines
tests/functional/hexagon/test_systests.py line 90
Quoted 4 lines
[...]
tests/functional/hexagon/test_systests.py new file +3
-0+ def test_fopen(self): + """fopen reads a file passed via --append and verifies its contents.""" + with open(os.path.join(self.workdir, "dummy.so"), "w") as f:
self.scratch_file("dummy.so")
Quoted 7 lines
tests/functional/hexagon/test_systests.py line 92
Quoted 2 lines
tests/functional/hexagon/test_systests.py new file +2
-0+ f.write("valid\n") + self.run_exit_zero("fopen", "-append", "dummy.so")How is this working ? You've created a file dummy.so on the host OS, and you're passing a filename "dummy.so" to -append which is a kernel arg. The implication is the kenrel opens this file, but how is the guest kernel accessing the file from the host ?!?!??
It access the file through semihost, which exposes host I/O to the guest. This functional test strives to validate that.
Quoted 7 lines
tests/functional/hexagon/test_systests.py line 129
Quoted 6 lines
[..]
tests/functional/hexagon/test_systests.py new file +5
-0+ def test_semihost(self): + semihost_dir = os.path.join(self.workdir, "_semihost_dir") + os.makedirs(semihost_dir, exist_ok=True) + open(os.path.join(semihost_dir, "fileA"), "w").close() + open(os.path.join(semihost_dir, "fileB"), "w").close()
Quoted 5 lines
The intermediate dir feels redunddant - why not just create fileA & fileB directly ? ie
self.scratch_file("fileA")self.scratch_file("fileB")
The test[1] checks that qemu's hexagon semihosting can traverse the directory to list the files, so we create a new directory to control exactly which entries will be in it.
Re: [PATCH 02/14] target/hexagon: fix PC advancement for non-COF TB terminators
In reply to Matheus Tavares BernardinoQuoted 13 lines · Matheus Tavares Bernardino
Some packets end a translation block without a change-of-flow. These do not update the PC during commit, so
gen_end_tb()leaves hex_gpr[HEX_REG_PC] pointing at the same packet and the block gets re-entered forever. Set PC explicitly tonext_PCin thatgen_end_tb()branch to fix execution of next blocks.Note that
gen_start_packet()used to have a special case for tlblock/k0lock, settingctx->next_PCto the packet's own address. This relies on the tlblock/k0lock helpers to properly advance the PC, which is never done (onlyenv->next_PCis updated, but that never reaches hex_gpr[HEX_REG_PC]). Drop the special case so these packets advance to the following packet like any other non-COF TB terminator.
Quoted 2 lines
Signed-off-by Matheus Tavares Bernardino <[email protected]>---
Can you try https://lore.kernel.org/qemu-devel/[email protected]/ to see if it works instead of this patch? I think it should satisfy the same need.
Quoted 48 lines
target/hexagon/translate.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)target/hexagon/translate.c +9
-4@@ -210,6 +210,12 @@ static void gen_end_tb(DisasContext *ctx)gen_goto_tb (ctx,0 , ctx->base.tb->pc, true);gen_set_label (skip);gen_goto_tb (ctx,1 , ctx->next_PC, false); + }else if (!ctx->pkt.pkt_has_cof) { +/* +* Packet with no deferred COF that still ends the TB. PC is +* not updated during commit, so set it explicitly to next_PC. +*/ +gen_goto_tb (ctx,0 , ctx->next_PC, true); }else {tcg_gen_lookup_and_goto_ptr (); }@@ -282,6 +288,7 @@ static bool check_for_attrib(Packet *pkt, int attrib)return false; } +#ifndef CONFIG_USER_ONLY static bool check_for_opcode (Packet *pkt,uint16_t opcode) {for (int i =0 ; i < pkt->num_insns; i++) {@@ -291,6 +298,7 @@ static bool check_for_opcode(Packet *pkt, uint16_t opcode) }return false; } +#endif static bool need_slot_cancelled (Packet *pkt) {@@ -562,10 +570,7 @@ static void analyze_packet(DisasContext *ctx)static void gen_start_packet (DisasContext *ctx) {Packet *pkt = &ctx->pkt; -target_ulong next_PC = (check_for_opcode (pkt, Y2_k0lock) || -check_for_opcode (pkt, Y2_tlblock)) ? - ctx->base.pc_next : - ctx->base.pc_next + pkt->encod_pkt_size_in_bytes; +target_ulong next_PC = ctx->base.pc_next + pkt->encod_pkt_size_in_bytes;int i;/* Clear out the disassembly context */
Re: [PATCH 01/14] target/hexagon: fix get_phys_addr_debug with in-page offset
In reply to Matheus Tavares BernardinoQuoted 11 lines · Matheus Tavares Bernardino
As documented:
* @get_phys_addr_debug: Callback for obtaining a physical address.
* This must be able to handle a non-page-aligned address, and will
* return the physical address corresponding to that address.When MMU is enabled,
hexagon_cpu_get_phys_addr_debug()returns the physical address page-aligned, not corrected to reflect the exact byte the virtual addr maps to within the page. Let's fix that. The MMU-disabled case is already correct.
Quoted 4 lines
This would break semihosting argument reads when it is added for Hexagon.
Signed-off-by Matheus Tavares Bernardino <[email protected]>---
Quoted 17 lines
target/hexagon/cpu.c | 2 ++ 1 file changed, 2 insertions(+)target/hexagon/cpu.c +2
-0@@ -569,7 +569,9 @@ static hwaddr hexagon_cpu_get_phys_addr_debug(CPUState *cs, vaddr addr)if (get_physical_address (env, &phys_addr, &prot, &page_size, &excp, addr,0 , mmu_idx)) { +vaddr page_offset = addr & (TARGET_PAGE_SIZE -1 );find_qemu_subpage (&addr, &phys_addr, page_size); + phys_addr +=hexagon_cpu_mmu_enabled (env) ? page_offset :0 ;return phys_addr; }
Re: [PATCH 02/14] target/hexagon: fix PC advancement for non-COF TB terminators
In reply to Brian CainQuoted 15 lines · On Thu, 16 Jul 2026 00:08:57 -0500 Brian Cain <[email protected]>…
Quoted 13 lines · Matheus Tavares Bernardino
Some packets end a translation block without a change-of-flow. These do not update the PC during commit, so
gen_end_tb()leaves hex_gpr[HEX_REG_PC] pointing at the same packet and the block gets re-entered forever. Set PC explicitly tonext_PCin thatgen_end_tb()branch to fix execution of next blocks.Note that
gen_start_packet()used to have a special case for tlblock/k0lock, settingctx->next_PCto the packet's own address. This relies on the tlblock/k0lock helpers to properly advance the PC, which is never done (onlyenv->next_PCis updated, but that never reaches hex_gpr[HEX_REG_PC]). Drop the special case so these packets advance to the following packet like any other non-COF TB terminator.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Matheus Tavares Bernardino <[email protected]>---
Can you try
https://lore.kernel.org/qemu-devel/[email protected]/
to see if it works instead of this patch? I think it should satisfy the same need.
Yes, that also solves my issue. And your version is more complete, so please feel free to drop my patch in favor of that one when applying the series to hex-next.