Rename the i386 exception helper implementations to i386_raise_exception* to avoid collisions with common helpers.
Signed-off-by: Yonggang Luo <[email protected]> --- target/i386/tcg/excp_helper.c | 17 +++++++------- target/i386/tcg/helper-tcg.h | 42 +++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/target/i386/tcg/excp_helper.c b/target/i386/tcg/excp_helper.c index 1eaa602c91..0576d64390 100644 --- a/target/i386/tcg/excp_helper.c +++ b/target/i386/tcg/excp_helper.c @@ -34,7 +34,7 @@ G_NORETURN void helper_raise_interrupt(CPUX86State *env, int intno, G_NORETURN void helper_raise_exception(CPUX86State *env, int exception_index) { - raise_exception(env, exception_index); + i386_raise_exception(env, exception_index); } /* @@ -120,25 +120,26 @@ G_NORETURN void raise_interrupt(CPUX86State *env, int intno, int next_eip_addend raise_interrupt2(env, intno, 1, 0, next_eip_addend, 0); } -G_NORETURN void raise_exception_err(CPUX86State *env, int exception_index, - int error_code) +G_NORETURN void i386_raise_exception_err(CPUX86State *env, int exception_index, + int error_code) { raise_interrupt2(env, exception_index, 0, error_code, 0, 0); } -G_NORETURN void raise_exception_err_ra(CPUX86State *env, int exception_index, - int error_code, uintptr_t retaddr) +G_NORETURN void i386_raise_exception_err_ra(CPUX86State *env, + int exception_index, + int error_code, uintptr_t retaddr) { raise_interrupt2(env, exception_index, 0, error_code, 0, retaddr); } -G_NORETURN void raise_exception(CPUX86State *env, int exception_index) +G_NORETURN void i386_raise_exception(CPUX86State *env, int exception_index) { raise_interrupt2(env, exception_index, 0, 0, 0, 0); } -G_NORETURN void raise_exception_ra(CPUX86State *env, int exception_index, - uintptr_t retaddr) +G_NORETURN void i386_raise_exception_ra(CPUX86State *env, int exception_index, + uintptr_t retaddr) { raise_interrupt2(env, exception_index, 0, 0, 0, retaddr); } diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h index f4b2ff740d..430e49efe0 100644 --- a/target/i386/tcg/helper-tcg.h +++ b/target/i386/tcg/helper-tcg.h @@ -60,13 +60,41 @@ void x86_translate_code(CPUState *cs, TranslationBlock *tb, int *max_insns, vaddr pc, void *host_pc); /* excp_helper.c */ -G_NORETURN void raise_exception(CPUX86State *env, int exception_index); -G_NORETURN void raise_exception_ra(CPUX86State *env, int exception_index, - uintptr_t retaddr); -G_NORETURN void raise_exception_err(CPUX86State *env, int exception_index, - int error_code); -G_NORETURN void raise_exception_err_ra(CPUX86State *env, int exception_index, - int error_code, uintptr_t retaddr); +G_NORETURN void i386_raise_exception(CPUX86State *env, int exception_index); +G_NORETURN void i386_raise_exception_ra(CPUX86State *env, int exception_index, + uintptr_t retaddr); +G_NORETURN void i386_raise_exception_err(CPUX86State *env, int exception_index, + int error_code); +G_NORETURN void i386_raise_exception_err_ra(CPUX86State *env, + int exception_index, + int error_code, uintptr_t retaddr); + +static inline G_NORETURN +void raise_exception(CPUX86State *env, int exception_index) +{ + i386_raise_exception(env, exception_index); +} + +static inline G_NORETURN +void raise_exception_ra(CPUX86State *env, int exception_index, + uintptr_t retaddr) +{ + i386_raise_exception_ra(env, exception_index, retaddr); +} + +static inline G_NORETURN +void raise_exception_err(CPUX86State *env, int exception_index, + int error_code) +{ + i386_raise_exception_err(env, exception_index, error_code); +} + +static inline G_NORETURN +void raise_exception_err_ra(CPUX86State *env, int exception_index, + int error_code, uintptr_t retaddr) +{ + i386_raise_exception_err_ra(env, exception_index, error_code, retaddr); +} G_NORETURN void raise_interrupt(CPUX86State *nenv, int intno, int next_eip_addend); G_NORETURN void handle_unaligned_access(CPUX86State *env, vaddr vaddr, MMUAccessType access_type, -- 2.55.0.windows.3
