--- np2/i386c/ia32/instructions/shift_rotate.c	2004/03/14 23:45:43	1.6
+++ np2/i386c/ia32/instructions/shift_rotate.c	2004/03/23 15:29:34	1.7
@@ -1,4 +1,4 @@
-/*	$Id: shift_rotate.c,v 1.6 2004/03/14 23:45:43 yui Exp $	*/
+/*	$Id: shift_rotate.c,v 1.7 2004/03/23 15:29:34 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -38,1075 +38,17 @@
 /*
  * shift
  */
-/*
- * SAR
- */
-void
-SAR_Eb(UINT8 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_SAR1(dst, src);
-	*out = (UINT8)dst;
-}
-
-void
-SAR_Eb_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_SAR1(dst, src);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-SAR_Ew(UINT16 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_SAR1(dst, src);
-	*out = (UINT16)dst;
-}
-
-void
-SAR_Ew_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_SAR1(dst, src);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-SAR_Ed(UINT32 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_SAR1(dst, src);
-	*out = dst;
-}
-
-void
-SAR_Ed_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_SAR1(dst, src);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/* ExCL, ExIb */
-void
-SAR_EbCL(UINT8 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_SARCL(dst, src, cl);
-	*out = (UINT8)dst;
-}
-
-void
-SAR_EbCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_SARCL(dst, src, cl);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-SAR_EwCL(UINT16 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_SARCL(dst, src, cl);
-	*out = (UINT16)dst;
-}
-
-void
-SAR_EwCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_SARCL(dst, src, cl);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-SAR_EdCL(UINT32 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_SARCL(dst, src, cl);
-	*out = dst;
-}
-
-void
-SAR_EdCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_SARCL(dst, src, cl);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/*
- * SHR
- */
-void
-SHR_Eb(UINT8 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_SHR1(dst, src);
-	*out = (UINT8)dst;
-}
-
-void
-SHR_Eb_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_SHR1(dst, src);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-SHR_Ew(UINT16 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_SHR1(dst, src);
-	*out = (UINT16)dst;
-}
-
-void
-SHR_Ew_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_SHR1(dst, src);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-SHR_Ed(UINT32 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_SHR1(dst, src);
-	*out = dst;
-}
-
-void
-SHR_Ed_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_SHR1(dst, src);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/* ExCL, ExIb */
-void
-SHR_EbCL(UINT8 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_SHRCL(dst, src, cl);
-	*out = (UINT8)dst;
-}
-
-void
-SHR_EbCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_SHRCL(dst, src, cl);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-SHR_EwCL(UINT16 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_SHRCL(dst, src, cl);
-	*out = (UINT16)dst;
-}
-
-void
-SHR_EwCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_SHRCL(dst, src, cl);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-SHR_EdCL(UINT32 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_SHRCL(dst, src, cl);
-	*out = dst;
-}
-
-void
-SHR_EdCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
+SHIFT_ROTATE_INSTRUCTION(SAR)
+SHIFT_ROTATE_INSTRUCTION(SHR)
+SHIFT_ROTATE_INSTRUCTION(SHL)
+SHxD_INSTRUCTION(SHRD)
+SHxD_INSTRUCTION(SHLD)
 
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_SHRCL(dst, src, cl);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/*
- * SHL/SAL
- */
-void
-SHL_Eb(UINT8 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_SHL1(dst, src);
-	*out = (UINT8)dst;
-}
-
-void
-SHL_Eb_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_SHL1(dst, src);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-SHL_Ew(UINT16 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_SHL1(dst, src);
-	*out = (UINT16)dst;
-}
-
-void
-SHL_Ew_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_SHL1(dst, src);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-SHL_Ed(UINT32 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_SHL1(dst, src);
-	*out = dst;
-}
-
-void
-SHL_Ed_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_SHL1(dst, src);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/* ExCL, ExIb */
-void
-SHL_EbCL(UINT8 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_SHLCL(dst, src, cl);
-	*out = (UINT8)dst;
-}
-
-void
-SHL_EbCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_SHLCL(dst, src, cl);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-SHL_EwCL(UINT16 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_SHLCL(dst, src, cl);
-	*out = (UINT16)dst;
-}
-
-void
-SHL_EwCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_SHLCL(dst, src, cl);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-SHL_EdCL(UINT32 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_SHLCL(dst, src, cl);
-	*out = dst;
-}
-
-void
-SHL_EdCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_SHLCL(dst, src, cl);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/*
- * SHRD
- */
-void
-SHRD_EwGwIb(void)
-{
-	UINT16 *out;
-	UINT32 op, src, dst, madr;
-	UINT cl;
-
-	PREPART_EA_REG16(op, src);
-	if (op >= 0xc0) {
-		CPU_WORKCLOCK(3);
-		out = reg16_b20[op];
-		GET_PCBYTE(cl);
-		dst = *out;
-		WORD_SHRD(dst, src, cl);
-		*out = (UINT16)dst;
-	} else {
-		CPU_WORKCLOCK(7);
-		madr = calc_ea_dst(op);
-		GET_PCBYTE(cl);
-		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-		WORD_SHRD(dst, src, cl);
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-	}
-}
-
-void
-SHRD_EdGdIb(void)
-{
-	UINT32 *out;
-	UINT32 op, src, dst, madr;
-	UINT cl;
-
-	PREPART_EA_REG32(op, src);
-	if (op >= 0xc0) {
-		CPU_WORKCLOCK(3);
-		out = reg32_b20[op];
-		GET_PCBYTE(cl);
-		dst = *out;
-		DWORD_SHRD(dst, src, cl);
-		*out = dst;
-	} else {
-		CPU_WORKCLOCK(7);
-		madr = calc_ea_dst(op);
-		GET_PCBYTE(cl);
-		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		DWORD_SHRD(dst, src, cl);
-		cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-	}
-}
-
-void
-SHRD_EwGwCL(void)
-{
-	UINT16 *out;
-	UINT32 op, src, dst, madr;
-	UINT cl;
-
-	PREPART_EA_REG16(op, src);
-	cl = CPU_CL;
-	if (op >= 0xc0) {
-		CPU_WORKCLOCK(3);
-		out = reg16_b20[op];
-		dst = *out;
-		WORD_SHRD(dst, src, cl);
-		*out = (UINT16)dst;
-	} else {
-		CPU_WORKCLOCK(7);
-		madr = calc_ea_dst(op);
-		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-		WORD_SHRD(dst, src, cl);
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-	}
-}
-
-void
-SHRD_EdGdCL(void)
-{
-	UINT32 *out;
-	UINT32 op, src, dst, madr;
-	UINT cl;
-
-	PREPART_EA_REG32(op, src);
-	cl = CPU_CL;
-	if (op >= 0xc0) {
-		CPU_WORKCLOCK(3);
-		out = reg32_b20[op];
-		dst = *out;
-		DWORD_SHRD(dst, src, cl);
-		*out = dst;
-	} else {
-		CPU_WORKCLOCK(7);
-		madr = calc_ea_dst(op);
-		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		DWORD_SHRD(dst, src, cl);
-		cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-	}
-}
-
-/*
- * SHLD
- */
-void
-SHLD_EwGwIb(void)
-{
-	UINT16 *out;
-	UINT32 op, src, dst, madr;
-	UINT cl;
-
-	PREPART_EA_REG16(op, src);
-	if (op >= 0xc0) {
-		CPU_WORKCLOCK(3);
-		out = reg16_b20[op];
-		GET_PCBYTE(cl);
-		dst = *out;
-		WORD_SHLD(dst, src, cl);
-		*out = (UINT16)dst;
-	} else {
-		CPU_WORKCLOCK(7);
-		madr = calc_ea_dst(op);
-		GET_PCBYTE(cl);
-		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-		WORD_SHLD(dst, src, cl);
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-	}
-}
-
-void
-SHLD_EdGdIb(void)
-{
-	UINT32 *out;
-	UINT32 op, src, dst, madr;
-	UINT cl;
-
-	PREPART_EA_REG32(op, src);
-	if (op >= 0xc0) {
-		CPU_WORKCLOCK(3);
-		out = reg32_b20[op];
-		GET_PCBYTE(cl);
-		dst = *out;
-		DWORD_SHLD(dst, src, cl);
-		*out = dst;
-	} else {
-		CPU_WORKCLOCK(7);
-		madr = calc_ea_dst(op);
-		GET_PCBYTE(cl);
-		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		DWORD_SHLD(dst, src, cl);
-		cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-	}
-}
-
-void
-SHLD_EwGwCL(void)
-{
-	UINT16 *out;
-	UINT32 op, src, dst, madr;
-	UINT cl;
-
-	PREPART_EA_REG16(op, src);
-	cl = CPU_CL;
-	if (op >= 0xc0) {
-		CPU_WORKCLOCK(3);
-		out = reg16_b20[op];
-		dst = *out;
-		WORD_SHLD(dst, src, cl);
-		*out = (UINT16)dst;
-	} else {
-		CPU_WORKCLOCK(7);
-		madr = calc_ea_dst(op);
-		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-		WORD_SHLD(dst, src, cl);
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-	}
-}
-
-void
-SHLD_EdGdCL(void)
-{
-	UINT32 *out;
-	UINT32 op, src, dst, madr;
-	UINT cl;
-
-	PREPART_EA_REG32(op, src);
-	cl = CPU_CL;
-	if (op >= 0xc0) {
-		CPU_WORKCLOCK(3);
-		out = reg32_b20[op];
-		dst = *out;
-		DWORD_SHLD(dst, src, cl);
-		*out = dst;
-	} else {
-		CPU_WORKCLOCK(7);
-		madr = calc_ea_dst(op);
-		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		DWORD_SHLD(dst, src, cl);
-		cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-	}
-}
 
 /*
  * rotate
  */
-/*
- * ROR
- */
-void
-ROR_Eb(UINT8 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_ROR1(dst, src);
-	*out = (UINT8)dst;
-}
-
-void
-ROR_Eb_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_ROR1(dst, src);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-ROR_Ew(UINT16 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_ROR1(dst, src);
-	*out = (UINT16)dst;
-}
-
-void
-ROR_Ew_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_ROR1(dst, src);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-ROR_Ed(UINT32 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_ROR1(dst, src);
-	*out = dst;
-}
-
-void
-ROR_Ed_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_ROR1(dst, src);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/* ExCL, ExIb */
-void
-ROR_EbCL(UINT8 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_RORCL(dst, src, cl);
-	*out = (UINT8)dst;
-}
-
-void
-ROR_EbCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_RORCL(dst, src, cl);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-ROR_EwCL(UINT16 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_RORCL(dst, src, cl);
-	*out = (UINT16)dst;
-}
-
-void
-ROR_EwCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_RORCL(dst, src, cl);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-ROR_EdCL(UINT32 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_RORCL(dst, src, cl);
-	*out = dst;
-}
-
-void
-ROR_EdCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_RORCL(dst, src, cl);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/*
- * ROL
- */
-void
-ROL_Eb(UINT8 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_ROL1(dst, src);
-	*out = (UINT8)dst;
-}
-
-void
-ROL_Eb_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_ROL1(dst, src);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-ROL_Ew(UINT16 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_ROL1(dst, src);
-	*out = (UINT16)dst;
-}
-
-void
-ROL_Ew_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_ROL1(dst, src);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-ROL_Ed(UINT32 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_ROL1(dst, src);
-	*out = dst;
-}
-
-void
-ROL_Ed_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_ROL1(dst, src);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/* ExCL, ExIb */
-void
-ROL_EbCL(UINT8 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_ROLCL(dst, src, cl);
-	*out = (UINT8)dst;
-}
-
-void
-ROL_EbCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_ROLCL(dst, src, cl);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-ROL_EwCL(UINT16 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_ROLCL(dst, src, cl);
-	*out = (UINT16)dst;
-}
-
-void
-ROL_EwCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_ROLCL(dst, src, cl);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-ROL_EdCL(UINT32 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_ROLCL(dst, src, cl);
-	*out = dst;
-}
-
-void
-ROL_EdCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_ROLCL(dst, src, cl);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/*
- * RCR
- */
-void
-RCR_Eb(UINT8 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_RCR1(dst, src);
-	*out = (UINT8)dst;
-}
-
-void
-RCR_Eb_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_RCR1(dst, src);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-RCR_Ew(UINT16 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_RCR1(dst, src);
-	*out = (UINT16)dst;
-}
-
-void
-RCR_Ew_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_RCR1(dst, src);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-RCR_Ed(UINT32 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_RCR1(dst, src);
-	*out = dst;
-}
-
-void
-RCR_Ed_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_RCR1(dst, src);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/* ExCL, ExIb */
-void
-RCR_EbCL(UINT8 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_RCRCL(dst, src, cl);
-	*out = (UINT8)dst;
-}
-
-void
-RCR_EbCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_RCRCL(dst, src, cl);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-RCR_EwCL(UINT16 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_RCRCL(dst, src, cl);
-	*out = (UINT16)dst;
-}
-
-void
-RCR_EwCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_RCRCL(dst, src, cl);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-RCR_EdCL(UINT32 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_RCRCL(dst, src, cl);
-	*out = dst;
-}
-
-void
-RCR_EdCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_RCRCL(dst, src, cl);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/*
- * RCL
- */
-void
-RCL_Eb(UINT8 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_RCL1(dst, src);
-	*out = (UINT8)dst;
-}
-
-void
-RCL_Eb_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_RCL1(dst, src);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-RCL_Ew(UINT16 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_RCL1(dst, src);
-	*out = (UINT16)dst;
-}
-
-void
-RCL_Ew_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_RCL1(dst, src);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-RCL_Ed(UINT32 *out)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_RCL1(dst, src);
-	*out = dst;
-}
-
-void
-RCL_Ed_ext(UINT32 madr)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_RCL1(dst, src);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
-
-/* ExCL, ExIb */
-void
-RCL_EbCL(UINT8 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	BYTE_RCLCL(dst, src, cl);
-	*out = (UINT8)dst;
-}
-
-void
-RCL_EbCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-	BYTE_RCLCL(dst, src, cl);
-	cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)dst);
-}
-
-void
-RCL_EwCL(UINT16 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	WORD_RCLCL(dst, src, cl);
-	*out = (UINT16)dst;
-}
-
-void
-RCL_EwCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-	WORD_RCLCL(dst, src, cl);
-	cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst);
-}
-
-void
-RCL_EdCL(UINT32 *out, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = *out;
-	DWORD_RCLCL(dst, src, cl);
-	*out = dst;
-}
-
-void
-RCL_EdCL_ext(UINT32 madr, UINT cl)
-{
-	UINT32 src, dst;
-
-	src = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-	DWORD_RCLCL(dst, src, cl);
-	cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, dst);
-}
+SHIFT_ROTATE_INSTRUCTION(ROR)
+SHIFT_ROTATE_INSTRUCTION(ROL)
+SHIFT_ROTATE_INSTRUCTION(RCR)
+SHIFT_ROTATE_INSTRUCTION(RCL)