[coreboot-gerrit] Change in coreboot[master]: device/oprom/x86emu/prim_ops.c: Fix coding style

Elyes HAOUAS (Code Review) gerrit at coreboot.org
Thu May 17 20:28:59 CEST 2018


Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/26353


Change subject: device/oprom/x86emu/prim_ops.c: Fix coding style
......................................................................

device/oprom/x86emu/prim_ops.c: Fix coding style

Change-Id: I010f3e02813d38293a7ab7fc84f60b8c2ec098a7
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
M src/device/oprom/x86emu/prim_ops.c
1 file changed, 1,377 insertions(+), 1,415 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/26353/1

diff --git a/src/device/oprom/x86emu/prim_ops.c b/src/device/oprom/x86emu/prim_ops.c
index 8b2c38a..a110733 100644
--- a/src/device/oprom/x86emu/prim_ops.c
+++ b/src/device/oprom/x86emu/prim_ops.c
@@ -100,32 +100,30 @@
 #define PRIM_OPS_NO_REDEFINE_ASM
 #include "x86emui.h"
 
-#define abs(x) ({                               \
-                int __x = (x);                  \
-                (__x < 0) ? -__x : __x;         \
-        })
+#define abs(x) ({				\
+		int __x = (x);			\
+		(__x < 0) ? -__x : __x;		\
+	})
 
-#define labs(x) ({                              \
-                long __x = (x);                 \
-                (__x < 0) ? -__x : __x;         \
-        })
+#define labs(x) ({				\
+		long __x = (x);			\
+		(__x < 0) ? -__x : __x;		\
+	})
 
 /*------------------------- Global Variables ------------------------------*/
-
-static u32 x86emu_parity_tab[8] =
-{
-    0x96696996,
-    0x69969669,
-    0x69969669,
-    0x96696996,
-    0x69969669,
-    0x96696996,
-    0x96696996,
-    0x69969669,
+static u32 x86emu_parity_tab[8] = {
+	0x96696996,
+	0x69969669,
+	0x69969669,
+	0x96696996,
+	0x69969669,
+	0x96696996,
+	0x96696996,
+	0x69969669,
 };
 
 #define PARITY(x)   (((x86emu_parity_tab[(x) / 32] >> ((x) % 32)) & 1) == 0)
-#define XOR2(x)     (((x) ^ ((x)>>1)) & 0x1)
+#define XOR2(x)	 (((x) ^ ((x)>>1)) & 0x1)
 
 /*----------------------------- Implementation ----------------------------*/
 
@@ -139,76 +137,74 @@
 
 static void set_parity_flag(u32 res)
 {
-    CONDITIONAL_SET_FLAG(PARITY(res & 0xFF), F_PF);
+	CONDITIONAL_SET_FLAG(PARITY(res & 0xFF), F_PF);
 }
 
 static void set_szp_flags_8(u8 res)
 {
-    CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
-    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-    set_parity_flag(res);
+	CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
+	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+	set_parity_flag(res);
 }
 
 static void set_szp_flags_16(u16 res)
 {
-    CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
-    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-    set_parity_flag(res);
+	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
+	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+	set_parity_flag(res);
 }
 
 static void set_szp_flags_32(u32 res)
 {
-    CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
-    CONDITIONAL_SET_FLAG(res == 0, F_ZF);
-    set_parity_flag(res);
+	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
+	CONDITIONAL_SET_FLAG(res == 0, F_ZF);
+	set_parity_flag(res);
 }
 
 static void no_carry_byte_side_eff(u8 res)
 {
-    CLEAR_FLAG(F_OF);
-    CLEAR_FLAG(F_CF);
-    CLEAR_FLAG(F_AF);
-    set_szp_flags_8(res);
+	CLEAR_FLAG(F_OF);
+	CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_AF);
+	set_szp_flags_8(res);
 }
 
 static void no_carry_word_side_eff(u16 res)
 {
-    CLEAR_FLAG(F_OF);
-    CLEAR_FLAG(F_CF);
-    CLEAR_FLAG(F_AF);
-    set_szp_flags_16(res);
+	CLEAR_FLAG(F_OF);
+	CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_AF);
+	set_szp_flags_16(res);
 }
 
 static void no_carry_long_side_eff(u32 res)
 {
-    CLEAR_FLAG(F_OF);
-    CLEAR_FLAG(F_CF);
-    CLEAR_FLAG(F_AF);
-    set_szp_flags_32(res);
+	CLEAR_FLAG(F_OF);
+	CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_AF);
+	set_szp_flags_32(res);
 }
 
 static void calc_carry_chain(int bits, u32 d, u32 s, u32 res, int set_carry)
 {
-    u32 cc;
+	u32 cc;
 
-    cc = (s & d) | ((~res) & (s | d));
-    CONDITIONAL_SET_FLAG(XOR2(cc >> (bits - 2)), F_OF);
-    CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
-    if (set_carry) {
-        CONDITIONAL_SET_FLAG(res & (1 << bits), F_CF);
-    }
+	cc = (s & d) | ((~res) & (s | d));
+	CONDITIONAL_SET_FLAG(XOR2(cc >> (bits - 2)), F_OF);
+	CONDITIONAL_SET_FLAG(cc & 0x8, F_AF);
+	if (set_carry)
+		CONDITIONAL_SET_FLAG(res & (1 << bits), F_CF);
 }
 
 static void calc_borrow_chain(int bits, u32 d, u32 s, u32 res, int set_carry)
 {
-    u32 bc;
+	u32 bc;
 
-    bc = (res & (~d | s)) | (~d & s);
-    CONDITIONAL_SET_FLAG(XOR2(bc >> (bits - 2)), F_OF);
-    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-    if (set_carry) {
-        CONDITIONAL_SET_FLAG(bc & (1 << (bits - 1)), F_CF);
-    }
+	bc = (res & (~d | s)) | (~d & s);
+	CONDITIONAL_SET_FLAG(XOR2(bc >> (bits - 2)), F_OF);
+	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+	if (set_carry)
+		CONDITIONAL_SET_FLAG(bc & (1 << (bits - 1)), F_CF);
 }
 
 /****************************************************************************
@@ -217,19 +213,19 @@
 ****************************************************************************/
 u16 aaa_word(u16 d)
 {
-    u16 res;
-    if ((d & 0xf) > 0x9 || ACCESS_FLAG(F_AF)) {
-        d += 0x6;
-        d += 0x100;
-        SET_FLAG(F_AF);
-        SET_FLAG(F_CF);
-    } else {
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_AF);
-    }
-    res = (u16)(d & 0xFF0F);
-    set_szp_flags_16(res);
-    return res;
+	u16 res;
+	if ((d & 0xf) > 0x9 || ACCESS_FLAG(F_AF)) {
+		d += 0x6;
+		d += 0x100;
+		SET_FLAG(F_AF);
+		SET_FLAG(F_CF);
+	} else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_AF);
+	}
+	res = (u16)(d & 0xFF0F);
+	set_szp_flags_16(res);
+	return res;
 }
 
 /****************************************************************************
@@ -238,19 +234,19 @@
 ****************************************************************************/
 u16 aas_word(u16 d)
 {
-    u16 res;
-    if ((d & 0xf) > 0x9 || ACCESS_FLAG(F_AF)) {
-        d -= 0x6;
-        d -= 0x100;
-        SET_FLAG(F_AF);
-        SET_FLAG(F_CF);
-    } else {
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_AF);
-    }
-    res = (u16)(d & 0xFF0F);
-    set_szp_flags_16(res);
-    return res;
+	u16 res;
+	if ((d & 0xf) > 0x9 || ACCESS_FLAG(F_AF)) {
+		d -= 0x6;
+		d -= 0x100;
+		SET_FLAG(F_AF);
+		SET_FLAG(F_CF);
+	} else {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_AF);
+	}
+	res = (u16)(d & 0xFF0F);
+	set_szp_flags_16(res);
+	return res;
 }
 
 /****************************************************************************
@@ -259,15 +255,15 @@
 ****************************************************************************/
 u16 aad_word(u16 d)
 {
-    u16 l;
-    u8 hb, lb;
+	u16 l;
+	u8 hb, lb;
 
-    hb = (u8)((d >> 8) & 0xff);
-    lb = (u8)((d & 0xff));
-    l = (u16)((lb + 10 * hb) & 0xFF);
+	hb = (u8)((d >> 8) & 0xff);
+	lb = (u8)((d & 0xff));
+	l = (u16)((lb + 10 * hb) & 0xFF);
 
-    no_carry_byte_side_eff(l & 0xFF);
-    return l;
+	no_carry_byte_side_eff(l & 0xFF);
+	return l;
 }
 
 /****************************************************************************
@@ -276,14 +272,14 @@
 ****************************************************************************/
 u16 aam_word(u8 d)
 {
-    u16 h, l;
+	u16 h, l;
 
-    h = (u16)(d / 10);
-    l = (u16)(d % 10);
-    l |= (u16)(h << 8);
+	h = (u16)(d / 10);
+	l = (u16)(d % 10);
+	l |= (u16)(h << 8);
 
-    no_carry_byte_side_eff(l & 0xFF);
-    return l;
+	no_carry_byte_side_eff(l & 0xFF);
+	return l;
 }
 
 /****************************************************************************
@@ -292,15 +288,16 @@
 ****************************************************************************/
 u8 adc_byte(u8 d, u8 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d + s;
-    if (ACCESS_FLAG(F_CF)) res++;
+	res = d + s;
+	if (ACCESS_FLAG(F_CF))
+		res++;
 
-    set_szp_flags_8(res);
-    calc_carry_chain(8,s,d,res,1);
+	set_szp_flags_8(res);
+	calc_carry_chain(8, s, d, res, 1);
 
-    return (u8)res;
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -309,16 +306,16 @@
 ****************************************************************************/
 u16 adc_word(u16 d, u16 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d + s;
-    if (ACCESS_FLAG(F_CF))
-        res++;
+	res = d + s;
+	if (ACCESS_FLAG(F_CF))
+		res++;
 
-    set_szp_flags_16((u16)res);
-    calc_carry_chain(16,s,d,res,1);
+	set_szp_flags_16((u16)res);
+	calc_carry_chain(16, s, d, res, 1);
 
-    return (u16)res;
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -327,26 +324,26 @@
 ****************************************************************************/
 u32 adc_long(u32 d, u32 s)
 {
-    u32 lo;    /* all operands in native machine order */
-    u32 hi;
-    u32 res;
+	u32 lo;	/* all operands in native machine order */
+	u32 hi;
+	u32 res;
 
-    lo = (d & 0xFFFF) + (s & 0xFFFF);
-    res = d + s;
+	lo = (d & 0xFFFF) + (s & 0xFFFF);
+	res = d + s;
 
-    if (ACCESS_FLAG(F_CF)) {
-        lo++;
-        res++;
-    }
+	if (ACCESS_FLAG(F_CF)) {
+		lo++;
+		res++;
+	}
 
-    hi = (lo >> 16) + (d >> 16) + (s >> 16);
+	hi = (lo >> 16) + (d >> 16) + (s >> 16);
 
-    set_szp_flags_32(res);
-    calc_carry_chain(32,s,d,res,0);
+	set_szp_flags_32(res);
+	calc_carry_chain(32, s, d, res, 0);
 
-    CONDITIONAL_SET_FLAG(hi & 0x10000, F_CF);
+	CONDITIONAL_SET_FLAG(hi & 0x10000, F_CF);
 
-    return res;
+	return res;
 }
 
 /****************************************************************************
@@ -355,13 +352,13 @@
 ****************************************************************************/
 u8 add_byte(u8 d, u8 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d + s;
-    set_szp_flags_8((u8)res);
-    calc_carry_chain(8,s,d,res,1);
+	res = d + s;
+	set_szp_flags_8((u8)res);
+	calc_carry_chain(8, s, d, res, 1);
 
-    return (u8)res;
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -370,13 +367,13 @@
 ****************************************************************************/
 u16 add_word(u16 d, u16 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d + s;
-    set_szp_flags_16((u16)res);
-    calc_carry_chain(16,s,d,res,1);
+	res = d + s;
+	set_szp_flags_16((u16)res);
+	calc_carry_chain(16, s, d, res, 1);
 
-    return (u16)res;
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -385,15 +382,15 @@
 ****************************************************************************/
 u32 add_long(u32 d, u32 s)
 {
-    u32 res;
+	u32 res;
 
-    res = d + s;
-    set_szp_flags_32(res);
-    calc_carry_chain(32,s,d,res,0);
+	res = d + s;
+	set_szp_flags_32(res);
+	calc_carry_chain(32, s, d, res, 0);
 
-    CONDITIONAL_SET_FLAG(res < d || res < s, F_CF);
+	CONDITIONAL_SET_FLAG(res < d || res < s, F_CF);
 
-    return res;
+	return res;
 }
 
 /****************************************************************************
@@ -402,12 +399,12 @@
 ****************************************************************************/
 u8 and_byte(u8 d, u8 s)
 {
-    u8 res;    /* all operands in native machine order */
+	u8 res;	/* all operands in native machine order */
 
-    res = d & s;
+	res = d & s;
 
-    no_carry_byte_side_eff(res);
-    return res;
+	no_carry_byte_side_eff(res);
+	return res;
 }
 
 /****************************************************************************
@@ -416,12 +413,12 @@
 ****************************************************************************/
 u16 and_word(u16 d, u16 s)
 {
-    u16 res;   /* all operands in native machine order */
+	u16 res; /* all operands in native machine order */
 
-    res = d & s;
+	res = d & s;
 
-    no_carry_word_side_eff(res);
-    return res;
+	no_carry_word_side_eff(res);
+	return res;
 }
 
 /****************************************************************************
@@ -430,11 +427,11 @@
 ****************************************************************************/
 u32 and_long(u32 d, u32 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d & s;
-    no_carry_long_side_eff(res);
-    return res;
+	res = d & s;
+	no_carry_long_side_eff(res);
+	return res;
 }
 
 /****************************************************************************
@@ -443,13 +440,13 @@
 ****************************************************************************/
 u8 cmp_byte(u8 d, u8 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d - s;
-    set_szp_flags_8((u8)res);
-    calc_borrow_chain(8, d, s, res, 1);
+	res = d - s;
+	set_szp_flags_8((u8)res);
+	calc_borrow_chain(8, d, s, res, 1);
 
-    return d;
+	return d;
 }
 
 /****************************************************************************
@@ -458,13 +455,13 @@
 ****************************************************************************/
 u16 cmp_word(u16 d, u16 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d - s;
-    set_szp_flags_16((u16)res);
-    calc_borrow_chain(16, d, s, res, 1);
+	res = d - s;
+	set_szp_flags_16((u16)res);
+	calc_borrow_chain(16, d, s, res, 1);
 
-    return d;
+	return d;
 }
 
 /****************************************************************************
@@ -473,13 +470,13 @@
 ****************************************************************************/
 u32 cmp_long(u32 d, u32 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d - s;
-    set_szp_flags_32(res);
-    calc_borrow_chain(32, d, s, res, 1);
+	res = d - s;
+	set_szp_flags_32(res);
+	calc_borrow_chain(32, d, s, res, 1);
 
-    return d;
+	return d;
 }
 
 /****************************************************************************
@@ -488,17 +485,17 @@
 ****************************************************************************/
 u8 daa_byte(u8 d)
 {
-    u32 res = d;
-    if ((d & 0xf) > 9 || ACCESS_FLAG(F_AF)) {
-        res += 6;
-        SET_FLAG(F_AF);
-    }
-    if (res > 0x9F || ACCESS_FLAG(F_CF)) {
-        res += 0x60;
-        SET_FLAG(F_CF);
-    }
-    set_szp_flags_8((u8)res);
-    return (u8)res;
+	u32 res = d;
+	if ((d & 0xf) > 9 || ACCESS_FLAG(F_AF)) {
+		res += 6;
+		SET_FLAG(F_AF);
+	}
+	if (res > 0x9F || ACCESS_FLAG(F_CF)) {
+		res += 0x60;
+		SET_FLAG(F_CF);
+	}
+	set_szp_flags_8((u8)res);
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -507,16 +504,16 @@
 ****************************************************************************/
 u8 das_byte(u8 d)
 {
-    if ((d & 0xf) > 9 || ACCESS_FLAG(F_AF)) {
-        d -= 6;
-        SET_FLAG(F_AF);
-    }
-    if (d > 0x9F || ACCESS_FLAG(F_CF)) {
-        d -= 0x60;
-        SET_FLAG(F_CF);
-    }
-    set_szp_flags_8(d);
-    return d;
+	if ((d & 0xf) > 9 || ACCESS_FLAG(F_AF)) {
+		d -= 6;
+		SET_FLAG(F_AF);
+	}
+	if (d > 0x9F || ACCESS_FLAG(F_CF)) {
+		d -= 0x60;
+		SET_FLAG(F_CF);
+	}
+	set_szp_flags_8(d);
+	return d;
 }
 
 /****************************************************************************
@@ -525,13 +522,13 @@
 ****************************************************************************/
 u8 dec_byte(u8 d)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d - 1;
-    set_szp_flags_8((u8)res);
-    calc_borrow_chain(8, d, 1, res, 0);
+	res = d - 1;
+	set_szp_flags_8((u8)res);
+	calc_borrow_chain(8, d, 1, res, 0);
 
-    return (u8)res;
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -540,13 +537,13 @@
 ****************************************************************************/
 u16 dec_word(u16 d)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d - 1;
-    set_szp_flags_16((u16)res);
-    calc_borrow_chain(16, d, 1, res, 0);
+	res = d - 1;
+	set_szp_flags_16((u16)res);
+	calc_borrow_chain(16, d, 1, res, 0);
 
-    return (u16)res;
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -555,14 +552,14 @@
 ****************************************************************************/
 u32 dec_long(u32 d)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d - 1;
+	res = d - 1;
 
-    set_szp_flags_32(res);
-    calc_borrow_chain(32, d, 1, res, 0);
+	set_szp_flags_32(res);
+	calc_borrow_chain(32, d, 1, res, 0);
 
-    return res;
+	return res;
 }
 
 /****************************************************************************
@@ -571,13 +568,13 @@
 ****************************************************************************/
 u8 inc_byte(u8 d)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d + 1;
-    set_szp_flags_8((u8)res);
-    calc_carry_chain(8, d, 1, res, 0);
+	res = d + 1;
+	set_szp_flags_8((u8)res);
+	calc_carry_chain(8, d, 1, res, 0);
 
-    return (u8)res;
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -586,13 +583,13 @@
 ****************************************************************************/
 u16 inc_word(u16 d)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d + 1;
-    set_szp_flags_16((u16)res);
-    calc_carry_chain(16, d, 1, res, 0);
+	res = d + 1;
+	set_szp_flags_16((u16)res);
+	calc_carry_chain(16, d, 1, res, 0);
 
-    return (u16)res;
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -601,13 +598,13 @@
 ****************************************************************************/
 u32 inc_long(u32 d)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d + 1;
-    set_szp_flags_32(res);
-    calc_carry_chain(32, d, 1, res, 0);
+	res = d + 1;
+	set_szp_flags_32(res);
+	calc_carry_chain(32, d, 1, res, 0);
 
-    return res;
+	return res;
 }
 
 /****************************************************************************
@@ -616,12 +613,12 @@
 ****************************************************************************/
 u8 or_byte(u8 d, u8 s)
 {
-    u8 res;    /* all operands in native machine order */
+	u8 res;	/* all operands in native machine order */
 
-    res = d | s;
-    no_carry_byte_side_eff(res);
+	res = d | s;
+	no_carry_byte_side_eff(res);
 
-    return res;
+	return res;
 }
 
 /****************************************************************************
@@ -630,11 +627,11 @@
 ****************************************************************************/
 u16 or_word(u16 d, u16 s)
 {
-    u16 res;   /* all operands in native machine order */
+	u16 res; /* all operands in native machine order */
 
-    res = d | s;
-    no_carry_word_side_eff(res);
-    return res;
+	res = d | s;
+	no_carry_word_side_eff(res);
+	return res;
 }
 
 /****************************************************************************
@@ -643,11 +640,11 @@
 ****************************************************************************/
 u32 or_long(u32 d, u32 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d | s;
-    no_carry_long_side_eff(res);
-    return res;
+	res = d | s;
+	no_carry_long_side_eff(res);
+	return res;
 }
 
 /****************************************************************************
@@ -656,14 +653,14 @@
 ****************************************************************************/
 u8 neg_byte(u8 s)
 {
-    u8 res;
+	u8 res;
 
-    CONDITIONAL_SET_FLAG(s != 0, F_CF);
-    res = (u8)-s;
-    set_szp_flags_8(res);
-    calc_borrow_chain(8, 0, s, res, 0);
+	CONDITIONAL_SET_FLAG(s != 0, F_CF);
+	res = (u8)-s;
+	set_szp_flags_8(res);
+	calc_borrow_chain(8, 0, s, res, 0);
 
-    return res;
+	return res;
 }
 
 /****************************************************************************
@@ -672,14 +669,14 @@
 ****************************************************************************/
 u16 neg_word(u16 s)
 {
-    u16 res;
+	u16 res;
 
-    CONDITIONAL_SET_FLAG(s != 0, F_CF);
-    res = (u16)-s;
-    set_szp_flags_16((u16)res);
-    calc_borrow_chain(16, 0, s, res, 0);
+	CONDITIONAL_SET_FLAG(s != 0, F_CF);
+	res = (u16)-s;
+	set_szp_flags_16((u16)res);
+	calc_borrow_chain(16, 0, s, res, 0);
 
-    return res;
+	return res;
 }
 
 /****************************************************************************
@@ -688,14 +685,14 @@
 ****************************************************************************/
 u32 neg_long(u32 s)
 {
-    u32 res;
+	u32 res;
 
-    CONDITIONAL_SET_FLAG(s != 0, F_CF);
-    res = (u32)-s;
-    set_szp_flags_32(res);
-    calc_borrow_chain(32, 0, s, res, 0);
+	CONDITIONAL_SET_FLAG(s != 0, F_CF);
+	res = (u32)-s;
+	set_szp_flags_32(res);
+	calc_borrow_chain(32, 0, s, res, 0);
 
-    return res;
+	return res;
 }
 
 /****************************************************************************
@@ -704,7 +701,7 @@
 ****************************************************************************/
 u8 not_byte(u8 s)
 {
-    return ~s;
+	return ~s;
 }
 
 /****************************************************************************
@@ -713,7 +710,7 @@
 ****************************************************************************/
 u16 not_word(u16 s)
 {
-    return ~s;
+	return ~s;
 }
 
 /****************************************************************************
@@ -722,7 +719,7 @@
 ****************************************************************************/
 u32 not_long(u32 s)
 {
-    return ~s;
+	return ~s;
 }
 
 /****************************************************************************
@@ -731,71 +728,70 @@
 ****************************************************************************/
 u8 rcl_byte(u8 d, u8 s)
 {
-    unsigned int res, cnt, mask, cf;
+	unsigned int res, cnt, mask, cf;
 
-    /* s is the rotate distance.  It varies from 0 - 8. */
-    /* have
+	/* s is the rotate distance.  It varies from 0 - 8. */
+	/* have
 
-       CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0
+	   CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0
 
-       want to rotate through the carry by "s" bits.  We could
-       loop, but that's inefficient.  So the width is 9,
-       and we split into three parts:
+	   want to rotate through the carry by "s" bits.  We could
+	   loop, but that's inefficient.  So the width is 9,
+	   and we split into three parts:
 
-       The new carry flag   (was B_n)
-       the stuff in B_n-1 .. B_0
-       the stuff in B_7 .. B_n+1
+	   The new carry flag   (was B_n)
+	   the stuff in B_n-1 .. B_0
+	   the stuff in B_7 .. B_n+1
 
-       The new rotate is done mod 9, and given this,
-       for a rotation of n bits (mod 9) the new carry flag is
-       then located n bits from the MSB.  The low part is
-       then shifted up cnt bits, and the high part is or'd
-       in.  Using CAPS for new values, and lowercase for the
-       original values, this can be expressed as:
+	   The new rotate is done mod 9, and given this,
+	   for a rotation of n bits (mod 9) the new carry flag is
+	   then located n bits from the MSB.  The low part is
+	   then shifted up cnt bits, and the high part is or'd
+	   in.  Using CAPS for new values, and lowercase for the
+	   original values, this can be expressed as:
 
-       IF n > 0
-       1) CF <-  b_(8-n)
-       2) B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0
-       3) B_(n-1) <- cf
-       4) B_(n-2) .. B_0 <-  b_7 .. b_(8-(n-1))
-     */
-    res = d;
-    if ((cnt = s % 9) != 0) {
-        /* extract the new CARRY FLAG. */
-        /* CF <-  b_(8-n)             */
-        cf = (d >> (8 - cnt)) & 0x1;
+	   IF n > 0
+	   1) CF <-  b_(8-n)
+	   2) B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0
+	   3) B_(n-1) <- cf
+	   4) B_(n-2) .. B_0 <-  b_7 .. b_(8-(n-1))
+	 */
+	res = d;
+	if ((cnt = s % 9) != 0) {
+		/* extract the new CARRY FLAG. */
+		/* CF <-  b_(8-n)			 */
+		cf = (d >> (8 - cnt)) & 0x1;
 
-        /* get the low stuff which rotated
-           into the range B_7 .. B_cnt */
-        /* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0  */
-        /* note that the right hand side done by the mask */
-        res = (d << cnt) & 0xff;
+		/* get the low stuff which rotated
+		   into the range B_7 .. B_cnt */
+		/* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_0  */
+		/* note that the right hand side done by the mask */
+		res = (d << cnt) & 0xff;
 
-        /* now the high stuff which rotated around
-           into the positions B_cnt-2 .. B_0 */
-        /* B_(n-2) .. B_0 <-  b_7 .. b_(8-(n-1)) */
-        /* shift it downward, 7-(n-2) = 9-n positions.
-           and mask off the result before or'ing in.
-         */
-        mask = (1 << (cnt - 1)) - 1;
-        res |= (d >> (9 - cnt)) & mask;
+		/* now the high stuff which rotated around
+		   into the positions B_cnt-2 .. B_0 */
+		/* B_(n-2) .. B_0 <-  b_7 .. b_(8-(n-1)) */
+		/* shift it downward, 7-(n-2) = 9-n positions.
+		   and mask off the result before or'ing in.
+		 */
+		mask = (1 << (cnt - 1)) - 1;
+		res |= (d >> (9 - cnt)) & mask;
 
-        /* if the carry flag was set, or it in.  */
-        if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
-            /*  B_(n-1) <- cf */
-            res |= 1 << (cnt - 1);
-        }
-        /* set the new carry flag, based on the variable "cf" */
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        /* OVERFLOW is set *IFF* cnt==1, then it is the
-           xor of CF and the most significant bit.  Blecck. */
-        /* parenthesized this expression since it appears to
-           be causing OF to be missed */
-        CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 6) & 0x2)),
-                             F_OF);
+		/* if the carry flag was set, or it in.  */
+		if (ACCESS_FLAG(F_CF))	 /* carry flag is set */
+			/*  B_(n-1) <- cf */
+			res |= 1 << (cnt - 1);
+		/* set the new carry flag, based on the variable "cf" */
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		/* OVERFLOW is set *IFF* cnt==1, then it is the
+		   xor of CF and the most significant bit.  Blecck. */
+		/* parenthesized this expression since it appears to
+		   be causing OF to be missed */
+		CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 6) & 0x2)),
+				     F_OF);
 
-    }
-    return (u8)res;
+	}
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -804,22 +800,21 @@
 ****************************************************************************/
 u16 rcl_word(u16 d, u8 s)
 {
-    unsigned int res, cnt, mask, cf;
+	unsigned int res, cnt, mask, cf;
 
-    res = d;
-    if ((cnt = s % 17) != 0) {
-        cf = (d >> (16 - cnt)) & 0x1;
-        res = (d << cnt) & 0xffff;
-        mask = (1 << (cnt - 1)) - 1;
-        res |= (d >> (17 - cnt)) & mask;
-        if (ACCESS_FLAG(F_CF)) {
-            res |= 1 << (cnt - 1);
-        }
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 14) & 0x2)),
-                             F_OF);
-    }
-    return (u16)res;
+	res = d;
+	if ((cnt = s % 17) != 0) {
+		cf = (d >> (16 - cnt)) & 0x1;
+		res = (d << cnt) & 0xffff;
+		mask = (1 << (cnt - 1)) - 1;
+		res |= (d >> (17 - cnt)) & mask;
+		if (ACCESS_FLAG(F_CF))
+			res |= 1 << (cnt - 1);
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 14) & 0x2)),
+							 F_OF);
+	}
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -828,22 +823,21 @@
 ****************************************************************************/
 u32 rcl_long(u32 d, u8 s)
 {
-    u32 res, cnt, mask, cf;
+	u32 res, cnt, mask, cf;
 
-    res = d;
-    if ((cnt = s % 33) != 0) {
-        cf = (d >> (32 - cnt)) & 0x1;
-        res = (d << cnt) & 0xffffffff;
-        mask = (1 << (cnt - 1)) - 1;
-        res |= (d >> (33 - cnt)) & mask;
-        if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
-            res |= 1 << (cnt - 1);
-        }
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 30) & 0x2)),
-                             F_OF);
-    }
-    return res;
+	res = d;
+	if ((cnt = s % 33) != 0) {
+		cf = (d >> (32 - cnt)) & 0x1;
+		res = (d << cnt) & 0xffffffff;
+		mask = (1 << (cnt - 1)) - 1;
+		res |= (d >> (33 - cnt)) & mask;
+		if (ACCESS_FLAG(F_CF)) /* carry flag is set */
+			res |= 1 << (cnt - 1);
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		CONDITIONAL_SET_FLAG(cnt == 1 && XOR2(cf + ((res >> 30) & 0x2)),
+							 F_OF);
+	}
+	return res;
 }
 
 /****************************************************************************
@@ -852,82 +846,80 @@
 ****************************************************************************/
 u8 rcr_byte(u8 d, u8 s)
 {
-    u32 res, cnt;
-    u32 mask, cf, ocf = 0;
+	u32 res, cnt;
+	u32 mask, cf, ocf = 0;
 
-    /* rotate right through carry */
-    /*
-       s is the rotate distance.  It varies from 0 - 8.
-       d is the byte object rotated.
+	/* rotate right through carry */
+	/*
+	   s is the rotate distance.  It varies from 0 - 8.
+	   d is the byte object rotated.
 
-       have
+	   have
 
-       CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0
+	   CF  B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0
 
-       The new rotate is done mod 9, and given this,
-       for a rotation of n bits (mod 9) the new carry flag is
-       then located n bits from the LSB.  The low part is
-       then shifted up cnt bits, and the high part is or'd
-       in.  Using CAPS for new values, and lowercase for the
-       original values, this can be expressed as:
+	   The new rotate is done mod 9, and given this,
+	   for a rotation of n bits (mod 9) the new carry flag is
+	   then located n bits from the LSB.  The low part is
+	   then shifted up cnt bits, and the high part is or'd
+	   in.  Using CAPS for new values, and lowercase for the
+	   original values, this can be expressed as:
 
-       IF n > 0
-       1) CF <-  b_(n-1)
-       2) B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n)
-       3) B_(8-n) <- cf
-       4) B_(7) .. B_(8-(n-1)) <-  b_(n-2) .. b_(0)
-     */
-    res = d;
-    if ((cnt = s % 9) != 0) {
-        /* extract the new CARRY FLAG. */
-        /* CF <-  b_(n-1)              */
-        if (cnt == 1) {
-            cf = d & 0x1;
-            /* note hackery here.  Access_flag(..) evaluates to either
-               0 if flag not set
-               non-zero if flag is set.
-               doing access_flag(..) != 0 casts that into either
-               0..1 in any representation of the flags register
-               (i.e. packed bit array or unpacked.)
-             */
-            ocf = ACCESS_FLAG(F_CF) != 0;
-        } else
-            cf = (d >> (cnt - 1)) & 0x1;
+	   IF n > 0
+	   1) CF <-  b_(n-1)
+	   2) B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n)
+	   3) B_(8-n) <- cf
+	   4) B_(7) .. B_(8-(n-1)) <-  b_(n-2) .. b_(0)
+	 */
+	res = d;
+	if ((cnt = s % 9) != 0) {
+		/* extract the new CARRY FLAG. */
+		/* CF <-  b_(n-1)			  */
+		if (cnt == 1) {
+			cf = d & 0x1;
+			/* note hackery here.  Access_flag(..) evaluates to either
+			   0 if flag not set
+			   non-zero if flag is set.
+			   doing access_flag(..) != 0 casts that into either
+			   0..1 in any representation of the flags register
+			   (i.e. packed bit array or unpacked.)
+			 */
+			ocf = ACCESS_FLAG(F_CF) != 0;
+		} else
+			cf = (d >> (cnt - 1)) & 0x1;
 
-        /* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_n  */
-        /* note that the right hand side done by the mask
-           This is effectively done by shifting the
-           object to the right.  The result must be masked,
-           in case the object came in and was treated
-           as a negative number.  Needed??? */
+		/* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_n  */
+		/* note that the right hand side done by the mask
+		   This is effectively done by shifting the
+		   object to the right.  The result must be masked,
+		   in case the object came in and was treated
+		   as a negative number.  Needed??? */
 
-        mask = (1 << (8 - cnt)) - 1;
-        res = (d >> cnt) & mask;
+		mask = (1 << (8 - cnt)) - 1;
+		res = (d >> cnt) & mask;
 
-        /* now the high stuff which rotated around
-           into the positions B_cnt-2 .. B_0 */
-        /* B_(7) .. B_(8-(n-1)) <-  b_(n-2) .. b_(0) */
-        /* shift it downward, 7-(n-2) = 9-n positions.
-           and mask off the result before or'ing in.
-         */
-        res |= (d << (9 - cnt));
+		/* now the high stuff which rotated around
+		   into the positions B_cnt-2 .. B_0 */
+		/* B_(7) .. B_(8-(n-1)) <-  b_(n-2) .. b_(0) */
+		/* shift it downward, 7-(n-2) = 9-n positions.
+		   and mask off the result before or'ing in.
+		 */
+		res |= (d << (9 - cnt));
 
-        /* if the carry flag was set, or it in.  */
-        if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
-            /*  B_(8-n) <- cf */
-            res |= 1 << (8 - cnt);
-        }
-        /* set the new carry flag, based on the variable "cf" */
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        /* OVERFLOW is set *IFF* cnt==1, then it is the
-           xor of CF and the most significant bit.  Blecck. */
-        /* parenthesized... */
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 6) & 0x2)),
-                                 F_OF);
-        }
-    }
-    return (u8)res;
+		/* if the carry flag was set, or it in.  */
+		if (ACCESS_FLAG(F_CF)) /* carry flag is set */
+			/*  B_(8-n) <- cf */
+			res |= 1 << (8 - cnt);
+		/* set the new carry flag, based on the variable "cf" */
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		/* OVERFLOW is set *IFF* cnt==1, then it is the
+		   xor of CF and the most significant bit.  Blecck. */
+		/* parenthesized... */
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 6) & 0x2)),
+								 F_OF);
+	}
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -936,30 +928,28 @@
 ****************************************************************************/
 u16 rcr_word(u16 d, u8 s)
 {
-    u32 res, cnt;
-    u32 mask, cf, ocf = 0;
+	u32 res, cnt;
+	u32 mask, cf, ocf = 0;
 
-    /* rotate right through carry */
-    res = d;
-    if ((cnt = s % 17) != 0) {
-        if (cnt == 1) {
-            cf = d & 0x1;
-            ocf = ACCESS_FLAG(F_CF) != 0;
-        } else
-            cf = (d >> (cnt - 1)) & 0x1;
-        mask = (1 << (16 - cnt)) - 1;
-        res = (d >> cnt) & mask;
-        res |= (d << (17 - cnt));
-        if (ACCESS_FLAG(F_CF)) {
-            res |= 1 << (16 - cnt);
-        }
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 14) & 0x2)),
-                                 F_OF);
-        }
-    }
-    return (u16)res;
+	/* rotate right through carry */
+	res = d;
+	if ((cnt = s % 17) != 0) {
+		if (cnt == 1) {
+			cf = d & 0x1;
+			ocf = ACCESS_FLAG(F_CF) != 0;
+		} else
+			cf = (d >> (cnt - 1)) & 0x1;
+		mask = (1 << (16 - cnt)) - 1;
+		res = (d >> cnt) & mask;
+		res |= (d << (17 - cnt));
+		if (ACCESS_FLAG(F_CF))
+			res |= 1 << (16 - cnt);
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 14) & 0x2)),
+								 F_OF);
+	}
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -968,31 +958,29 @@
 ****************************************************************************/
 u32 rcr_long(u32 d, u8 s)
 {
-    u32 res, cnt;
-    u32 mask, cf, ocf = 0;
+	u32 res, cnt;
+	u32 mask, cf, ocf = 0;
 
-    /* rotate right through carry */
-    res = d;
-    if ((cnt = s % 33) != 0) {
-        if (cnt == 1) {
-            cf = d & 0x1;
-            ocf = ACCESS_FLAG(F_CF) != 0;
-        } else
-            cf = (d >> (cnt - 1)) & 0x1;
-        mask = (1 << (32 - cnt)) - 1;
-        res = (d >> cnt) & mask;
-        if (cnt != 1)
-            res |= (d << (33 - cnt));
-        if (ACCESS_FLAG(F_CF)) {     /* carry flag is set */
-            res |= 1 << (32 - cnt);
-        }
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 30) & 0x2)),
-                                 F_OF);
-        }
-    }
-    return res;
+	/* rotate right through carry */
+	res = d;
+	if ((cnt = s % 33) != 0) {
+		if (cnt == 1) {
+			cf = d & 0x1;
+			ocf = ACCESS_FLAG(F_CF) != 0;
+		} else
+			cf = (d >> (cnt - 1)) & 0x1;
+		mask = (1 << (32 - cnt)) - 1;
+		res = (d >> cnt) & mask;
+		if (cnt != 1)
+			res |= (d << (33 - cnt));
+		if (ACCESS_FLAG(F_CF)) /* carry flag is set */
+			res |= 1 << (32 - cnt);
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG(XOR2(ocf + ((d >> 30) & 0x2)),
+								 F_OF);
+	}
+	return res;
 }
 
 /****************************************************************************
@@ -1001,47 +989,45 @@
 ****************************************************************************/
 u8 rol_byte(u8 d, u8 s)
 {
-    unsigned int res, cnt, mask;
+	unsigned int res, cnt, mask;
 
-    /* rotate left */
-    /*
-       s is the rotate distance.  It varies from 0 - 8.
-       d is the byte object rotated.
+	/* rotate left */
+	/*
+	   s is the rotate distance.  It varies from 0 - 8.
+	   d is the byte object rotated.
 
-       have
+	   have
 
-       CF  B_7 ... B_0
+	   CF  B_7 ... B_0
 
-       The new rotate is done mod 8.
-       Much simpler than the "rcl" or "rcr" operations.
+	   The new rotate is done mod 8.
+	   Much simpler than the "rcl" or "rcr" operations.
 
-       IF n > 0
-       1) B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_(0)
-       2) B_(n-1) .. B_(0) <-  b_(7) .. b_(8-n)
-     */
-    res = d;
-    if ((cnt = s % 8) != 0) {
-        /* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_(0) */
-        res = (d << cnt);
+	   IF n > 0
+	   1) B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_(0)
+	   2) B_(n-1) .. B_(0) <-  b_(7) .. b_(8-n)
+	 */
+	res = d;
+	if ((cnt = s % 8) != 0) {
+		/* B_(7) .. B_(n)  <-  b_(8-(n+1)) .. b_(0) */
+		res = (d << cnt);
 
-        /* B_(n-1) .. B_(0) <-  b_(7) .. b_(8-n) */
-        mask = (1 << cnt) - 1;
-        res |= (d >> (8 - cnt)) & mask;
+		/* B_(n-1) .. B_(0) <-  b_(7) .. b_(8-n) */
+		mask = (1 << cnt) - 1;
+		res |= (d >> (8 - cnt)) & mask;
 
-        /* set the new carry flag, Note that it is the low order
-           bit of the result!!!                               */
-        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-        /* OVERFLOW is set *IFF* s==1, then it is the
-           xor of CF and the most significant bit.  Blecck. */
-        CONDITIONAL_SET_FLAG(s == 1 &&
-                             XOR2((res & 0x1) + ((res >> 6) & 0x2)),
-                             F_OF);
-    } if (s != 0) {
-        /* set the new carry flag, Note that it is the low order
-           bit of the result!!!                               */
-        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-    }
-    return (u8)res;
+		/* set the new carry flag, Note that it is the low order
+		   bit of the result!!! */
+		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+		/* OVERFLOW is set *IFF* s==1, then it is the
+		   xor of CF and the most significant bit.  Blecck. */
+		CONDITIONAL_SET_FLAG(s == 1 && XOR2((res & 0x1) + ((res >> 6) & 0x2)), F_OF);
+	}
+	if (s != 0)
+		/* set the new carry flag, Note that it is the low order
+		   bit of the result!!! */
+		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -1050,23 +1036,21 @@
 ****************************************************************************/
 u16 rol_word(u16 d, u8 s)
 {
-    unsigned int res, cnt, mask;
+	unsigned int res, cnt, mask;
 
-    res = d;
-    if ((cnt = s % 16) != 0) {
-        res = (d << cnt);
-        mask = (1 << cnt) - 1;
-        res |= (d >> (16 - cnt)) & mask;
-        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-        CONDITIONAL_SET_FLAG(s == 1 &&
-                             XOR2((res & 0x1) + ((res >> 14) & 0x2)),
-                             F_OF);
-    } if (s != 0) {
-        /* set the new carry flag, Note that it is the low order
-           bit of the result!!!                               */
-        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-    }
-    return (u16)res;
+	res = d;
+	if ((cnt = s % 16) != 0) {
+		res = (d << cnt);
+		mask = (1 << cnt) - 1;
+		res |= (d >> (16 - cnt)) & mask;
+		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+		CONDITIONAL_SET_FLAG(s == 1 && XOR2((res & 0x1) + ((res >> 14) & 0x2)), F_OF);
+	}
+	if (s != 0)
+		/* set the new carry flag, Note that it is the low order
+		   bit of the result!!! */
+		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1075,23 +1059,21 @@
 ****************************************************************************/
 u32 rol_long(u32 d, u8 s)
 {
-    u32 res, cnt, mask;
+	u32 res, cnt, mask;
 
-    res = d;
-    if ((cnt = s % 32) != 0) {
-        res = (d << cnt);
-        mask = (1 << cnt) - 1;
-        res |= (d >> (32 - cnt)) & mask;
-        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-        CONDITIONAL_SET_FLAG(s == 1 &&
-                             XOR2((res & 0x1) + ((res >> 30) & 0x2)),
-                             F_OF);
-    } if (s != 0) {
-        /* set the new carry flag, Note that it is the low order
-           bit of the result!!!                               */
-        CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
-    }
-    return res;
+	res = d;
+	if ((cnt = s % 32) != 0) {
+		res = (d << cnt);
+		mask = (1 << cnt) - 1;
+		res |= (d >> (32 - cnt)) & mask;
+		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+		CONDITIONAL_SET_FLAG(s == 1 && XOR2((res & 0x1) + ((res >> 30) & 0x2)),  F_OF);
+	}
+	if (s != 0)
+		/* set the new carry flag, Note that it is the low order
+		   bit of the result!!! */
+		CONDITIONAL_SET_FLAG(res & 0x1, F_CF);
+	return res;
 }
 
 /****************************************************************************
@@ -1100,44 +1082,43 @@
 ****************************************************************************/
 u8 ror_byte(u8 d, u8 s)
 {
-    unsigned int res, cnt, mask;
+	unsigned int res, cnt, mask;
 
-    /* rotate right */
-    /*
-       s is the rotate distance.  It varies from 0 - 8.
-       d is the byte object rotated.
+	/* rotate right */
+	/*
+	   s is the rotate distance.  It varies from 0 - 8.
+	   d is the byte object rotated.
 
-       have
+	   have
 
-       B_7 ... B_0
+	   B_7 ... B_0
 
-       The rotate is done mod 8.
+	   The rotate is done mod 8.
 
-       IF n > 0
-       1) B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n)
-       2) B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0)
-     */
-    res = d;
-    if ((cnt = s % 8) != 0) {           /* not a typo, do nada if cnt==0 */
-        /* B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0) */
-        res = (d << (8 - cnt));
+	   IF n > 0
+	   1) B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n)
+	   2) B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0)
+	 */
+	res = d;
+	if ((cnt = s % 8) != 0) { /* not a typo, do nada if cnt==0 */
+		/* B_(7) .. B_(8-n) <-  b_(n-1) .. b_(0) */
+		res = (d << (8 - cnt));
 
-        /* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n) */
-        mask = (1 << (8 - cnt)) - 1;
-        res |= (d >> (cnt)) & mask;
+		/* B_(8-(n+1)) .. B_(0)  <-  b_(7) .. b_(n) */
+		mask = (1 << (8 - cnt)) - 1;
+		res |= (d >> (cnt)) & mask;
 
-        /* set the new carry flag, Note that it is the low order
-           bit of the result!!!                               */
-        CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
-        /* OVERFLOW is set *IFF* s==1, then it is the
-           xor of the two most significant bits.  Blecck. */
-        CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 6), F_OF);
-    } else if (s != 0) {
-        /* set the new carry flag, Note that it is the low order
-           bit of the result!!!                               */
-        CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
-    }
-    return (u8)res;
+		/* set the new carry flag, Note that it is the low order
+		   bit of the result!!! */
+		CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
+		/* OVERFLOW is set *IFF* s==1, then it is the
+		   xor of the two most significant bits.  Blecck. */
+		CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 6), F_OF);
+	} else if (s != 0)
+		/* set the new carry flag, Note that it is the low order
+		   bit of the result!!! */
+		CONDITIONAL_SET_FLAG(res & 0x80, F_CF);
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -1146,21 +1127,21 @@
 ****************************************************************************/
 u16 ror_word(u16 d, u8 s)
 {
-    unsigned int res, cnt, mask;
+	unsigned int res, cnt, mask;
 
-    res = d;
-    if ((cnt = s % 16) != 0) {
-        res = (d << (16 - cnt));
-        mask = (1 << (16 - cnt)) - 1;
-        res |= (d >> (cnt)) & mask;
-        CONDITIONAL_SET_FLAG(res & 0x8000, F_CF);
-        CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 14), F_OF);
-    } else if (s != 0) {
-        /* set the new carry flag, Note that it is the low order
-           bit of the result!!!                               */
-        CONDITIONAL_SET_FLAG(res & 0x8000, F_CF);
-    }
-    return (u16)res;
+	res = d;
+	if ((cnt = s % 16) != 0) {
+		res = (d << (16 - cnt));
+		mask = (1 << (16 - cnt)) - 1;
+		res |= (d >> (cnt)) & mask;
+		CONDITIONAL_SET_FLAG(res & 0x8000, F_CF);
+		CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 14), F_OF);
+	} else if (s != 0) {
+		/* set the new carry flag, Note that it is the low order
+		   bit of the result!!! */
+		CONDITIONAL_SET_FLAG(res & 0x8000, F_CF);
+	}
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1169,21 +1150,21 @@
 ****************************************************************************/
 u32 ror_long(u32 d, u8 s)
 {
-    u32 res, cnt, mask;
+	u32 res, cnt, mask;
 
-    res = d;
-    if ((cnt = s % 32) != 0) {
-        res = (d << (32 - cnt));
-        mask = (1 << (32 - cnt)) - 1;
-        res |= (d >> (cnt)) & mask;
-        CONDITIONAL_SET_FLAG(res & 0x80000000, F_CF);
-        CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 30), F_OF);
-    } else if (s != 0) {
-        /* set the new carry flag, Note that it is the low order
-           bit of the result!!!                               */
-        CONDITIONAL_SET_FLAG(res & 0x80000000, F_CF);
-    }
-    return res;
+	res = d;
+	if ((cnt = s % 32) != 0) {
+		res = (d << (32 - cnt));
+		mask = (1 << (32 - cnt)) - 1;
+		res |= (d >> (cnt)) & mask;
+		CONDITIONAL_SET_FLAG(res & 0x80000000, F_CF);
+		CONDITIONAL_SET_FLAG(s == 1 && XOR2(res >> 30), F_OF);
+	} else if (s != 0) {
+		/* set the new carry flag, Note that it is the low order
+		   bit of the result!!! */
+		CONDITIONAL_SET_FLAG(res & 0x80000000, F_CF);
+	}
+	return res;
 }
 
 /****************************************************************************
@@ -1192,40 +1173,38 @@
 ****************************************************************************/
 u8 shl_byte(u8 d, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 8) {
-        cnt = s % 8;
+	if (s < 8) {
+		cnt = s % 8;
 
-        /* last bit shifted out goes into carry flag */
-        if (cnt > 0) {
-            res = d << cnt;
-            cf = d & (1 << (8 - cnt));
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_8((u8)res);
-        } else {
-            res = (u8) d;
-        }
+		/* last bit shifted out goes into carry flag */
+		if (cnt > 0) {
+			res = d << cnt;
+			cf = d & (1 << (8 - cnt));
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_8((u8)res);
+		} else {
+			res = (u8) d;
+		}
 
-        if (cnt == 1) {
-            /* Needs simplification. */
-            CONDITIONAL_SET_FLAG(
-                                    (((res & 0x80) == 0x80) ^
-                                     (ACCESS_FLAG(F_CF) != 0)),
-            /* was (M.x86.R_FLG&F_CF)==F_CF)), */
-                                    F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80, F_CF);
-        CLEAR_FLAG(F_OF);
-        CLEAR_FLAG(F_SF);
-        SET_FLAG(F_PF);
-        SET_FLAG(F_ZF);
-    }
-    return (u8)res;
+		if (cnt == 1)
+			/* Needs simplification. */
+			CONDITIONAL_SET_FLAG((((res & 0x80) == 0x80) ^
+					       (ACCESS_FLAG(F_CF) != 0)),
+			/* was (M.x86.R_FLG&F_CF)==F_CF)), */
+					       F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80, F_CF);
+		CLEAR_FLAG(F_OF);
+		CLEAR_FLAG(F_SF);
+		SET_FLAG(F_PF);
+		SET_FLAG(F_ZF);
+	}
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -1234,36 +1213,34 @@
 ****************************************************************************/
 u16 shl_word(u16 d, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 16) {
-        cnt = s % 16;
-        if (cnt > 0) {
-            res = d << cnt;
-            cf = d & (1 << (16 - cnt));
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_16((u16)res);
-        } else {
-            res = (u16) d;
-        }
+	if (s < 16) {
+		cnt = s % 16;
+		if (cnt > 0) {
+			res = d << cnt;
+			cf = d & (1 << (16 - cnt));
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_16((u16)res);
+		} else {
+			res = (u16) d;
+		}
 
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(
-                                    (((res & 0x8000) == 0x8000) ^
-                                     (ACCESS_FLAG(F_CF) != 0)),
-                                    F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CONDITIONAL_SET_FLAG((d << (s-1)) & 0x8000, F_CF);
-        CLEAR_FLAG(F_OF);
-        CLEAR_FLAG(F_SF);
-        SET_FLAG(F_PF);
-        SET_FLAG(F_ZF);
-    }
-    return (u16)res;
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG((((res & 0x8000) == 0x8000) ^
+						(ACCESS_FLAG(F_CF) != 0)),
+						F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x8000, F_CF);
+		CLEAR_FLAG(F_OF);
+		CLEAR_FLAG(F_SF);
+		SET_FLAG(F_PF);
+		SET_FLAG(F_ZF);
+	}
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1272,33 +1249,32 @@
 ****************************************************************************/
 u32 shl_long(u32 d, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 32) {
-        cnt = s % 32;
-        if (cnt > 0) {
-            res = d << cnt;
-            cf = d & (1 << (32 - cnt));
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_32((u32)res);
-        } else {
-            res = d;
-        }
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG((((res & 0x80000000) == 0x80000000) ^
-                                  (ACCESS_FLAG(F_CF) != 0)), F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80000000, F_CF);
-        CLEAR_FLAG(F_OF);
-        CLEAR_FLAG(F_SF);
-        SET_FLAG(F_PF);
-        SET_FLAG(F_ZF);
-    }
-    return res;
+	if (s < 32) {
+		cnt = s % 32;
+		if (cnt > 0) {
+			res = d << cnt;
+			cf = d & (1 << (32 - cnt));
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_32((u32)res);
+		} else {
+			res = d;
+		}
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG((((res & 0x80000000) == 0x80000000) ^
+						ACCESS_FLAG(F_CF) != 0)), F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80000000, F_CF);
+		CLEAR_FLAG(F_OF);
+		CLEAR_FLAG(F_SF);
+		SET_FLAG(F_PF);
+		SET_FLAG(F_ZF);
+	}
+	return res;
 }
 
 /****************************************************************************
@@ -1307,33 +1283,32 @@
 ****************************************************************************/
 u8 shr_byte(u8 d, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 8) {
-        cnt = s % 8;
-        if (cnt > 0) {
-            cf = d & (1 << (cnt - 1));
-            res = d >> cnt;
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_8((u8)res);
-        } else {
-            res = (u8) d;
-        }
+	if (s < 8) {
+		cnt = s % 8;
+		if (cnt > 0) {
+			cf = d & (1 << (cnt - 1));
+			res = d >> cnt;
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_8((u8)res);
+		} else {
+			res = (u8) d;
+		}
 
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(XOR2(res >> 6), F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CONDITIONAL_SET_FLAG((d >> (s-1)) & 0x1, F_CF);
-        CLEAR_FLAG(F_OF);
-        CLEAR_FLAG(F_SF);
-        SET_FLAG(F_PF);
-        SET_FLAG(F_ZF);
-    }
-    return (u8)res;
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG(XOR2(res >> 6), F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CONDITIONAL_SET_FLAG((d >> (s-1)) & 0x1, F_CF);
+		CLEAR_FLAG(F_OF);
+		CLEAR_FLAG(F_SF);
+		SET_FLAG(F_PF);
+		SET_FLAG(F_ZF);
+	}
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -1342,33 +1317,32 @@
 ****************************************************************************/
 u16 shr_word(u16 d, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 16) {
-        cnt = s % 16;
-        if (cnt > 0) {
-            cf = d & (1 << (cnt - 1));
-            res = d >> cnt;
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_16((u16)res);
-        } else {
-            res = d;
-        }
+	if (s < 16) {
+		cnt = s % 16;
+		if (cnt > 0) {
+			cf = d & (1 << (cnt - 1));
+			res = d >> cnt;
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_16((u16)res);
+		} else {
+			res = d;
+		}
 
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-        SET_FLAG(F_ZF);
-        CLEAR_FLAG(F_SF);
-        CLEAR_FLAG(F_PF);
-    }
-    return (u16)res;
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+		SET_FLAG(F_ZF);
+		CLEAR_FLAG(F_SF);
+		CLEAR_FLAG(F_PF);
+	}
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1377,32 +1351,31 @@
 ****************************************************************************/
 u32 shr_long(u32 d, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 32) {
-        cnt = s % 32;
-        if (cnt > 0) {
-            cf = d & (1 << (cnt - 1));
-            res = d >> cnt;
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_32((u32)res);
-        } else {
-            res = d;
-        }
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-        SET_FLAG(F_ZF);
-        CLEAR_FLAG(F_SF);
-        CLEAR_FLAG(F_PF);
-    }
-    return res;
+	if (s < 32) {
+		cnt = s % 32;
+		if (cnt > 0) {
+			cf = d & (1 << (cnt - 1));
+			res = d >> cnt;
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_32((u32)res);
+		} else {
+			res = d;
+		}
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+		SET_FLAG(F_ZF);
+		CLEAR_FLAG(F_SF);
+		CLEAR_FLAG(F_PF);
+	}
+	return res;
 }
 
 /****************************************************************************
@@ -1411,36 +1384,35 @@
 ****************************************************************************/
 u8 sar_byte(u8 d, u8 s)
 {
-    unsigned int cnt, res, cf, mask, sf;
+	unsigned int cnt, res, cf, mask, sf;
 
-    res = d;
-    sf = d & 0x80;
-    cnt = s % 8;
-    if (cnt > 0 && cnt < 8) {
-        mask = (1 << (8 - cnt)) - 1;
-        cf = d & (1 << (cnt - 1));
-        res = (d >> cnt) & mask;
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        if (sf) {
-            res |= ~mask;
-        }
-        set_szp_flags_8((u8)res);
-    } else if (cnt >= 8) {
-        if (sf) {
-            res = 0xff;
-            SET_FLAG(F_CF);
-            CLEAR_FLAG(F_ZF);
-            SET_FLAG(F_SF);
-            SET_FLAG(F_PF);
-        } else {
-            res = 0;
-            CLEAR_FLAG(F_CF);
-            SET_FLAG(F_ZF);
-            CLEAR_FLAG(F_SF);
-            CLEAR_FLAG(F_PF);
-        }
-    }
-    return (u8)res;
+	res = d;
+	sf = d & 0x80;
+	cnt = s % 8;
+	if (cnt > 0 && cnt < 8) {
+		mask = (1 << (8 - cnt)) - 1;
+		cf = d & (1 << (cnt - 1));
+		res = (d >> cnt) & mask;
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		if (sf)
+			res |= ~mask;
+		set_szp_flags_8((u8)res);
+	} else if (cnt >= 8) {
+		if (sf) {
+			res = 0xff;
+			SET_FLAG(F_CF);
+			CLEAR_FLAG(F_ZF);
+			SET_FLAG(F_SF);
+			SET_FLAG(F_PF);
+		} else {
+			res = 0;
+			CLEAR_FLAG(F_CF);
+			SET_FLAG(F_ZF);
+			CLEAR_FLAG(F_SF);
+			CLEAR_FLAG(F_PF);
+		}
+	}
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -1449,36 +1421,35 @@
 ****************************************************************************/
 u16 sar_word(u16 d, u8 s)
 {
-    unsigned int cnt, res, cf, mask, sf;
+	unsigned int cnt, res, cf, mask, sf;
 
-    sf = d & 0x8000;
-    cnt = s % 16;
-    res = d;
-    if (cnt > 0 && cnt < 16) {
-        mask = (1 << (16 - cnt)) - 1;
-        cf = d & (1 << (cnt - 1));
-        res = (d >> cnt) & mask;
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        if (sf) {
-            res |= ~mask;
-        }
-        set_szp_flags_16((u16)res);
-    } else if (cnt >= 16) {
-        if (sf) {
-            res = 0xffff;
-            SET_FLAG(F_CF);
-            CLEAR_FLAG(F_ZF);
-            SET_FLAG(F_SF);
-            SET_FLAG(F_PF);
-        } else {
-            res = 0;
-            CLEAR_FLAG(F_CF);
-            SET_FLAG(F_ZF);
-            CLEAR_FLAG(F_SF);
-            CLEAR_FLAG(F_PF);
-        }
-    }
-    return (u16)res;
+	sf = d & 0x8000;
+	cnt = s % 16;
+	res = d;
+	if (cnt > 0 && cnt < 16) {
+		mask = (1 << (16 - cnt)) - 1;
+		cf = d & (1 << (cnt - 1));
+		res = (d >> cnt) & mask;
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		if (sf)
+			res |= ~mask;
+		set_szp_flags_16((u16)res);
+	} else if (cnt >= 16) {
+		if (sf) {
+			res = 0xffff;
+			SET_FLAG(F_CF);
+			CLEAR_FLAG(F_ZF);
+			SET_FLAG(F_SF);
+			SET_FLAG(F_PF);
+		} else {
+			res = 0;
+			CLEAR_FLAG(F_CF);
+			SET_FLAG(F_ZF);
+			CLEAR_FLAG(F_SF);
+			CLEAR_FLAG(F_PF);
+		}
+	}
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1487,36 +1458,35 @@
 ****************************************************************************/
 u32 sar_long(u32 d, u8 s)
 {
-    u32 cnt, res, cf, mask, sf;
+	u32 cnt, res, cf, mask, sf;
 
-    sf = d & 0x80000000;
-    cnt = s % 32;
-    res = d;
-    if (cnt > 0 && cnt < 32) {
-        mask = (1 << (32 - cnt)) - 1;
-        cf = d & (1 << (cnt - 1));
-        res = (d >> cnt) & mask;
-        CONDITIONAL_SET_FLAG(cf, F_CF);
-        if (sf) {
-            res |= ~mask;
-        }
-        set_szp_flags_32(res);
-    } else if (cnt >= 32) {
-        if (sf) {
-            res = 0xffffffff;
-            SET_FLAG(F_CF);
-            CLEAR_FLAG(F_ZF);
-            SET_FLAG(F_SF);
-            SET_FLAG(F_PF);
-        } else {
-            res = 0;
-            CLEAR_FLAG(F_CF);
-            SET_FLAG(F_ZF);
-            CLEAR_FLAG(F_SF);
-            CLEAR_FLAG(F_PF);
-        }
-    }
-    return res;
+	sf = d & 0x80000000;
+	cnt = s % 32;
+	res = d;
+	if (cnt > 0 && cnt < 32) {
+		mask = (1 << (32 - cnt)) - 1;
+		cf = d & (1 << (cnt - 1));
+		res = (d >> cnt) & mask;
+		CONDITIONAL_SET_FLAG(cf, F_CF);
+		if (sf)
+			res |= ~mask;
+		set_szp_flags_32(res);
+	} else if (cnt >= 32) {
+		if (sf) {
+			res = 0xffffffff;
+			SET_FLAG(F_CF);
+			CLEAR_FLAG(F_ZF);
+			SET_FLAG(F_SF);
+			SET_FLAG(F_PF);
+		} else {
+			res = 0;
+			CLEAR_FLAG(F_CF);
+			SET_FLAG(F_ZF);
+			CLEAR_FLAG(F_SF);
+			CLEAR_FLAG(F_PF);
+		}
+	}
+	return res;
 }
 
 /****************************************************************************
@@ -1525,33 +1495,32 @@
 ****************************************************************************/
 u16 shld_word (u16 d, u16 fill, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 16) {
-        cnt = s % 16;
-        if (cnt > 0) {
-            res = (d << cnt) | (fill >> (16-cnt));
-            cf = d & (1 << (16 - cnt));
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_16((u16)res);
-        } else {
-            res = d;
-        }
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG((((res & 0x8000) == 0x8000) ^
-                                  (ACCESS_FLAG(F_CF) != 0)), F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CONDITIONAL_SET_FLAG((d << (s-1)) & 0x8000, F_CF);
-        CLEAR_FLAG(F_OF);
-        CLEAR_FLAG(F_SF);
-        SET_FLAG(F_PF);
-        SET_FLAG(F_ZF);
-    }
-    return (u16)res;
+	if (s < 16) {
+		cnt = s % 16;
+		if (cnt > 0) {
+			res = (d << cnt) | (fill >> (16-cnt));
+			cf = d & (1 << (16 - cnt));
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_16((u16)res);
+		} else {
+			res = d;
+		}
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG((((res & 0x8000) == 0x8000) ^
+						(ACCESS_FLAG(F_CF) != 0)), F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x8000, F_CF);
+		CLEAR_FLAG(F_OF);
+		CLEAR_FLAG(F_SF);
+		SET_FLAG(F_PF);
+		SET_FLAG(F_ZF);
+	}
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1560,68 +1529,66 @@
 ****************************************************************************/
 u32 shld_long (u32 d, u32 fill, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 32) {
-        cnt = s % 32;
-        if (cnt > 0) {
-            res = (d << cnt) | (fill >> (32-cnt));
-            cf = d & (1 << (32 - cnt));
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_32((u32)res);
-        } else {
-            res = d;
-        }
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG((((res & 0x80000000) == 0x80000000) ^
-                                  (ACCESS_FLAG(F_CF) != 0)), F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80000000, F_CF);
-        CLEAR_FLAG(F_OF);
-        CLEAR_FLAG(F_SF);
-        SET_FLAG(F_PF);
-        SET_FLAG(F_ZF);
-    }
-    return res;
+	if (s < 32) {
+		cnt = s % 32;
+		if (cnt > 0) {
+			res = (d << cnt) | (fill >> (32-cnt));
+			cf = d & (1 << (32 - cnt));
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_32((u32)res);
+		} else {
+			res = d;
+		}
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG((((res & 0x80000000) == 0x80000000) ^
+						(ACCESS_FLAG(F_CF) != 0)), F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CONDITIONAL_SET_FLAG((d << (s-1)) & 0x80000000, F_CF);
+		CLEAR_FLAG(F_OF);
+		CLEAR_FLAG(F_SF);
+		SET_FLAG(F_PF);
+		SET_FLAG(F_ZF);
+	}
+	return res;
 }
 
 /****************************************************************************
 REMARKS:
 Implements the SHRD instruction and side effects.
 ****************************************************************************/
-u16 shrd_word (u16 d, u16 fill, u8 s)
+u16 shrd_word(u16 d, u16 fill, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 16) {
-        cnt = s % 16;
-        if (cnt > 0) {
-            cf = d & (1 << (cnt - 1));
-            res = (d >> cnt) | (fill << (16 - cnt));
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_16((u16)res);
-        } else {
-            res = d;
-        }
+	if (s < 16) {
+		cnt = s % 16;
+		if (cnt > 0) {
+			cf = d & (1 << (cnt - 1));
+			res = (d >> cnt) | (fill << (16 - cnt));
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_16((u16)res);
+		} else {
+			res = d;
+		}
 
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-        SET_FLAG(F_ZF);
-        CLEAR_FLAG(F_SF);
-        CLEAR_FLAG(F_PF);
-    }
-    return (u16)res;
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG(XOR2(res >> 14), F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+		SET_FLAG(F_ZF);
+		CLEAR_FLAG(F_SF);
+		CLEAR_FLAG(F_PF);
+	}
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1630,32 +1597,31 @@
 ****************************************************************************/
 u32 shrd_long (u32 d, u32 fill, u8 s)
 {
-    unsigned int cnt, res, cf;
+	unsigned int cnt, res, cf;
 
-    if (s < 32) {
-        cnt = s % 32;
-        if (cnt > 0) {
-            cf = d & (1 << (cnt - 1));
-            res = (d >> cnt) | (fill << (32 - cnt));
-            CONDITIONAL_SET_FLAG(cf, F_CF);
-            set_szp_flags_32((u32)res);
-        } else {
-            res = d;
-        }
-        if (cnt == 1) {
-            CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
-        } else {
-            CLEAR_FLAG(F_OF);
-        }
-    } else {
-        res = 0;
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-        SET_FLAG(F_ZF);
-        CLEAR_FLAG(F_SF);
-        CLEAR_FLAG(F_PF);
-    }
-    return res;
+	if (s < 32) {
+		cnt = s % 32;
+		if (cnt > 0) {
+			cf = d & (1 << (cnt - 1));
+			res = (d >> cnt) | (fill << (32 - cnt));
+			CONDITIONAL_SET_FLAG(cf, F_CF);
+			set_szp_flags_32((u32)res);
+		} else {
+			res = d;
+		}
+		if (cnt == 1)
+			CONDITIONAL_SET_FLAG(XOR2(res >> 30), F_OF);
+		else
+			CLEAR_FLAG(F_OF);
+	} else {
+		res = 0;
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+		SET_FLAG(F_ZF);
+		CLEAR_FLAG(F_SF);
+		CLEAR_FLAG(F_PF);
+	}
+	return res;
 }
 
 /****************************************************************************
@@ -1664,21 +1630,21 @@
 ****************************************************************************/
 u8 sbb_byte(u8 d, u8 s)
 {
-    u32 res;   /* all operands in native machine order */
-    u32 bc;
+	u32 res; /* all operands in native machine order */
+	u32 bc;
 
-    if (ACCESS_FLAG(F_CF))
-        res = d - s - 1;
-    else
-        res = d - s;
-    set_szp_flags_8((u8)res);
+	if (ACCESS_FLAG(F_CF))
+		res = d - s - 1;
+	else
+		res = d - s;
+	set_szp_flags_8((u8)res);
 
-    /* calculate the borrow chain.  See note at top */
-    bc = (res & (~d | s)) | (~d & s);
-    CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
-    CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
-    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-    return (u8)res;
+	/* calculate the borrow chain.  See note at top */
+	bc = (res & (~d | s)) | (~d & s);
+	CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
+	CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
+	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -1687,21 +1653,21 @@
 ****************************************************************************/
 u16 sbb_word(u16 d, u16 s)
 {
-    u32 res;   /* all operands in native machine order */
-    u32 bc;
+	u32 res; /* all operands in native machine order */
+	u32 bc;
 
-    if (ACCESS_FLAG(F_CF))
-        res = d - s - 1;
-    else
-        res = d - s;
-    set_szp_flags_16((u16)res);
+	if (ACCESS_FLAG(F_CF))
+		res = d - s - 1;
+	else
+		res = d - s;
+	set_szp_flags_16((u16)res);
 
-    /* calculate the borrow chain.  See note at top */
-    bc = (res & (~d | s)) | (~d & s);
-    CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
-    CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
-    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-    return (u16)res;
+	/* calculate the borrow chain.  See note at top */
+	bc = (res & (~d | s)) | (~d & s);
+	CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
+	CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
+	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1710,22 +1676,22 @@
 ****************************************************************************/
 u32 sbb_long(u32 d, u32 s)
 {
-    u32 res;   /* all operands in native machine order */
-    u32 bc;
+	u32 res; /* all operands in native machine order */
+	u32 bc;
 
-    if (ACCESS_FLAG(F_CF))
-        res = d - s - 1;
-    else
-        res = d - s;
+	if (ACCESS_FLAG(F_CF))
+		res = d - s - 1;
+	else
+		res = d - s;
 
-    set_szp_flags_32(res);
+	set_szp_flags_32(res);
 
-    /* calculate the borrow chain.  See note at top */
-    bc = (res & (~d | s)) | (~d & s);
-    CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
-    CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
-    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-    return res;
+	/* calculate the borrow chain.  See note at top */
+	bc = (res & (~d | s)) | (~d & s);
+	CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
+	CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
+	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+	return res;
 }
 
 /****************************************************************************
@@ -1734,18 +1700,18 @@
 ****************************************************************************/
 u8 sub_byte(u8 d, u8 s)
 {
-    u32 res;   /* all operands in native machine order */
-    u32 bc;
+	u32 res; /* all operands in native machine order */
+	u32 bc;
 
-    res = d - s;
-    set_szp_flags_8((u8)res);
+	res = d - s;
+	set_szp_flags_8((u8)res);
 
-    /* calculate the borrow chain.  See note at top */
-    bc = (res & (~d | s)) | (~d & s);
-    CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
-    CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
-    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-    return (u8)res;
+	/* calculate the borrow chain.  See note at top */
+	bc = (res & (~d | s)) | (~d & s);
+	CONDITIONAL_SET_FLAG(bc & 0x80, F_CF);
+	CONDITIONAL_SET_FLAG(XOR2(bc >> 6), F_OF);
+	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+	return (u8)res;
 }
 
 /****************************************************************************
@@ -1754,18 +1720,18 @@
 ****************************************************************************/
 u16 sub_word(u16 d, u16 s)
 {
-    u32 res;   /* all operands in native machine order */
-    u32 bc;
+	u32 res; /* all operands in native machine order */
+	u32 bc;
 
-    res = d - s;
-    set_szp_flags_16((u16)res);
+	res = d - s;
+	set_szp_flags_16((u16)res);
 
-    /* calculate the borrow chain.  See note at top */
-    bc = (res & (~d | s)) | (~d & s);
-    CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
-    CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
-    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-    return (u16)res;
+	/* calculate the borrow chain.  See note at top */
+	bc = (res & (~d | s)) | (~d & s);
+	CONDITIONAL_SET_FLAG(bc & 0x8000, F_CF);
+	CONDITIONAL_SET_FLAG(XOR2(bc >> 14), F_OF);
+	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+	return (u16)res;
 }
 
 /****************************************************************************
@@ -1774,18 +1740,18 @@
 ****************************************************************************/
 u32 sub_long(u32 d, u32 s)
 {
-    u32 res;   /* all operands in native machine order */
-    u32 bc;
+	u32 res; /* all operands in native machine order */
+	u32 bc;
 
-    res = d - s;
-    set_szp_flags_32(res);
+	res = d - s;
+	set_szp_flags_32(res);
 
-    /* calculate the borrow chain.  See note at top */
-    bc = (res & (~d | s)) | (~d & s);
-    CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
-    CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
-    CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
-    return res;
+	/* calculate the borrow chain.  See note at top */
+	bc = (res & (~d | s)) | (~d & s);
+	CONDITIONAL_SET_FLAG(bc & 0x80000000, F_CF);
+	CONDITIONAL_SET_FLAG(XOR2(bc >> 30), F_OF);
+	CONDITIONAL_SET_FLAG(bc & 0x8, F_AF);
+	return res;
 }
 
 /****************************************************************************
@@ -1794,14 +1760,14 @@
 ****************************************************************************/
 void test_byte(u8 d, u8 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d & s;
+	res = d & s;
 
-    CLEAR_FLAG(F_OF);
-    set_szp_flags_8((u8)res);
-    /* AF == don't care */
-    CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_OF);
+	set_szp_flags_8((u8)res);
+	/* AF == don't care */
+	CLEAR_FLAG(F_CF);
 }
 
 /****************************************************************************
@@ -1810,14 +1776,14 @@
 ****************************************************************************/
 void test_word(u16 d, u16 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d & s;
+	res = d & s;
 
-    CLEAR_FLAG(F_OF);
-    set_szp_flags_16((u16)res);
-    /* AF == don't care */
-    CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_OF);
+	set_szp_flags_16((u16)res);
+	/* AF == don't care */
+	CLEAR_FLAG(F_CF);
 }
 
 /****************************************************************************
@@ -1826,14 +1792,14 @@
 ****************************************************************************/
 void test_long(u32 d, u32 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d & s;
+	res = d & s;
 
-    CLEAR_FLAG(F_OF);
-    set_szp_flags_32(res);
-    /* AF == don't care */
-    CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_OF);
+	set_szp_flags_32(res);
+	/* AF == don't care */
+	CLEAR_FLAG(F_CF);
 }
 
 /****************************************************************************
@@ -1842,11 +1808,11 @@
 ****************************************************************************/
 u8 xor_byte(u8 d, u8 s)
 {
-    u8 res;    /* all operands in native machine order */
+	u8 res;	/* all operands in native machine order */
 
-    res = d ^ s;
-    no_carry_byte_side_eff(res);
-    return res;
+	res = d ^ s;
+	no_carry_byte_side_eff(res);
+	return res;
 }
 
 /****************************************************************************
@@ -1855,11 +1821,11 @@
 ****************************************************************************/
 u16 xor_word(u16 d, u16 s)
 {
-    u16 res;   /* all operands in native machine order */
+	u16 res; /* all operands in native machine order */
 
-    res = d ^ s;
-    no_carry_word_side_eff(res);
-    return res;
+	res = d ^ s;
+	no_carry_word_side_eff(res);
+	return res;
 }
 
 /****************************************************************************
@@ -1868,11 +1834,11 @@
 ****************************************************************************/
 u32 xor_long(u32 d, u32 s)
 {
-    u32 res;   /* all operands in native machine order */
+	u32 res; /* all operands in native machine order */
 
-    res = d ^ s;
-    no_carry_long_side_eff(res);
-    return res;
+	res = d ^ s;
+	no_carry_long_side_eff(res);
+	return res;
 }
 
 /****************************************************************************
@@ -1881,17 +1847,17 @@
 ****************************************************************************/
 void imul_byte(u8 s)
 {
-    s16 res = (s16)((s8)M.x86.R_AL * (s8)s);
+	s16 res = (s16)((s8)M.x86.R_AL * (s8)s);
 
-    M.x86.R_AX = res;
-    if (((M.x86.R_AL & 0x80) == 0 && M.x86.R_AH == 0x00) ||
-        ((M.x86.R_AL & 0x80) != 0 && M.x86.R_AH == 0xFF)) {
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-    } else {
-        SET_FLAG(F_CF);
-        SET_FLAG(F_OF);
-    }
+	M.x86.R_AX = res;
+	if (((M.x86.R_AL & 0x80) == 0 && M.x86.R_AH == 0x00) ||
+		((M.x86.R_AL & 0x80) != 0 && M.x86.R_AH == 0xFF)) {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	} else {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	}
 }
 
 /****************************************************************************
@@ -1900,55 +1866,55 @@
 ****************************************************************************/
 void imul_word(u16 s)
 {
-    s32 res = (s16)M.x86.R_AX * (s16)s;
+	s32 res = (s16)M.x86.R_AX * (s16)s;
 
-    M.x86.R_AX = (u16)res;
-    M.x86.R_DX = (u16)(res >> 16);
-    if (((M.x86.R_AX & 0x8000) == 0 && M.x86.R_DX == 0x0000) ||
-        ((M.x86.R_AX & 0x8000) != 0 && M.x86.R_DX == 0xFFFF)) {
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-    } else {
-        SET_FLAG(F_CF);
-        SET_FLAG(F_OF);
-    }
+	M.x86.R_AX = (u16)res;
+	M.x86.R_DX = (u16)(res >> 16);
+	if (((M.x86.R_AX & 0x8000) == 0 && M.x86.R_DX == 0x0000) ||
+		((M.x86.R_AX & 0x8000) != 0 && M.x86.R_DX == 0xFFFF)) {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	} else {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	}
 }
 
 /****************************************************************************
 REMARKS:
 Implements the IMUL instruction and side effects.
 ****************************************************************************/
-void imul_long_direct(u32 *res_lo, u32* res_hi,u32 d, u32 s)
+void imul_long_direct(u32 *res_lo, u32 *res_hi, u32 d, u32 s)
 {
-#ifdef  __HAS_LONG_LONG__
-    s64 res = (s64)(s32)d * (s64)(s32)s;
+#ifdef __HAS_LONG_LONG__
+	s64 res = (s64)(s32)d * (s64)(s32)s;
 
-    *res_lo = (u32)res;
-    *res_hi = (u32)(res >> 32);
+	*res_lo = (u32)res;
+	*res_hi = (u32)(res >> 32);
 #else
-    u32 d_lo,d_hi,d_sign;
-    u32 s_lo,s_hi,s_sign;
-    u32 rlo_lo,rlo_hi,rhi_lo;
+	u32 d_lo, d_hi, d_sign;
+	u32 s_lo, s_hi, s_sign;
+	u32 rlo_lo, rlo_hi, rhi_lo;
 
-    if ((d_sign = d & 0x80000000) != 0)
-        d = -d;
-    d_lo = d & 0xFFFF;
-    d_hi = d >> 16;
-    if ((s_sign = s & 0x80000000) != 0)
-        s = -s;
-    s_lo = s & 0xFFFF;
-    s_hi = s >> 16;
-    rlo_lo = d_lo * s_lo;
-    rlo_hi = (d_hi * s_lo + d_lo * s_hi) + (rlo_lo >> 16);
-    rhi_lo = d_hi * s_hi + (rlo_hi >> 16);
-    *res_lo = (rlo_hi << 16) | (rlo_lo & 0xFFFF);
-    *res_hi = rhi_lo;
-    if (d_sign != s_sign) {
-        d = ~*res_lo;
-        s = (((d & 0xFFFF) + 1) >> 16) + (d >> 16);
-        *res_lo = ~*res_lo+1;
-        *res_hi = ~*res_hi+(s >> 16);
-        }
+	if ((d_sign = d & 0x80000000) != 0)
+		d = -d;
+	d_lo = d & 0xFFFF;
+	d_hi = d >> 16;
+	if ((s_sign = s & 0x80000000) != 0)
+		s = -s;
+	s_lo = s & 0xFFFF;
+	s_hi = s >> 16;
+	rlo_lo = d_lo * s_lo;
+	rlo_hi = (d_hi * s_lo + d_lo * s_hi) + (rlo_lo >> 16);
+	rhi_lo = d_hi * s_hi + (rlo_hi >> 16);
+	*res_lo = (rlo_hi << 16) | (rlo_lo & 0xFFFF);
+	*res_hi = rhi_lo;
+	if (d_sign != s_sign) {
+		d = ~*res_lo;
+		s = (((d & 0xFFFF) + 1) >> 16) + (d >> 16);
+		*res_lo = ~*res_lo+1;
+		*res_hi = ~*res_hi+(s >> 16);
+		}
 #endif
 }
 
@@ -1958,15 +1924,15 @@
 ****************************************************************************/
 void imul_long(u32 s)
 {
-    imul_long_direct(&M.x86.R_EAX,&M.x86.R_EDX,M.x86.R_EAX,s);
-    if (((M.x86.R_EAX & 0x80000000) == 0 && M.x86.R_EDX == 0x00000000) ||
-        ((M.x86.R_EAX & 0x80000000) != 0 && M.x86.R_EDX == 0xFFFFFFFF)) {
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-    } else {
-        SET_FLAG(F_CF);
-        SET_FLAG(F_OF);
-    }
+	imul_long_direct(&M.x86.R_EAX, &M.x86.R_EDX, M.x86.R_EAX, s);
+	if (((M.x86.R_EAX & 0x80000000) == 0 && M.x86.R_EDX == 0x00000000) ||
+		((M.x86.R_EAX & 0x80000000) != 0 && M.x86.R_EDX == 0xFFFFFFFF)) {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	} else {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	}
 }
 
 /****************************************************************************
@@ -1975,16 +1941,16 @@
 ****************************************************************************/
 void mul_byte(u8 s)
 {
-    u16 res = (u16)(M.x86.R_AL * s);
+	u16 res = (u16)(M.x86.R_AL * s);
 
-    M.x86.R_AX = res;
-    if (M.x86.R_AH == 0) {
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-    } else {
-        SET_FLAG(F_CF);
-        SET_FLAG(F_OF);
-    }
+	M.x86.R_AX = res;
+	if (M.x86.R_AH == 0) {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	} else {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	}
 }
 
 /****************************************************************************
@@ -1993,17 +1959,17 @@
 ****************************************************************************/
 void mul_word(u16 s)
 {
-    u32 res = M.x86.R_AX * s;
+	u32 res = M.x86.R_AX * s;
 
-    M.x86.R_AX = (u16)res;
-    M.x86.R_DX = (u16)(res >> 16);
-    if (M.x86.R_DX == 0) {
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-    } else {
-        SET_FLAG(F_CF);
-        SET_FLAG(F_OF);
-    }
+	M.x86.R_AX = (u16)res;
+	M.x86.R_DX = (u16)(res >> 16);
+	if (M.x86.R_DX == 0) {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	} else {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	}
 }
 
 /****************************************************************************
@@ -2012,34 +1978,34 @@
 ****************************************************************************/
 void mul_long(u32 s)
 {
-#ifdef  __HAS_LONG_LONG__
-    u64 res = (u64)M.x86.R_EAX * s;
+#ifdef __HAS_LONG_LONG__
+	u64 res = (u64)M.x86.R_EAX * s;
 
-    M.x86.R_EAX = (u32)res;
-    M.x86.R_EDX = (u32)(res >> 32);
+	M.x86.R_EAX = (u32)res;
+	M.x86.R_EDX = (u32)(res >> 32);
 #else
-    u32 a,a_lo,a_hi;
-    u32 s_lo,s_hi;
-    u32 rlo_lo,rlo_hi,rhi_lo;
+	u32 a, a_lo, a_hi;
+	u32 s_lo, s_hi;
+	u32 rlo_lo, rlo_hi, rhi_lo;
 
-    a = M.x86.R_EAX;
-    a_lo = a & 0xFFFF;
-    a_hi = a >> 16;
-    s_lo = s & 0xFFFF;
-    s_hi = s >> 16;
-    rlo_lo = a_lo * s_lo;
-    rlo_hi = (a_hi * s_lo + a_lo * s_hi) + (rlo_lo >> 16);
-    rhi_lo = a_hi * s_hi + (rlo_hi >> 16);
-    M.x86.R_EAX = (rlo_hi << 16) | (rlo_lo & 0xFFFF);
-    M.x86.R_EDX = rhi_lo;
+	a = M.x86.R_EAX;
+	a_lo = a & 0xFFFF;
+	a_hi = a >> 16;
+	s_lo = s & 0xFFFF;
+	s_hi = s >> 16;
+	rlo_lo = a_lo * s_lo;
+	rlo_hi = (a_hi * s_lo + a_lo * s_hi) + (rlo_lo >> 16);
+	rhi_lo = a_hi * s_hi + (rlo_hi >> 16);
+	M.x86.R_EAX = (rlo_hi << 16) | (rlo_lo & 0xFFFF);
+	M.x86.R_EDX = rhi_lo;
 #endif
-    if (M.x86.R_EDX == 0) {
-        CLEAR_FLAG(F_CF);
-        CLEAR_FLAG(F_OF);
-    } else {
-        SET_FLAG(F_CF);
-        SET_FLAG(F_OF);
-    }
+	if (M.x86.R_EDX == 0) {
+		CLEAR_FLAG(F_CF);
+		CLEAR_FLAG(F_OF);
+	} else {
+		SET_FLAG(F_CF);
+		SET_FLAG(F_OF);
+	}
 }
 
 /****************************************************************************
@@ -2048,21 +2014,21 @@
 ****************************************************************************/
 void idiv_byte(u8 s)
 {
-    s32 dvd, div, mod;
+	s32 dvd, div, mod;
 
-    dvd = (s16)M.x86.R_AX;
-    if (s == 0) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    div = dvd / (s8)s;
-    mod = dvd % (s8)s;
-    if (abs(div) > 0x7f) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    M.x86.R_AL = (s8) div;
-    M.x86.R_AH = (s8) mod;
+	dvd = (s16)M.x86.R_AX;
+	if (s == 0) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	div = dvd / (s8)s;
+	mod = dvd % (s8)s;
+	if (abs(div) > 0x7f) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	M.x86.R_AL = (s8) div;
+	M.x86.R_AH = (s8) mod;
 }
 
 /****************************************************************************
@@ -2071,26 +2037,26 @@
 ****************************************************************************/
 void idiv_word(u16 s)
 {
-    s32 dvd, div, mod;
+	s32 dvd, div, mod;
 
-    dvd = (((s32)M.x86.R_DX) << 16) | M.x86.R_AX;
-    if (s == 0) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    div = dvd / (s16)s;
-    mod = dvd % (s16)s;
-    if (abs(div) > 0x7fff) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    CLEAR_FLAG(F_CF);
-    CLEAR_FLAG(F_SF);
-    CONDITIONAL_SET_FLAG(div == 0, F_ZF);
-    set_parity_flag(mod);
+	dvd = (((s32)M.x86.R_DX) << 16) | M.x86.R_AX;
+	if (s == 0) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	div = dvd / (s16)s;
+	mod = dvd % (s16)s;
+	if (abs(div) > 0x7fff) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_SF);
+	CONDITIONAL_SET_FLAG(div == 0, F_ZF);
+	set_parity_flag(mod);
 
-    M.x86.R_AX = (u16)div;
-    M.x86.R_DX = (u16)mod;
+	M.x86.R_AX = (u16)div;
+	M.x86.R_DX = (u16)mod;
 }
 
 /****************************************************************************
@@ -2099,72 +2065,72 @@
 ****************************************************************************/
 void idiv_long(u32 s)
 {
-#ifdef  __HAS_LONG_LONG__
-    s64 dvd, div, mod;
+#ifdef __HAS_LONG_LONG__
+	s64 dvd, div, mod;
 
-    dvd = (((s64)M.x86.R_EDX) << 32) | M.x86.R_EAX;
-    if (s == 0) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    div = dvd / (s32)s;
-    mod = dvd % (s32)s;
-    if (abs(div) > 0x7fffffff) {
-        x86emu_intr_raise(0);
-        return;
-    }
+	dvd = (((s64)M.x86.R_EDX) << 32) | M.x86.R_EAX;
+	if (s == 0) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	div = dvd / (s32)s;
+	mod = dvd % (s32)s;
+	if (abs(div) > 0x7fffffff) {
+		x86emu_intr_raise(0);
+		return;
+	}
 #else
-    s32 div = 0, mod;
-    s32 h_dvd = M.x86.R_EDX;
-    u32 l_dvd = M.x86.R_EAX;
-    u32 abs_s = s & 0x7FFFFFFF;
-    u32 abs_h_dvd = h_dvd & 0x7FFFFFFF;
-    u32 h_s = abs_s >> 1;
-    u32 l_s = abs_s << 31;
-    int counter = 31;
-    int carry;
+	s32 div = 0, mod;
+	s32 h_dvd = M.x86.R_EDX;
+	u32 l_dvd = M.x86.R_EAX;
+	u32 abs_s = s & 0x7FFFFFFF;
+	u32 abs_h_dvd = h_dvd & 0x7FFFFFFF;
+	u32 h_s = abs_s >> 1;
+	u32 l_s = abs_s << 31;
+	int counter = 31;
+	int carry;
 
-    if (s == 0) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    do {
-        div <<= 1;
-        carry = (l_dvd >= l_s) ? 0 : 1;
+	if (s == 0) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	do {
+		div <<= 1;
+		carry = (l_dvd >= l_s) ? 0 : 1;
 
-        if (abs_h_dvd < (h_s + carry)) {
-            h_s >>= 1;
-            l_s = abs_s << (--counter);
-            continue;
-        } else {
-            abs_h_dvd -= (h_s + carry);
-            l_dvd = carry ? ((0xFFFFFFFF - l_s) + l_dvd + 1)
-                : (l_dvd - l_s);
-            h_s >>= 1;
-            l_s = abs_s << (--counter);
-            div |= 1;
-            continue;
-        }
+		if (abs_h_dvd < (h_s + carry)) {
+			h_s >>= 1;
+			l_s = abs_s << (--counter);
+			continue;
+		} else {
+			abs_h_dvd -= (h_s + carry);
+			l_dvd = carry ? ((0xFFFFFFFF - l_s) + l_dvd + 1)
+				: (l_dvd - l_s);
+			h_s >>= 1;
+			l_s = abs_s << (--counter);
+			div |= 1;
+			continue;
+		}
 
-    } while (counter > -1);
-    /* overflow */
-    if (abs_h_dvd || (l_dvd > abs_s)) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    /* sign */
-    div |= ((h_dvd & 0x10000000) ^ (s & 0x10000000));
-    mod = l_dvd;
+	} while (counter > -1);
+	/* overflow */
+	if (abs_h_dvd || (l_dvd > abs_s)) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	/* sign */
+	div |= ((h_dvd & 0x10000000) ^ (s & 0x10000000));
+	mod = l_dvd;
 
 #endif
-    CLEAR_FLAG(F_CF);
-    CLEAR_FLAG(F_AF);
-    CLEAR_FLAG(F_SF);
-    SET_FLAG(F_ZF);
-    set_parity_flag(mod);
+	CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_AF);
+	CLEAR_FLAG(F_SF);
+	SET_FLAG(F_ZF);
+	set_parity_flag(mod);
 
-    M.x86.R_EAX = (u32)div;
-    M.x86.R_EDX = (u32)mod;
+	M.x86.R_EAX = (u32)div;
+	M.x86.R_EDX = (u32)mod;
 }
 
 /****************************************************************************
@@ -2173,21 +2139,21 @@
 ****************************************************************************/
 void div_byte(u8 s)
 {
-    u32 dvd, div, mod;
+	u32 dvd, div, mod;
 
-    dvd = M.x86.R_AX;
-    if (s == 0) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    div = dvd / (u8)s;
-    mod = dvd % (u8)s;
-    if (abs(div) > 0xff) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    M.x86.R_AL = (u8)div;
-    M.x86.R_AH = (u8)mod;
+	dvd = M.x86.R_AX;
+	if (s == 0) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	div = dvd / (u8)s;
+	mod = dvd % (u8)s;
+	if (abs(div) > 0xff) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	M.x86.R_AL = (u8)div;
+	M.x86.R_AH = (u8)mod;
 }
 
 /****************************************************************************
@@ -2196,26 +2162,26 @@
 ****************************************************************************/
 void div_word(u16 s)
 {
-    u32 dvd, div, mod;
+	u32 dvd, div, mod;
 
-    dvd = (((u32)M.x86.R_DX) << 16) | M.x86.R_AX;
-    if (s == 0) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    div = dvd / (u16)s;
-    mod = dvd % (u16)s;
-    if (abs(div) > 0xffff) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    CLEAR_FLAG(F_CF);
-    CLEAR_FLAG(F_SF);
-    CONDITIONAL_SET_FLAG(div == 0, F_ZF);
-    set_parity_flag(mod);
+	dvd = (((u32)M.x86.R_DX) << 16) | M.x86.R_AX;
+	if (s == 0) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	div = dvd / (u16)s;
+	mod = dvd % (u16)s;
+	if (abs(div) > 0xffff) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_SF);
+	CONDITIONAL_SET_FLAG(div == 0, F_ZF);
+	set_parity_flag(mod);
 
-    M.x86.R_AX = (u16)div;
-    M.x86.R_DX = (u16)mod;
+	M.x86.R_AX = (u16)div;
+	M.x86.R_DX = (u16)mod;
 }
 
 /****************************************************************************
@@ -2224,68 +2190,68 @@
 ****************************************************************************/
 void div_long(u32 s)
 {
-#ifdef  __HAS_LONG_LONG__
-    u64 dvd, div, mod;
+#ifdef __HAS_LONG_LONG__
+	u64 dvd, div, mod;
 
-    dvd = (((u64)M.x86.R_EDX) << 32) | M.x86.R_EAX;
-    if (s == 0) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    div = dvd / (u32)s;
-    mod = dvd % (u32)s;
-    if (abs(div) > 0xffffffff) {
-        x86emu_intr_raise(0);
-        return;
-    }
+	dvd = (((u64)M.x86.R_EDX) << 32) | M.x86.R_EAX;
+	if (s == 0) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	div = dvd / (u32)s;
+	mod = dvd % (u32)s;
+	if (abs(div) > 0xffffffff) {
+		x86emu_intr_raise(0);
+		return;
+	}
 #else
-    s32 div = 0, mod;
-    s32 h_dvd = M.x86.R_EDX;
-    u32 l_dvd = M.x86.R_EAX;
+	s32 div = 0, mod;
+	s32 h_dvd = M.x86.R_EDX;
+	u32 l_dvd = M.x86.R_EAX;
 
-    u32 h_s = s;
-    u32 l_s = 0;
-    int counter = 32;
-    int carry;
+	u32 h_s = s;
+	u32 l_s = 0;
+	int counter = 32;
+	int carry;
 
-    if (s == 0) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    do {
-        div <<= 1;
-        carry = (l_dvd >= l_s) ? 0 : 1;
+	if (s == 0) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	do {
+		div <<= 1;
+		carry = (l_dvd >= l_s) ? 0 : 1;
 
-        if (h_dvd < (h_s + carry)) {
-            h_s >>= 1;
-            l_s = s << (--counter);
-            continue;
-        } else {
-            h_dvd -= (h_s + carry);
-            l_dvd = carry ? ((0xFFFFFFFF - l_s) + l_dvd + 1)
-                : (l_dvd - l_s);
-            h_s >>= 1;
-            l_s = s << (--counter);
-            div |= 1;
-            continue;
-        }
+		if (h_dvd < (h_s + carry)) {
+			h_s >>= 1;
+			l_s = s << (--counter);
+			continue;
+		} else {
+			h_dvd -= (h_s + carry);
+			l_dvd = carry ? ((0xFFFFFFFF - l_s) + l_dvd + 1)
+				: (l_dvd - l_s);
+			h_s >>= 1;
+			l_s = s << (--counter);
+			div |= 1;
+			continue;
+		}
 
-    } while (counter > -1);
-    /* overflow */
-    if (h_dvd || (l_dvd > s)) {
-        x86emu_intr_raise(0);
-        return;
-    }
-    mod = l_dvd;
+	} while (counter > -1);
+	/* overflow */
+	if (h_dvd || (l_dvd > s)) {
+		x86emu_intr_raise(0);
+		return;
+	}
+	mod = l_dvd;
 #endif
-    CLEAR_FLAG(F_CF);
-    CLEAR_FLAG(F_AF);
-    CLEAR_FLAG(F_SF);
-    SET_FLAG(F_ZF);
-    set_parity_flag(mod);
+	CLEAR_FLAG(F_CF);
+	CLEAR_FLAG(F_AF);
+	CLEAR_FLAG(F_SF);
+	SET_FLAG(F_ZF);
+	set_parity_flag(mod);
 
-    M.x86.R_EAX = (u32)div;
-    M.x86.R_EDX = (u32)mod;
+	M.x86.R_EAX = (u32)div;
+	M.x86.R_EDX = (u32)mod;
 }
 
 /****************************************************************************
@@ -2295,39 +2261,37 @@
 
 static void single_in(int size)
 {
-    if (size == 1)
-        store_data_byte_abs(M.x86.R_ES, M.x86.R_DI,(*sys_inb)(M.x86.R_DX));
-    else if (size == 2)
-        store_data_word_abs(M.x86.R_ES, M.x86.R_DI,(*sys_inw)(M.x86.R_DX));
-    else
-        store_data_long_abs(M.x86.R_ES, M.x86.R_DI,(*sys_inl)(M.x86.R_DX));
+	if (size == 1)
+		store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, (*sys_inb)(M.x86.R_DX));
+	else if (size == 2)
+		store_data_word_abs(M.x86.R_ES, M.x86.R_DI, (*sys_inw)(M.x86.R_DX));
+	else
+		store_data_long_abs(M.x86.R_ES, M.x86.R_DI, (*sys_inl)(M.x86.R_DX));
 }
 
 void ins(int size)
 {
-    int inc = size;
+	int inc = size;
 
-    if (ACCESS_FLAG(F_DF)) {
-        inc = -size;
-    }
-    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* don't care whether REPE or REPNE */
-        /* in until (E)CX is ZERO. */
-        u32 count = ((M.x86.mode & SYSMODE_32BIT_REP) ?
-                     M.x86.R_ECX : M.x86.R_CX);
-        while (count--) {
-          single_in(size);
-          M.x86.R_DI += inc;
-          }
-        M.x86.R_CX = 0;
-        if (M.x86.mode & SYSMODE_32BIT_REP) {
-            M.x86.R_ECX = 0;
-        }
-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
-    } else {
-        single_in(size);
-        M.x86.R_DI += inc;
-    }
+	if (ACCESS_FLAG(F_DF))
+		inc = -size;
+	if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+		/* don't care whether REPE or REPNE */
+		/* in until (E)CX is ZERO. */
+		u32 count = ((M.x86.mode & SYSMODE_32BIT_REP) ?
+					 M.x86.R_ECX : M.x86.R_CX);
+		while (count--) {
+			single_in(size);
+			M.x86.R_DI += inc;
+		}
+		M.x86.R_CX = 0;
+		if (M.x86.mode & SYSMODE_32BIT_REP)
+			M.x86.R_ECX = 0;
+		M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+	} else {
+		single_in(size);
+		M.x86.R_DI += inc;
+	}
 }
 
 /****************************************************************************
@@ -2337,53 +2301,51 @@
 
 static void single_out(int size)
 {
-     if (size == 1)
-       (*sys_outb)(M.x86.R_DX,fetch_data_byte_abs(M.x86.R_ES, M.x86.R_SI));
-     else if (size == 2)
-       (*sys_outw)(M.x86.R_DX,fetch_data_word_abs(M.x86.R_ES, M.x86.R_SI));
-     else
-       (*sys_outl)(M.x86.R_DX,fetch_data_long_abs(M.x86.R_ES, M.x86.R_SI));
+	if (size == 1)
+		(*sys_outb)(M.x86.R_DX, fetch_data_byte_abs(M.x86.R_ES, M.x86.R_SI));
+	else if (size == 2)
+		(*sys_outw)(M.x86.R_DX, fetch_data_word_abs(M.x86.R_ES, M.x86.R_SI));
+	else
+		(*sys_outl)(M.x86.R_DX, fetch_data_long_abs(M.x86.R_ES, M.x86.R_SI));
 }
 
 void outs(int size)
 {
-    int inc = size;
+	int inc = size;
 
-    if (ACCESS_FLAG(F_DF)) {
-        inc = -size;
-    }
-    if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* don't care whether REPE or REPNE */
-        /* out until (E)CX is ZERO. */
-        u32 count = ((M.x86.mode & SYSMODE_32BIT_REP) ?
-                     M.x86.R_ECX : M.x86.R_CX);
-        while (count--) {
-          single_out(size);
-          M.x86.R_SI += inc;
-          }
-        M.x86.R_CX = 0;
-        if (M.x86.mode & SYSMODE_32BIT_REP) {
-            M.x86.R_ECX = 0;
-        }
-        M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
-    } else {
-        single_out(size);
-        M.x86.R_SI += inc;
-    }
+	if (ACCESS_FLAG(F_DF))
+		inc = -size;
+	if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
+		/* don't care whether REPE or REPNE */
+		/* out until (E)CX is ZERO. */
+		u32 count = ((M.x86.mode & SYSMODE_32BIT_REP) ?
+					 M.x86.R_ECX : M.x86.R_CX);
+		while (count--) {
+			single_out(size);
+			M.x86.R_SI += inc;
+		}
+		M.x86.R_CX = 0;
+		if (M.x86.mode & SYSMODE_32BIT_REP)
+			M.x86.R_ECX = 0;
+		M.x86.mode &= ~(SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE);
+	} else {
+		single_out(size);
+		M.x86.R_SI += inc;
+	}
 }
 
 /****************************************************************************
 PARAMETERS:
-addr    - Address to fetch word from
+addr	- Address to fetch word from
 
 REMARKS:
 Fetches a word from emulator memory using an absolute address.
 ****************************************************************************/
 u16 mem_access_word(int addr)
 {
-DB( if (CHECK_MEM_ACCESS())
-      x86emu_check_mem_access(addr);)
-    return (*sys_rdw)(addr);
+DB(if (CHECK_MEM_ACCESS())
+	  x86emu_check_mem_access(addr);)
+	return (*sys_rdw)(addr);
 }
 
 /****************************************************************************
@@ -2394,10 +2356,10 @@
 ****************************************************************************/
 void push_word(u16 w)
 {
-DB( if (CHECK_SP_ACCESS())
-      x86emu_check_sp_access();)
-    M.x86.R_SP -= 2;
-    (*sys_wrw)(((u32)M.x86.R_SS << 4)  + M.x86.R_SP, w);
+DB(if (CHECK_SP_ACCESS())
+	  x86emu_check_sp_access();)
+	M.x86.R_SP -= 2;
+	(*sys_wrw)(((u32)M.x86.R_SS << 4) + M.x86.R_SP, w);
 }
 
 /****************************************************************************
@@ -2408,10 +2370,10 @@
 ****************************************************************************/
 void push_long(u32 w)
 {
-DB( if (CHECK_SP_ACCESS())
-      x86emu_check_sp_access();)
-    M.x86.R_SP -= 4;
-    (*sys_wrl)(((u32)M.x86.R_SS << 4)  + M.x86.R_SP, w);
+DB(if (CHECK_SP_ACCESS())
+	  x86emu_check_sp_access();)
+	M.x86.R_SP -= 4;
+	(*sys_wrl)(((u32)M.x86.R_SS << 4) + M.x86.R_SP, w);
 }
 
 /****************************************************************************
@@ -2422,13 +2384,13 @@
 ****************************************************************************/
 u16 pop_word(void)
 {
-    u16 res;
+	u16 res;
 
-DB( if (CHECK_SP_ACCESS())
-      x86emu_check_sp_access();)
-    res = (*sys_rdw)(((u32)M.x86.R_SS << 4)  + M.x86.R_SP);
-    M.x86.R_SP += 2;
-    return res;
+DB(if (CHECK_SP_ACCESS())
+	  x86emu_check_sp_access();)
+	res = (*sys_rdw)(((u32)M.x86.R_SS << 4) + M.x86.R_SP);
+	M.x86.R_SP += 2;
+	return res;
 }
 
 /****************************************************************************
@@ -2439,13 +2401,13 @@
 ****************************************************************************/
 u32 pop_long(void)
 {
-    u32 res;
+	u32 res;
 
-DB( if (CHECK_SP_ACCESS())
-      x86emu_check_sp_access();)
-    res = (*sys_rdl)(((u32)M.x86.R_SS << 4)  + M.x86.R_SP);
-    M.x86.R_SP += 4;
-    return res;
+DB(if (CHECK_SP_ACCESS())
+	  x86emu_check_sp_access();)
+	res = (*sys_rdl)(((u32)M.x86.R_SS << 4) + M.x86.R_SP);
+	M.x86.R_SP += 4;
+	return res;
 }
 
 /****************************************************************************
@@ -2454,42 +2416,42 @@
 ****************************************************************************/
 void x86emu_cpuid(void)
 {
-    u32 feature = M.x86.R_EAX;
+	u32 feature = M.x86.R_EAX;
 
-    switch (feature) {
-    case 0:
-        /* Regardless if we have real data from the hardware, the emulator
-         * will only support upto feature 1, which we set in register EAX.
-         * Registers EBX:EDX:ECX contain a string identifying the CPU.
-         */
-        M.x86.R_EAX = 1;
-        /* EBX:EDX:ECX = "GenuineIntel" */
-        M.x86.R_EBX = 0x756e6547;
-        M.x86.R_EDX = 0x49656e69;
-        M.x86.R_ECX = 0x6c65746e;
-        break;
-    case 1:
-        /* If we don't have x86 compatible hardware, we return values from an
-         * Intel 486dx4; which was one of the first processors to have CPUID.
-         */
-        M.x86.R_EAX = 0x00000480;
-        M.x86.R_EBX = 0x00000000;
-        M.x86.R_ECX = 0x00000000;
-        M.x86.R_EDX = 0x00000002;       /* VME */
-        /* In the case that we have hardware CPUID instruction, we make sure
-         * that the features reported are limited to TSC and VME.
-         */
-        M.x86.R_EDX &= 0x00000012;
-        break;
-    default:
-        /* Finally, we don't support any additional features.  Most CPUs
-         * return all zeros when queried for invalid or unsupported feature
-         * numbers.
-         */
-        M.x86.R_EAX = 0;
-        M.x86.R_EBX = 0;
-        M.x86.R_ECX = 0;
-        M.x86.R_EDX = 0;
-        break;
-    }
+	switch (feature) {
+	case 0:
+		/* Regardless if we have real data from the hardware, the emulator
+		 * will only support upto feature 1, which we set in register EAX.
+		 * Registers EBX:EDX:ECX contain a string identifying the CPU.
+		 */
+		M.x86.R_EAX = 1;
+		/* EBX:EDX:ECX = "GenuineIntel" */
+		M.x86.R_EBX = 0x756e6547;
+		M.x86.R_EDX = 0x49656e69;
+		M.x86.R_ECX = 0x6c65746e;
+		break;
+	case 1:
+		/* If we don't have x86 compatible hardware, we return values from an
+		 * Intel 486dx4; which was one of the first processors to have CPUID.
+		 */
+		M.x86.R_EAX = 0x00000480;
+		M.x86.R_EBX = 0x00000000;
+		M.x86.R_ECX = 0x00000000;
+		M.x86.R_EDX = 0x00000002;	   /* VME */
+		/* In the case that we have hardware CPUID instruction, we make sure
+		 * that the features reported are limited to TSC and VME.
+		 */
+		M.x86.R_EDX &= 0x00000012;
+		break;
+	default:
+		/* Finally, we don't support any additional features.  Most CPUs
+		 * return all zeros when queried for invalid or unsupported feature
+		 * numbers.
+		 */
+		M.x86.R_EAX = 0;
+		M.x86.R_EBX = 0;
+		M.x86.R_ECX = 0;
+		M.x86.R_EDX = 0;
+		break;
+	}
 }

-- 
To view, visit https://review.coreboot.org/26353
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I010f3e02813d38293a7ab7fc84f60b8c2ec098a7
Gerrit-Change-Number: 26353
Gerrit-PatchSet: 1
Gerrit-Owner: Elyes HAOUAS <ehaouas at noos.fr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180517/ce07abb1/attachment-0001.html>


More information about the coreboot-gerrit mailing list