--- np2/i386c/ia32/instructions/data_trans.c	2004/03/09 18:52:12	1.12
+++ np2/i386c/ia32/instructions/data_trans.c	2004/03/12 13:34:08	1.13
@@ -1,4 +1,4 @@
-/*	$Id: data_trans.c,v 1.12 2004/03/09 18:52:12 yui Exp $	*/
+/*	$Id: data_trans.c,v 1.13 2004/03/12 13:34:08 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -1465,7 +1465,7 @@ PUSHA(void)
 	CPU_WORKCLOCK(17);
 	if (!CPU_STAT_SS32) {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16);
+			STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16);
 		}
 		REGPUSH0(CPU_AX);
 		REGPUSH0(CPU_CX);
@@ -1477,7 +1477,7 @@ PUSHA(void)
 		REGPUSH0(CPU_DI);
 	} else {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16);
+			STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16);
 		}
 		REGPUSH0_16_32(CPU_AX);
 		REGPUSH0_16_32(CPU_CX);
@@ -1498,7 +1498,7 @@ PUSHAD(void)
 	CPU_WORKCLOCK(17);
 	if (!CPU_STAT_SS32) {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32);
+			STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32);
 		}
 		REGPUSH0_32_16(CPU_EAX);
 		REGPUSH0_32_16(CPU_ECX);
@@ -1510,7 +1510,7 @@ PUSHAD(void)
 		REGPUSH0_32_16(CPU_EDI);
 	} else {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32);
+			STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32);
 		}
 		REGPUSH0_32(CPU_EAX);
 		REGPUSH0_32(CPU_ECX);
@@ -1530,7 +1530,7 @@ POPA(void)
 	CPU_WORKCLOCK(19);
 	if (!CPU_STAT_SS32) {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16);
+			STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16);
 		}
 		REGPOP0(CPU_DI);
 		REGPOP0(CPU_SI);
@@ -1542,7 +1542,7 @@ POPA(void)
 		REGPOP0(CPU_AX);
 	} else {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16);
+			STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16);
 		}
 		REGPOP0_16_32(CPU_DI);
 		REGPOP0_16_32(CPU_SI);
@@ -1562,7 +1562,7 @@ POPAD(void)
 	CPU_WORKCLOCK(19);
 	if (!CPU_STAT_SS32) {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32);
+			STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32);
 		}
 		REGPOP0_32_16(CPU_EDI);
 		REGPOP0_32_16(CPU_ESI);
@@ -1574,7 +1574,7 @@ POPAD(void)
 		REGPOP0_32_16(CPU_EAX);
 	} else {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32);
+			STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32);
 		}
 		REGPOP0_32(CPU_EDI);
 		REGPOP0_32(CPU_ESI);