--- np2/i386c/ia32/task.c	2004/02/06 16:49:51	1.10
+++ np2/i386c/ia32/task.c	2004/03/02 16:30:43	1.15
@@ -1,4 +1,4 @@
-/*	$Id: task.c,v 1.10 2004/02/06 16:49:51 monaka Exp $	*/
+/*	$Id: task.c,v 1.15 2004/03/02 16:30:43 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -33,10 +33,11 @@
 
 
 void
-load_tr(WORD selector)
+load_tr(UINT16 selector)
 {
 	selector_t task_sel;
 	int rv;
+	UINT16 iobase;
 
 	rv = parse_selector(&task_sel, selector);
 	if (rv < 0 || task_sel.ldt || task_sel.desc.s) {
@@ -49,16 +50,19 @@ load_tr(WORD selector)
 		if (task_sel.desc.u.seg.limit < 0x2b) {
 			EXCEPTION(TS_EXCEPTION, task_sel.idx);
 		}
+		iobase = 0;
 		break;
 
 	case CPU_SYSDESC_TYPE_TSS_32:
 		if (task_sel.desc.u.seg.limit < 0x67) {
 			EXCEPTION(TS_EXCEPTION, task_sel.idx);
 		}
+		iobase = cpu_kmemoryread_w(task_sel.desc.u.seg.segbase + 102);
 		break;
 
 	default:
 		EXCEPTION(GP_EXCEPTION, task_sel.idx);
+		iobase = 0;	/* compiler happy */
 		break;
 	}
 
@@ -75,12 +79,24 @@ load_tr(WORD selector)
 	CPU_SET_TASK_BUSY(task_sel.selector, &task_sel.desc);
 	CPU_TR = task_sel.selector;
 	CPU_TR_DESC = task_sel.desc;
+
+	/* I/O deny bitmap */
+	if (task_sel.desc.type == CPU_SYSDESC_TYPE_TSS_BUSY_32) {
+		if (iobase != 0 && iobase < task_sel.desc.u.seg.limit) {
+			CPU_STAT_IOLIMIT = (UINT16)(task_sel.desc.u.seg.limit - iobase);
+			CPU_STAT_IOADDR = task_sel.desc.u.seg.segbase + iobase;
+		} else {
+			CPU_STAT_IOLIMIT = 0;
+		}
+	} else {
+		CPU_STAT_IOLIMIT = 0;
+	}
 }
 
 void
-get_stack_from_tss(DWORD pl, WORD *new_ss, DWORD *new_esp)
+get_stack_pointer_from_tss(UINT pl, UINT16 *new_ss, UINT32 *new_esp)
 {
-	DWORD tss_stack_addr;
+	UINT32 tss_stack_addr;
 
 	__ASSERT(pl < 3);
 
@@ -101,16 +117,16 @@ get_stack_from_tss(DWORD pl, WORD *new_s
 		*new_esp = cpu_kmemoryread_w(tss_stack_addr);
 		*new_ss = cpu_kmemoryread_w(tss_stack_addr + 2);
 	} else {
-		ia32_panic("get_stack_from_tss: task register is invalid (%d)\n", CPU_TR_DESC.type);
+		ia32_panic("get_stack_pointer_from_tss: task register is invalid (%d)\n", CPU_TR_DESC.type);
 	}
 
-	VERBOSE(("get_stack_from_tss: pl = %d, new_esp = 0x%08x, new_ss = 0x%04x", pl, *new_esp, *new_ss));
+	VERBOSE(("get_stack_pointer_from_tss: pl = %d, new_esp = 0x%08x, new_ss = 0x%04x", pl, *new_esp, *new_ss));
 }
 
-WORD
-get_link_selector_from_tss()
+UINT16
+get_backlink_selector_from_tss(void)
 {
-	WORD backlink;
+	UINT16 backlink;
 
 	if (CPU_TR_DESC.type == CPU_SYSDESC_TYPE_TSS_BUSY_32) {
 		if (4 > CPU_TR_DESC.u.seg.limit) {
@@ -121,35 +137,35 @@ get_link_selector_from_tss()
 			EXCEPTION(TS_EXCEPTION, CPU_TR & ~3);
 		}
 	} else {
-		ia32_panic("get_link_selector_from_tss: task register is invalid (%d)\n", CPU_TR_DESC.type);
+		ia32_panic("get_backlink_selector_from_tss: task register is invalid (%d)\n", CPU_TR_DESC.type);
 	}
 
 	backlink = cpu_kmemoryread_w(CPU_TR_DESC.u.seg.segbase);
-	VERBOSE(("get_link_selector_from_tss: backlink selector = 0x%04x", backlink));
+	VERBOSE(("get_backlink_selector_from_tss: backlink selector = 0x%04x", backlink));
 	return backlink;
 }
 
 void
-task_switch(selector_t* task_sel, int type)
+task_switch(selector_t *task_sel, task_switch_type_t type)
 {
-	DWORD regs[CPU_REG_NUM];
-	DWORD eip;
-	DWORD new_flags;
-	DWORD mask;
-	DWORD cr3 = 0;
-	WORD sreg[CPU_SEGREG_NUM];
-	WORD ldtr;
-	WORD t, iobase;
+	UINT32 regs[CPU_REG_NUM];
+	UINT32 eip;
+	UINT32 new_flags;
+	UINT32 mask;
+	UINT32 cr3 = 0;
+	UINT16 sreg[CPU_SEGREG_NUM];
+	UINT16 ldtr;
+	UINT16 t, iobase;
 
 	selector_t cs_sel;
 	int rv;
 
-	DWORD cur_base;		/* current task state */
-	DWORD task_base;	/* new task state */
-	DWORD old_flags = REAL_EFLAGREG;
+	UINT32 cur_base;	/* current task state */
+	UINT32 task_base;	/* new task state */
+	UINT32 old_flags = REAL_EFLAGREG;
 	BOOL task16;
-	DWORD nsreg;
-	DWORD i;
+	UINT nsreg;
+	UINT i;
 
 	VERBOSE(("task_switch: start"));
 
@@ -188,7 +204,7 @@ task_switch(selector_t* task_sel, int ty
 
 #if defined(MORE_DEBUG)
 	{
-		DWORD v;
+		UINT32 v;
 
 		VERBOSE(("task_switch: new task"));
 		for (i = 0; i < task_sel->desc.u.seg.limit; i += 4) {
@@ -300,7 +316,7 @@ task_switch(selector_t* task_sel, int ty
 		}
 	} else {
 		cpu_kmemorywrite_w(cur_base + 14, CPU_IP);
-		cpu_kmemorywrite_w(cur_base + 16, (WORD)old_flags);
+		cpu_kmemorywrite_w(cur_base + 16, (UINT16)old_flags);
 		for (i = 0; i < CPU_REG_NUM; i++) {
 			cpu_kmemorywrite_w(cur_base + 18 + i * 2, CPU_REGS_WORD(i));
 		}
@@ -311,7 +327,7 @@ task_switch(selector_t* task_sel, int ty
 
 #if defined(MORE_DEBUG)
 	{
-		DWORD v;
+		UINT32 v;
 
 		VERBOSE(("task_switch: current task"));
 		for (i = 0; i < CPU_TR_DESC.u.seg.limit; i += 4) {
@@ -355,7 +371,7 @@ task_switch(selector_t* task_sel, int ty
 	case TASK_SWITCH_IRET:
 		/* check busy flag is active */
 		if (task_sel->desc.valid) {
-			DWORD h;
+			UINT32 h;
 			h = cpu_kmemoryread_d(task_sel->addr + 4);
 			if ((h & CPU_TSS_H_BUSY) == 0) {
 				ia32_panic("task_switch: new task is not busy");
@@ -394,11 +410,7 @@ task_switch(selector_t* task_sel, int ty
 
 	/* set new EFLAGS */
 	mask = I_FLAG|IOPL_FLAG|RF_FLAG|VM_FLAG|VIF_FLAG|VIP_FLAG;
-	if (!task16) {
-		set_eflags(new_flags, mask);
-	} else {
-		set_flags(new_flags, mask);
-	}
+	set_eflags(new_flags, mask);
 
 	/* load new LDTR */
 	load_ldtr(ldtr, TS_EXCEPTION);
@@ -454,8 +466,8 @@ task_switch(selector_t* task_sel, int ty
 
 	/* I/O deny bitmap */
 	if (!task16) {
-		if (task_sel->desc.u.seg.limit > iobase) {
-			CPU_STAT_IOLIMIT = task_sel->desc.u.seg.limit - iobase;
+		if (iobase != 0 && iobase < task_sel->desc.u.seg.limit) {
+			CPU_STAT_IOLIMIT = (UINT16)(task_sel->desc.u.seg.limit - iobase);
 			CPU_STAT_IOADDR = task_sel->desc.u.seg.segbase + iobase;
 		} else {
 			CPU_STAT_IOLIMIT = 0;