diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-16 16:19:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-16 16:19:49 +0100 |
| commit | 3c4698d0b5cb19212868f94f0ba4743c2c86f91f (patch) | |
| tree | c173153700e461d22a311eed3281116337fe08dd /target-i386/cpu.h | |
| parent | 1a3abef74b5df6d6d3e851aaeacac8f265adcf80 (diff) | |
| parent | 4054cdec0423c7190bfc733c27c303d513d531ab (diff) | |
Merge remote-tracking branch 'remotes/rth/tags/pull-target-i386-20150915' into staging
Exception handling improvments from Pavel Dovgalyuk.
# gpg: Signature made Tue 15 Sep 2015 20:36:14 BST using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
* remotes/rth/tags/pull-target-i386-20150915:
target-i386: exception handling for other helper functions
target-i386: exception handling for seg_helper functions
target-i386: exception handling for memory helpers
target-i386: exception handling for div instructions
target-i386: exception handling for FPU instructions
target-i386: introduce new raise_exception functions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index af977726d1..3bcf2f6f73 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1267,8 +1267,12 @@ void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, /* excp_helper.c */ void QEMU_NORETURN raise_exception(CPUX86State *env, int exception_index); +void QEMU_NORETURN raise_exception_ra(CPUX86State *env, int exception_index, + uintptr_t retaddr); void QEMU_NORETURN raise_exception_err(CPUX86State *env, int exception_index, int error_code); +void QEMU_NORETURN raise_exception_err_ra(CPUX86State *env, int exception_index, + int error_code, uintptr_t retaddr); void QEMU_NORETURN raise_interrupt(CPUX86State *nenv, int intno, int is_int, int error_code, int next_eip_addend); |