| Message ID | 20250328200459.483089-3-richard.henderson@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | single-binary: Restrict scope of TARGET_PAGE_BITS_MIN | expand |
On 3/28/25 13:04, Richard Henderson wrote: > Move the declarations from exec/exec-all.h to the > private accel/tcg/internal-common.h. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > accel/tcg/internal-common.h | 34 ++++++++++++++++++++++++++++++++++ > include/exec/exec-all.h | 34 ---------------------------------- > accel/tcg/translator.c | 1 + > 3 files changed, 35 insertions(+), 34 deletions(-) > > diff --git a/accel/tcg/internal-common.h b/accel/tcg/internal-common.h > index 9b6ab3a8cc..2f00560d10 100644 > --- a/accel/tcg/internal-common.h > +++ b/accel/tcg/internal-common.h > @@ -74,4 +74,38 @@ uint32_t curr_cflags(CPUState *cpu); > > void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr); > > +/** > + * get_page_addr_code_hostp() > + * @env: CPUArchState > + * @addr: guest virtual address of guest code > + * > + * See get_page_addr_code() (full-system version) for documentation on the > + * return value. > + * > + * Sets *@hostp (when @hostp is non-NULL) as follows. > + * If the return value is -1, sets *@hostp to NULL. Otherwise, sets *@hostp > + * to the host address where @addr's content is kept. > + * > + * Note: this function can trigger an exception. > + */ > +tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr, > + void **hostp); > + > +/** > + * get_page_addr_code() > + * @env: CPUArchState > + * @addr: guest virtual address of guest code > + * > + * If we cannot translate and execute from the entire RAM page, or if > + * the region is not backed by RAM, returns -1. Otherwise, returns the > + * ram_addr_t corresponding to the guest code at @addr. > + * > + * Note: this function can trigger an exception. > + */ > +static inline tb_page_addr_t get_page_addr_code(CPUArchState *env, > + vaddr addr) > +{ > + return get_page_addr_code_hostp(env, addr, NULL); > +} > + > #endif > diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h > index fcad3446fe..f52a680f42 100644 > --- a/include/exec/exec-all.h > +++ b/include/exec/exec-all.h > @@ -143,40 +143,6 @@ struct MemoryRegionSection *iotlb_to_section(CPUState *cpu, > hwaddr index, MemTxAttrs attrs); > #endif > > -/** > - * get_page_addr_code_hostp() > - * @env: CPUArchState > - * @addr: guest virtual address of guest code > - * > - * See get_page_addr_code() (full-system version) for documentation on the > - * return value. > - * > - * Sets *@hostp (when @hostp is non-NULL) as follows. > - * If the return value is -1, sets *@hostp to NULL. Otherwise, sets *@hostp > - * to the host address where @addr's content is kept. > - * > - * Note: this function can trigger an exception. > - */ > -tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr, > - void **hostp); > - > -/** > - * get_page_addr_code() > - * @env: CPUArchState > - * @addr: guest virtual address of guest code > - * > - * If we cannot translate and execute from the entire RAM page, or if > - * the region is not backed by RAM, returns -1. Otherwise, returns the > - * ram_addr_t corresponding to the guest code at @addr. > - * > - * Note: this function can trigger an exception. > - */ > -static inline tb_page_addr_t get_page_addr_code(CPUArchState *env, > - vaddr addr) > -{ > - return get_page_addr_code_hostp(env, addr, NULL); > -} > - > #if !defined(CONFIG_USER_ONLY) > > MemoryRegionSection * > diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c > index 7ef04fc597..307a513487 100644 > --- a/accel/tcg/translator.c > +++ b/accel/tcg/translator.c > @@ -17,6 +17,7 @@ > #include "exec/translator.h" > #include "exec/plugin-gen.h" > #include "tcg/tcg-op-common.h" > +#include "internal-common.h" > #include "internal-target.h" > #include "disas/disas.h" > #include "tb-internal.h" Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/accel/tcg/internal-common.h b/accel/tcg/internal-common.h index 9b6ab3a8cc..2f00560d10 100644 --- a/accel/tcg/internal-common.h +++ b/accel/tcg/internal-common.h @@ -74,4 +74,38 @@ uint32_t curr_cflags(CPUState *cpu); void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr); +/** + * get_page_addr_code_hostp() + * @env: CPUArchState + * @addr: guest virtual address of guest code + * + * See get_page_addr_code() (full-system version) for documentation on the + * return value. + * + * Sets *@hostp (when @hostp is non-NULL) as follows. + * If the return value is -1, sets *@hostp to NULL. Otherwise, sets *@hostp + * to the host address where @addr's content is kept. + * + * Note: this function can trigger an exception. + */ +tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr, + void **hostp); + +/** + * get_page_addr_code() + * @env: CPUArchState + * @addr: guest virtual address of guest code + * + * If we cannot translate and execute from the entire RAM page, or if + * the region is not backed by RAM, returns -1. Otherwise, returns the + * ram_addr_t corresponding to the guest code at @addr. + * + * Note: this function can trigger an exception. + */ +static inline tb_page_addr_t get_page_addr_code(CPUArchState *env, + vaddr addr) +{ + return get_page_addr_code_hostp(env, addr, NULL); +} + #endif diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index fcad3446fe..f52a680f42 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -143,40 +143,6 @@ struct MemoryRegionSection *iotlb_to_section(CPUState *cpu, hwaddr index, MemTxAttrs attrs); #endif -/** - * get_page_addr_code_hostp() - * @env: CPUArchState - * @addr: guest virtual address of guest code - * - * See get_page_addr_code() (full-system version) for documentation on the - * return value. - * - * Sets *@hostp (when @hostp is non-NULL) as follows. - * If the return value is -1, sets *@hostp to NULL. Otherwise, sets *@hostp - * to the host address where @addr's content is kept. - * - * Note: this function can trigger an exception. - */ -tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr, - void **hostp); - -/** - * get_page_addr_code() - * @env: CPUArchState - * @addr: guest virtual address of guest code - * - * If we cannot translate and execute from the entire RAM page, or if - * the region is not backed by RAM, returns -1. Otherwise, returns the - * ram_addr_t corresponding to the guest code at @addr. - * - * Note: this function can trigger an exception. - */ -static inline tb_page_addr_t get_page_addr_code(CPUArchState *env, - vaddr addr) -{ - return get_page_addr_code_hostp(env, addr, NULL); -} - #if !defined(CONFIG_USER_ONLY) MemoryRegionSection * diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 7ef04fc597..307a513487 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -17,6 +17,7 @@ #include "exec/translator.h" #include "exec/plugin-gen.h" #include "tcg/tcg-op-common.h" +#include "internal-common.h" #include "internal-target.h" #include "disas/disas.h" #include "tb-internal.h"
Move the declarations from exec/exec-all.h to the private accel/tcg/internal-common.h. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- accel/tcg/internal-common.h | 34 ++++++++++++++++++++++++++++++++++ include/exec/exec-all.h | 34 ---------------------------------- accel/tcg/translator.c | 1 + 3 files changed, 35 insertions(+), 34 deletions(-)