diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-05-16 19:38:48 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-06-26 18:25:19 +0000 |
| commit | e694d4e289b05d0c9b118850eff961aa9ca33183 (patch) | |
| tree | 25e25d221dd1d2c8486d9ab4ab342e6892d12866 /target-i386/exec.h | |
| parent | e67768d0f13c78144f17bcca8a64b9b812918198 (diff) | |
x86: use caller supplied CPUState for interrupt related stuff
Several x86 specific functions are called from cpu-exec.c with the
assumption that global env register is valid. This will be changed
later, so make the functions use caller supplied CPUState parameter.
It would be cleaner to move the functions to helper.c, but there are
quite a lot of dependencies between do_interrupt() and other functions.
Add helpers for svm_check_intercept() and cpu_cc_compute_all() instead
of calling the helper (which uses global env, AREG0) directly.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-i386/exec.h')
| -rw-r--r-- | target-i386/exec.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/target-i386/exec.h b/target-i386/exec.h index 9bd080e3a8..5dbee96496 100644 --- a/target-i386/exec.h +++ b/target-i386/exec.h @@ -67,14 +67,9 @@ register struct CPUX86State *env asm(AREG0); #include "exec-all.h" /* op_helper.c */ -void do_interrupt(int intno, int is_int, int error_code, - target_ulong next_eip, int is_hw); -void do_interrupt_user(int intno, int is_int, int error_code, - target_ulong next_eip); void QEMU_NORETURN raise_exception_err(int exception_index, int error_code); void QEMU_NORETURN raise_exception(int exception_index); void QEMU_NORETURN raise_exception_env(int exception_index, CPUState *nenv); -void do_smm_enter(void); /* n must be a constant to be efficient */ static inline target_long lshift(target_long x, int n) @@ -87,11 +82,6 @@ static inline target_long lshift(target_long x, int n) #include "helper.h" -static inline void svm_check_intercept(uint32_t type) -{ - helper_svm_check_intercept_param(type, 0); -} - #if !defined(CONFIG_USER_ONLY) #include "softmmu_exec.h" |