mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no error code if hardware interrupt

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@371 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2003-08-20 21:34:35 +00:00
parent 2d80ae8987
commit d05e66d217
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu-exec.c
View File

@ -170,7 +170,7 @@ int cpu_exec(CPUState *env1)
do_interrupt(env->exception_index, do_interrupt(env->exception_index,
env->exception_is_int, env->exception_is_int,
env->error_code, env->error_code,
env->exception_next_eip); env->exception_next_eip, 0);
#endif #endif
} }
env->exception_index = -1; env->exception_index = -1;
@ -192,7 +192,7 @@ int cpu_exec(CPUState *env1)
if (loglevel) { if (loglevel) {
fprintf(logfile, "Servicing hardware INT=0x%02x\n", intno); fprintf(logfile, "Servicing hardware INT=0x%02x\n", intno);
} }
do_interrupt(intno, 0, 0, 0); do_interrupt(intno, 0, 0, 0, 1);
env->interrupt_request &= ~CPU_INTERRUPT_HARD; env->interrupt_request &= ~CPU_INTERRUPT_HARD;
/* ensure that no TB jump will be modified as /* ensure that no TB jump will be modified as
the program flow was changed */ the program flow was changed */

2
exec-i386.h
View File

@ -142,7 +142,7 @@ void tlb_fill(unsigned long addr, int is_write, void *retaddr);
void __hidden cpu_lock(void); void __hidden cpu_lock(void);
void __hidden cpu_unlock(void); void __hidden cpu_unlock(void);
void do_interrupt(int intno, int is_int, int error_code, void do_interrupt(int intno, int is_int, int error_code,
unsigned int next_eip); unsigned int next_eip, int is_hw);
void do_interrupt_user(int intno, int is_int, int error_code, void do_interrupt_user(int intno, int is_int, int error_code,
unsigned int next_eip); unsigned int next_eip);
void raise_interrupt(int intno, int is_int, int error_code, void raise_interrupt(int intno, int is_int, int error_code,

8
helper-i386.c
View File

@ -185,7 +185,7 @@ static inline int load_segment(uint32_t *e1_ptr, uint32_t *e2_ptr,
/* protected mode interrupt */ /* protected mode interrupt */
static void do_interrupt_protected(int intno, int is_int, int error_code, static void do_interrupt_protected(int intno, int is_int, int error_code,
unsigned int next_eip) unsigned int next_eip, int is_hw)
{ {
SegmentCache *dt; SegmentCache *dt;
uint8_t *ptr, *ssp; uint8_t *ptr, *ssp;
@ -265,7 +265,7 @@ static void do_interrupt_protected(int intno, int is_int, int error_code,
shift = type >> 3; shift = type >> 3;
has_error_code = 0; has_error_code = 0;
if (!is_int) { if (!is_int && !is_hw) {
switch(intno) { switch(intno) {
case 8: case 8:
case 10: case 10:
@ -427,10 +427,10 @@ void do_interrupt_user(int intno, int is_int, int error_code,
* instruction. It is only relevant if is_int is TRUE. * instruction. It is only relevant if is_int is TRUE.
*/ */
void do_interrupt(int intno, int is_int, int error_code, void do_interrupt(int intno, int is_int, int error_code,
unsigned int next_eip) unsigned int next_eip, int is_hw)
{ {
if (env->cr[0] & CR0_PE_MASK) { if (env->cr[0] & CR0_PE_MASK) {
do_interrupt_protected(intno, is_int, error_code, next_eip); do_interrupt_protected(intno, is_int, error_code, next_eip, is_hw);
} else { } else {
do_interrupt_real(intno, is_int, error_code, next_eip); do_interrupt_real(intno, is_int, error_code, next_eip);
} }