np2/i386c/ia32/exception.c - diff

Return to exception.c CVS log

Up to [RetroPC.NET] / np2 / i386c / ia32

Diff for /np2/i386c/ia32/exception.c between versions 1.14 and 1.18

version 1.14, 2004/03/08 12:56:22	version 1.18, 2005/02/04 05:32:24
Line 72 exception(int num, int error_code)	Line 72 exception(int num, int error_code)

__ASSERT((unsigned int)num < EXCEPTION_NUM);	__ASSERT((unsigned int)num < EXCEPTION_NUM);

	#if 0
	iptrace_out();
	debugwriteseg("execption.bin", &CPU_STAT_SREG(CPU_CS_INDEX), CPU_PREV_EIP & 0xffff0000, 0x10000);
	#endif

VERBOSE(("exception: -------------------------------------------------------------- start"));	VERBOSE(("exception: -------------------------------------------------------------- start"));
VERBOSE(("exception: %s, error_code = %x at %04x:%08x", exception_str[num], error_code, CPU_CS, CPU_PREV_EIP));	VERBOSE(("exception: %s, error_code = %x at %04x:%08x", exception_str[num], error_code, CPU_CS, CPU_PREV_EIP));
VERBOSE(("%s", cpu_reg2str()));	VERBOSE(("%s", cpu_reg2str()));
Line 143 exception(int num, int error_code)	Line 148 exception(int num, int error_code)
#if defined(IA32_SUPPORT_DEBUG_REGISTER)	#if defined(IA32_SUPPORT_DEBUG_REGISTER)
if (num != BP_EXCEPTION) {	if (num != BP_EXCEPTION) {
if (CPU_INST_OP32) {	if (CPU_INST_OP32) {
	#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION)
	CPU_EFLAG \|= RF_FLAG;
	#else
set_eflags(REAL_EFLAGREG\|RF_FLAG, RF_FLAG);	set_eflags(REAL_EFLAGREG\|RF_FLAG, RF_FLAG);
	#endif
}	}
}	}
#endif	#endif
Line 207 exception(int num, int error_code)	Line 216 exception(int num, int error_code)
* D : ゲートのサイズ．0 = 16 bit, 1 = 32 bit	* D : ゲートのサイズ．0 = 16 bit, 1 = 32 bit
*/	*/

static void interrupt_task_gate(descriptor_t *gd, int softintp, int errorp, int error_code);	static void interrupt_task_gate(const descriptor_t *gd, int softintp, int errorp, int error_code);
static void interrupt_intr_or_trap(descriptor_t *gd, int softintp, int errorp, int error_code);	static void interrupt_intr_or_trap(const descriptor_t *gd, int softintp, int errorp, int error_code);

void	void
interrupt(int num, int softintp, int errorp, int error_code)	interrupt(int num, int softintp, int errorp, int error_code)
Line 324 interrupt(int num, int softintp, int err	Line 333 interrupt(int num, int softintp, int err
}	}

static void	static void
interrupt_task_gate(descriptor_t *gd, int softintp, int errorp, int error_code)	interrupt_task_gate(const descriptor_t *gd, int softintp, int errorp, int error_code)
{	{
selector_t task_sel;	selector_t task_sel;
int rv;	int rv;
Line 369 interrupt_task_gate(descriptor_t *gd, in	Line 378 interrupt_task_gate(descriptor_t *gd, in
}	}

static void	static void
interrupt_intr_or_trap(descriptor_t *gd, int softintp, int errorp, int error_code)	interrupt_intr_or_trap(const descriptor_t *gd, int softintp, int errorp, int error_code)
{	{
selector_t cs_sel, ss_sel;	selector_t cs_sel, ss_sel;
UINT stacksize;	UINT stacksize;
Line 387 interrupt_intr_or_trap(descriptor_t *gd,	Line 396 interrupt_intr_or_trap(descriptor_t *gd,
old_cs = CPU_CS;	old_cs = CPU_CS;
old_ip = CPU_EIP;	old_ip = CPU_EIP;
old_sp = CPU_ESP;	old_sp = CPU_ESP;
new_flags = old_flags = REAL_EFLAGREG;	old_flags = REAL_EFLAGREG;
	new_flags = REAL_EFLAGREG & ~(T_FLAG\|RF_FLAG\|NT_FLAG\|VM_FLAG);
	mask = T_FLAG\|RF_FLAG\|NT_FLAG\|VM_FLAG;

switch (gd->type) {	switch (gd->type) {
case CPU_SYSDESC_TYPE_INTR_16:	case CPU_SYSDESC_TYPE_INTR_16:
case CPU_SYSDESC_TYPE_INTR_32:	case CPU_SYSDESC_TYPE_INTR_32:
VERBOSE(("interrupt: INTERRUPT-GATE"));	VERBOSE(("interrupt: INTERRUPT-GATE"));
new_flags &= ~I_FLAG;	new_flags &= ~I_FLAG;
mask = I_FLAG;	mask \|= I_FLAG;
break;	break;

case CPU_SYSDESC_TYPE_TRAP_16:	case CPU_SYSDESC_TYPE_TRAP_16:
case CPU_SYSDESC_TYPE_TRAP_32:	case CPU_SYSDESC_TYPE_TRAP_32:
VERBOSE(("interrupt: TRAP-GATE"));	VERBOSE(("interrupt: TRAP-GATE"));
	break;

default:	default:
mask = 0;	ia32_panic("interrupt: gate descriptor type is invalid (type = %d)", gd->type);
break;	break;
}	}
new_flags &= ~(T_FLAG\|RF_FLAG\|NT_FLAG\|VM_FLAG);
mask \|= T_FLAG\|RF_FLAG\|NT_FLAG\|VM_FLAG;

rv = parse_selector(&cs_sel, gd->u.gate.selector);	rv = parse_selector(&cs_sel, gd->u.gate.selector);
if (rv < 0) {	if (rv < 0) {
Line 497 interrupt_intr_or_trap(descriptor_t *gd,	Line 507 interrupt_intr_or_trap(descriptor_t *gd,
}	}

/* check stack room size */	/* check stack room size */
CHECK_STACK_PUSH(&ss_sel.desc, new_sp, stacksize);	STACK_PUSH_CHECK(ss_sel.idx, &ss_sel.desc, new_sp, stacksize);

/* out of range */	/* out of range */
if (new_ip > cs_sel.desc.u.seg.limit) {	if (new_ip > cs_sel.desc.u.seg.limit) {
Line 554 interrupt_intr_or_trap(descriptor_t *gd,	Line 564 interrupt_intr_or_trap(descriptor_t *gd,
}	}
break;	break;
}	}

set_eflags(new_flags, mask);
} else {	} else {
if (CPU_STAT_VM86) {	if (CPU_STAT_VM86) {
VERBOSE(("interrupt: VM86"));	VERBOSE(("interrupt: VM86"));
Line 580 interrupt_intr_or_trap(descriptor_t *gd,	Line 588 interrupt_intr_or_trap(descriptor_t *gd,
} else {	} else {
sp = CPU_SP;	sp = CPU_SP;
}	}
CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, stacksize);	STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, stacksize);

/* out of range */	/* out of range */
if (new_ip > cs_sel.desc.u.seg.limit) {	if (new_ip > cs_sel.desc.u.seg.limit) {
Line 612 interrupt_intr_or_trap(descriptor_t *gd,	Line 620 interrupt_intr_or_trap(descriptor_t *gd,
}	}
break;	break;
}	}

set_eflags(new_flags, mask);
}	}
	#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION)
	CPU_EFLAG = new_flags;
	CPU_OV = CPU_FLAG & O_FLAG;
	CPU_TRAP = (CPU_FLAG & (I_FLAG\|T_FLAG)) == (I_FLAG\|T_FLAG);
	if ((old_flags ^ CPU_EFLAG) & VM_FLAG) {
	if (CPU_EFLAG & VM_FLAG) {
	change_vm(1);
	} else {
	change_vm(0);
	}
	}
	#else
	set_eflags(new_flags, mask);
	#endif

VERBOSE(("interrupt: new EIP = %04x:%08x, ESP = %04x:%08x", CPU_CS, CPU_EIP, CPU_SS, CPU_ESP));	VERBOSE(("interrupt: new EIP = %04x:%08x, ESP = %04x:%08x", CPU_CS, CPU_EIP, CPU_SS, CPU_ESP));
}	}

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.14
changed lines
	Added in v.1.18