patch-2.4.18 linux/arch/s390/math-emu/math.c
Next file: linux/arch/s390/vmlinux-shared.lds
Previous file: linux/arch/s390/lib/uaccess.S
Back to the patch index
Back to the overall index
- Lines: 1445
- Date:
Fri Dec 21 16:25:30 2001
- Orig file:
linux.orig/arch/s390/math-emu/math.c
- Orig date:
Mon Feb 18 20:18:39 2002
diff -Naur -X /home/marcelo/lib/dontdiff linux.orig/arch/s390/math-emu/math.c linux/arch/s390/math-emu/math.c
@@ -96,7 +96,7 @@
return SIGSEGV; \
} while (0)
-static void display_emulation_not_implemented(char *instr)
+static void display_emulation_not_implemented(struct pt_regs *regs, char *instr)
{
struct pt_regs *regs;
__u16 *location;
@@ -105,7 +105,6 @@
if(sysctl_ieee_emulation_warnings)
#endif
{
- regs = current->thread.regs;
location = (__u16 *)(regs->psw.addr-S390_lowcore.pgm_ilc);
printk("%s ieee fpu instruction not emulated "
"process name: %s pid: %d \n",
@@ -116,10 +115,9 @@
}
}
-static inline void emu_set_CC (int cc)
+static inline void emu_set_CC (struct pt_regs *regs, int cc)
{
- current->thread.regs->psw.mask =
- (current->thread.regs->psw.mask & 0xFFFFCFFF) | ((cc&3) << 12);
+ regs->psw.mask = (regs->psw.mask & 0xFFFFCFFF) | ((cc&3) << 12);
}
/*
@@ -129,24 +127,24 @@
* 2 : Result is greater than zero
* 3 : Result is NaN or INF
*/
-static inline void emu_set_CC_cs(int class, int sign)
+static inline void emu_set_CC_cs(struct pt_regs *regs, int class, int sign)
{
switch (class) {
case FP_CLS_NORMAL:
case FP_CLS_INF:
- emu_set_CC(sign ? 1 : 2);
+ emu_set_CC(regs, sign ? 1 : 2);
break;
case FP_CLS_ZERO:
- emu_set_CC(0);
+ emu_set_CC(regs, 0);
break;
case FP_CLS_NAN:
- emu_set_CC(3);
+ emu_set_CC(regs, 3);
break;
}
}
/* Add long double */
-static int emu_axbr (int rx, int ry) {
+static int emu_axbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QB); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -163,12 +161,12 @@
FP_PACK_QP(&cvt.ld, QR);
current->thread.fp_regs.fprs[rx].ui = cvt.w.high;
current->thread.fp_regs.fprs[rx+2].ui = cvt.w.low;
- emu_set_CC_cs(QR_c, QR_s);
+ emu_set_CC_cs(regs, QR_c, QR_s);
return _fex;
}
/* Add double */
-static int emu_adbr (int rx, int ry) {
+static int emu_adbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -178,12 +176,12 @@
FP_UNPACK_DP(DB, ¤t->thread.fp_regs.fprs[ry].d);
FP_ADD_D(DR, DA, DB);
FP_PACK_DP(¤t->thread.fp_regs.fprs[rx].d, DR);
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Add double */
-static int emu_adb (int rx, double *val) {
+static int emu_adb (struct pt_regs *regs, int rx, double *val) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -193,12 +191,12 @@
FP_UNPACK_DP(DB, val);
FP_ADD_D(DR, DA, DB);
FP_PACK_DP(¤t->thread.fp_regs.fprs[rx].d, DR);
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Add float */
-static int emu_aebr (int rx, int ry) {
+static int emu_aebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -208,12 +206,12 @@
FP_UNPACK_SP(SB, ¤t->thread.fp_regs.fprs[ry].f);
FP_ADD_S(SR, SA, SB);
FP_PACK_SP(¤t->thread.fp_regs.fprs[rx].f, SR);
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Add float */
-static int emu_aeb (int rx, float *val) {
+static int emu_aeb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -223,12 +221,12 @@
FP_UNPACK_SP(SB, val);
FP_ADD_S(SR, SA, SB);
FP_PACK_SP(¤t->thread.fp_regs.fprs[rx].f, SR);
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Compare long double */
-static int emu_cxbr (int rx, int ry) {
+static int emu_cxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QB);
mathemu_ldcv cvt;
int IR;
@@ -244,12 +242,12 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
return 0;
}
/* Compare double */
-static int emu_cdbr (int rx, int ry) {
+static int emu_cdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DB);
int IR;
@@ -260,12 +258,12 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
return 0;
}
/* Compare double */
-static int emu_cdb (int rx, double *val) {
+static int emu_cdb (struct pt_regs *regs, int rx, double *val) {
FP_DECL_D(DA); FP_DECL_D(DB);
int IR;
@@ -276,12 +274,12 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
return 0;
}
/* Compare float */
-static int emu_cebr (int rx, int ry) {
+static int emu_cebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SB);
int IR;
@@ -292,12 +290,12 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
return 0;
}
/* Compare float */
-static int emu_ceb (int rx, float *val) {
+static int emu_ceb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_S(SB);
int IR;
@@ -308,12 +306,12 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
return 0;
}
/* Compare and signal long double */
-static int emu_kxbr (int rx, int ry) {
+static int emu_kxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QB);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -330,14 +328,14 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
if (IR == 3)
FP_SET_EXCEPTION (FP_EX_INVALID);
return _fex;
}
/* Compare and signal double */
-static int emu_kdbr (int rx, int ry) {
+static int emu_kdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DB);
FP_DECL_EX;
int IR;
@@ -349,14 +347,14 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
if (IR == 3)
FP_SET_EXCEPTION (FP_EX_INVALID);
return _fex;
}
/* Compare and signal double */
-static int emu_kdb (int rx, double *val) {
+static int emu_kdb (struct pt_regs *regs, int rx, double *val) {
FP_DECL_D(DA); FP_DECL_D(DB);
FP_DECL_EX;
int IR;
@@ -368,14 +366,14 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
if (IR == 3)
FP_SET_EXCEPTION (FP_EX_INVALID);
return _fex;
}
/* Compare and signal float */
-static int emu_kebr (int rx, int ry) {
+static int emu_kebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SB);
FP_DECL_EX;
int IR;
@@ -387,14 +385,14 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
if (IR == 3)
FP_SET_EXCEPTION (FP_EX_INVALID);
return _fex;
}
/* Compare and signal float */
-static int emu_keb (int rx, float *val) {
+static int emu_keb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_S(SB);
FP_DECL_EX;
int IR;
@@ -406,14 +404,14 @@
* IR == -1 if DA < DB, IR == 0 if DA == DB,
* IR == 1 if DA > DB and IR == 3 if unorderded
*/
- emu_set_CC((IR == -1) ? 1 : (IR == 1) ? 2 : IR);
+ emu_set_CC(regs, (IR == -1) ? 1 : (IR == 1) ? 2 : IR);
if (IR == 3)
FP_SET_EXCEPTION (FP_EX_INVALID);
return _fex;
}
/* Convert from fixed long double */
-static int emu_cxfbr (int rx, int ry) {
+static int emu_cxfbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -421,7 +419,7 @@
int mode;
mode = current->thread.fp_regs.fpc & 3;
- si = current->thread.regs->gprs[ry];
+ si = regs->gprs[ry];
FP_FROM_INT_Q(QR, si, 32, int);
FP_PACK_QP(&cvt.ld, QR);
current->thread.fp_regs.fprs[rx].ui = cvt.w.high;
@@ -430,35 +428,35 @@
}
/* Convert from fixed double */
-static int emu_cdfbr (int rx, int ry) {
+static int emu_cdfbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DR);
FP_DECL_EX;
__s32 si;
int mode;
mode = current->thread.fp_regs.fpc & 3;
- si = current->thread.regs->gprs[ry];
+ si = regs->gprs[ry];
FP_FROM_INT_D(DR, si, 32, int);
FP_PACK_DP(¤t->thread.fp_regs.fprs[rx].d, DR);
return _fex;
}
/* Convert from fixed float */
-static int emu_cefbr (int rx, int ry) {
+static int emu_cefbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SR);
FP_DECL_EX;
__s32 si;
int mode;
mode = current->thread.fp_regs.fpc & 3;
- si = current->thread.regs->gprs[ry];
+ si = regs->gprs[ry];
FP_FROM_INT_S(SR, si, 32, int);
FP_PACK_SP(¤t->thread.fp_regs.fprs[rx].f, SR);
return _fex;
}
/* Convert to fixed long double */
-static int emu_cfxbr (int rx, int ry, int mask) {
+static int emu_cfxbr (struct pt_regs *regs, int rx, int ry, int mask) {
FP_DECL_Q(QA);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -475,13 +473,13 @@
cvt.w.low = current->thread.fp_regs.fprs[ry+2].ui;
FP_UNPACK_QP(QA, &cvt.ld);
FP_TO_INT_ROUND_Q(si, QA, 32, 1);
- current->thread.regs->gprs[rx] = si;
- emu_set_CC_cs(QA_c, QA_s);
+ regs->gprs[rx] = si;
+ emu_set_CC_cs(regs, QA_c, QA_s);
return _fex;
}
/* Convert to fixed double */
-static int emu_cfdbr (int rx, int ry, int mask) {
+static int emu_cfdbr (struct pt_regs *regs, int rx, int ry, int mask) {
FP_DECL_D(DA);
FP_DECL_EX;
__s32 si;
@@ -495,13 +493,13 @@
mode = mask - 4;
FP_UNPACK_DP(DA, ¤t->thread.fp_regs.fprs[ry].d);
FP_TO_INT_ROUND_D(si, DA, 32, 1);
- current->thread.regs->gprs[rx] = si;
- emu_set_CC_cs(DA_c, DA_s);
+ regs->gprs[rx] = si;
+ emu_set_CC_cs(regs, DA_c, DA_s);
return _fex;
}
/* Convert to fixed float */
-static int emu_cfebr (int rx, int ry, int mask) {
+static int emu_cfebr (struct pt_regs *regs, int rx, int ry, int mask) {
FP_DECL_S(SA);
FP_DECL_EX;
__s32 si;
@@ -515,13 +513,13 @@
mode = mask - 4;
FP_UNPACK_SP(SA, ¤t->thread.fp_regs.fprs[ry].f);
FP_TO_INT_ROUND_S(si, SA, 32, 1);
- current->thread.regs->gprs[rx] = si;
- emu_set_CC_cs(SA_c, SA_s);
+ regs->gprs[rx] = si;
+ emu_set_CC_cs(regs, SA_c, SA_s);
return _fex;
}
/* Divide long double */
-static int emu_dxbr (int rx, int ry) {
+static int emu_dxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QB); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -542,7 +540,7 @@
}
/* Divide double */
-static int emu_ddbr (int rx, int ry) {
+static int emu_ddbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -556,7 +554,7 @@
}
/* Divide double */
-static int emu_ddb (int rx, double *val) {
+static int emu_ddb (struct pt_regs *regs, int rx, double *val) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -570,7 +568,7 @@
}
/* Divide float */
-static int emu_debr (int rx, int ry) {
+static int emu_debr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -584,7 +582,7 @@
}
/* Divide float */
-static int emu_deb (int rx, float *val) {
+static int emu_deb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -598,25 +596,25 @@
}
/* Divide to integer double */
-static int emu_didbr (int rx, int ry, int mask) {
- display_emulation_not_implemented("didbr");
+static int emu_didbr (struct pt_regs *regs, int rx, int ry, int mask) {
+ display_emulation_not_implemented(regs, "didbr");
return 0;
}
/* Divide to integer float */
-static int emu_diebr (int rx, int ry, int mask) {
- display_emulation_not_implemented("diebr");
+static int emu_diebr (struct pt_regs *regs, int rx, int ry, int mask) {
+ display_emulation_not_implemented(regs, "diebr");
return 0;
}
/* Extract fpc */
-static int emu_efpc (int rx, int ry) {
- current->thread.regs->gprs[rx] = current->thread.fp_regs.fpc;
+static int emu_efpc (struct pt_regs *regs, int rx, int ry) {
+ regs->gprs[rx] = current->thread.fp_regs.fpc;
return 0;
}
/* Load and test long double */
-static int emu_ltxbr (int rx, int ry) {
+static int emu_ltxbr (struct pt_regs *regs, int rx, int ry) {
s390_fp_regs *fp_regs = ¤t->thread.fp_regs;
mathemu_ldcv cvt;
FP_DECL_Q(QA);
@@ -627,36 +625,36 @@
FP_UNPACK_QP(QA, &cvt.ld);
fp_regs->fprs[rx].ui = fp_regs->fprs[ry].ui;
fp_regs->fprs[rx+2].ui = fp_regs->fprs[ry+2].ui;
- emu_set_CC_cs(QA_c, QA_s);
+ emu_set_CC_cs(regs, QA_c, QA_s);
return _fex;
}
/* Load and test double */
-static int emu_ltdbr (int rx, int ry) {
+static int emu_ltdbr (struct pt_regs *regs, int rx, int ry) {
s390_fp_regs *fp_regs = ¤t->thread.fp_regs;
FP_DECL_D(DA);
FP_DECL_EX;
FP_UNPACK_DP(DA, &fp_regs->fprs[ry].d);
fp_regs->fprs[rx].ui = fp_regs->fprs[ry].ui;
- emu_set_CC_cs(DA_c, DA_s);
+ emu_set_CC_cs(regs, DA_c, DA_s);
return _fex;
}
/* Load and test double */
-static int emu_ltebr (int rx, int ry) {
+static int emu_ltebr (struct pt_regs *regs, int rx, int ry) {
s390_fp_regs *fp_regs = ¤t->thread.fp_regs;
FP_DECL_S(SA);
FP_DECL_EX;
FP_UNPACK_SP(SA, &fp_regs->fprs[ry].f);
fp_regs->fprs[rx].ui = fp_regs->fprs[ry].ui;
- emu_set_CC_cs(SA_c, SA_s);
+ emu_set_CC_cs(regs, SA_c, SA_s);
return _fex;
}
/* Load complement long double */
-static int emu_lcxbr (int rx, int ry) {
+static int emu_lcxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -670,12 +668,12 @@
FP_PACK_QP(&cvt.ld, QR);
current->thread.fp_regs.fprs[rx].ui = cvt.w.high;
current->thread.fp_regs.fprs[rx+2].ui = cvt.w.low;
- emu_set_CC_cs(QR_c, QR_s);
+ emu_set_CC_cs(regs, QR_c, QR_s);
return _fex;
}
/* Load complement double */
-static int emu_lcdbr (int rx, int ry) {
+static int emu_lcdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -684,12 +682,12 @@
FP_UNPACK_DP(DA, ¤t->thread.fp_regs.fprs[ry].d);
FP_NEG_D(DR, DA);
FP_PACK_DP(¤t->thread.fp_regs.fprs[rx].d, DR);
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Load complement float */
-static int emu_lcebr (int rx, int ry) {
+static int emu_lcebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -698,12 +696,12 @@
FP_UNPACK_SP(SA, ¤t->thread.fp_regs.fprs[ry].f);
FP_NEG_S(SR, SA);
FP_PACK_SP(¤t->thread.fp_regs.fprs[rx].f, SR);
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Load floating point integer long double */
-static int emu_fixbr (int rx, int ry, int mask) {
+static int emu_fixbr (struct pt_regs *regs, int rx, int ry, int mask) {
s390_fp_regs *fp_regs = ¤t->thread.fp_regs;
FP_DECL_Q(QA);
FP_DECL_EX;
@@ -728,7 +726,7 @@
}
/* Load floating point integer double */
-static int emu_fidbr (int rx, int ry, int mask) {
+static int emu_fidbr (struct pt_regs *regs, int rx, int ry, int mask) {
/* FIXME: rounding mode !! */
s390_fp_regs *fp_regs = ¤t->thread.fp_regs;
FP_DECL_D(DA);
@@ -749,7 +747,7 @@
}
/* Load floating point integer float */
-static int emu_fiebr (int rx, int ry, int mask) {
+static int emu_fiebr (struct pt_regs *regs, int rx, int ry, int mask) {
s390_fp_regs *fp_regs = ¤t->thread.fp_regs;
FP_DECL_S(SA);
FP_DECL_EX;
@@ -769,7 +767,7 @@
}
/* Load lengthened double to long double */
-static int emu_lxdbr (int rx, int ry) {
+static int emu_lxdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -785,7 +783,7 @@
}
/* Load lengthened double to long double */
-static int emu_lxdb (int rx, double *val) {
+static int emu_lxdb (struct pt_regs *regs, int rx, double *val) {
FP_DECL_D(DA); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -801,7 +799,7 @@
}
/* Load lengthened float to long double */
-static int emu_lxebr (int rx, int ry) {
+static int emu_lxebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -817,7 +815,7 @@
}
/* Load lengthened float to long double */
-static int emu_lxeb (int rx, float *val) {
+static int emu_lxeb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -833,7 +831,7 @@
}
/* Load lengthened float to double */
-static int emu_ldebr (int rx, int ry) {
+static int emu_ldebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -846,7 +844,7 @@
}
/* Load lengthened float to double */
-static int emu_ldeb (int rx, float *val) {
+static int emu_ldeb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -859,7 +857,7 @@
}
/* Load negative long double */
-static int emu_lnxbr (int rx, int ry) {
+static int emu_lnxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -880,12 +878,12 @@
current->thread.fp_regs.fprs[rx+2].ui =
current->thread.fp_regs.fprs[ry+2].ui;
}
- emu_set_CC_cs(QR_c, QR_s);
+ emu_set_CC_cs(regs, QR_c, QR_s);
return _fex;
}
/* Load negative double */
-static int emu_lndbr (int rx, int ry) {
+static int emu_lndbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -898,12 +896,12 @@
} else
current->thread.fp_regs.fprs[rx].ui =
current->thread.fp_regs.fprs[ry].ui;
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Load negative float */
-static int emu_lnebr (int rx, int ry) {
+static int emu_lnebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -916,12 +914,12 @@
} else
current->thread.fp_regs.fprs[rx].ui =
current->thread.fp_regs.fprs[ry].ui;
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Load positive long double */
-static int emu_lpxbr (int rx, int ry) {
+static int emu_lpxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -942,12 +940,12 @@
current->thread.fp_regs.fprs[rx+2].ui =
current->thread.fp_regs.fprs[ry+2].ui;
}
- emu_set_CC_cs(QR_c, QR_s);
+ emu_set_CC_cs(regs, QR_c, QR_s);
return _fex;
}
/* Load positive double */
-static int emu_lpdbr (int rx, int ry) {
+static int emu_lpdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -960,12 +958,12 @@
} else
current->thread.fp_regs.fprs[rx].ui =
current->thread.fp_regs.fprs[ry].ui;
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Load positive float */
-static int emu_lpebr (int rx, int ry) {
+static int emu_lpebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -978,12 +976,12 @@
} else
current->thread.fp_regs.fprs[rx].ui =
current->thread.fp_regs.fprs[ry].ui;
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Load rounded long double to double */
-static int emu_ldxbr (int rx, int ry) {
+static int emu_ldxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_D(DR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -999,7 +997,7 @@
}
/* Load rounded long double to float */
-static int emu_lexbr (int rx, int ry) {
+static int emu_lexbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_S(SR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -1015,7 +1013,7 @@
}
/* Load rounded double to float */
-static int emu_ledbr (int rx, int ry) {
+static int emu_ledbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1028,7 +1026,7 @@
}
/* Multiply long double */
-static int emu_mxbr (int rx, int ry) {
+static int emu_mxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QB); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -1049,7 +1047,7 @@
}
/* Multiply double */
-static int emu_mdbr (int rx, int ry) {
+static int emu_mdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1063,7 +1061,7 @@
}
/* Multiply double */
-static int emu_mdb (int rx, double *val) {
+static int emu_mdb (struct pt_regs *regs, int rx, double *val) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1077,7 +1075,7 @@
}
/* Multiply double to long double */
-static int emu_mxdbr (int rx, int ry) {
+static int emu_mxdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_Q(QA); FP_DECL_Q(QB); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -1096,7 +1094,7 @@
}
/* Multiply double to long double */
-static int emu_mxdb (int rx, long double *val) {
+static int emu_mxdb (struct pt_regs *regs, int rx, long double *val) {
FP_DECL_Q(QA); FP_DECL_Q(QB); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -1115,7 +1113,7 @@
}
/* Multiply float */
-static int emu_meebr (int rx, int ry) {
+static int emu_meebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1129,7 +1127,7 @@
}
/* Multiply float */
-static int emu_meeb (int rx, float *val) {
+static int emu_meeb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1143,7 +1141,7 @@
}
/* Multiply float to double */
-static int emu_mdebr (int rx, int ry) {
+static int emu_mdebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1159,7 +1157,7 @@
}
/* Multiply float to double */
-static int emu_mdeb (int rx, float *val) {
+static int emu_mdeb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1175,7 +1173,7 @@
}
/* Multiply and add double */
-static int emu_madbr (int rx, int ry, int rz) {
+static int emu_madbr (struct pt_regs *regs, int rx, int ry, int rz) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DC); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1191,7 +1189,7 @@
}
/* Multiply and add double */
-static int emu_madb (int rx, double *val, int rz) {
+static int emu_madb (struct pt_regs *regs, int rx, double *val, int rz) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DC); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1207,7 +1205,7 @@
}
/* Multiply and add float */
-static int emu_maebr (int rx, int ry, int rz) {
+static int emu_maebr (struct pt_regs *regs, int rx, int ry, int rz) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SC); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1223,7 +1221,7 @@
}
/* Multiply and add float */
-static int emu_maeb (int rx, float *val, int rz) {
+static int emu_maeb (struct pt_regs *regs, int rx, float *val, int rz) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SC); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1239,7 +1237,7 @@
}
/* Multiply and subtract double */
-static int emu_msdbr (int rx, int ry, int rz) {
+static int emu_msdbr (struct pt_regs *regs, int rx, int ry, int rz) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DC); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1255,7 +1253,7 @@
}
/* Multiply and subtract double */
-static int emu_msdb (int rx, double *val, int rz) {
+static int emu_msdb (struct pt_regs *regs, int rx, double *val, int rz) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DC); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1271,7 +1269,7 @@
}
/* Multiply and subtract float */
-static int emu_msebr (int rx, int ry, int rz) {
+static int emu_msebr (struct pt_regs *regs, int rx, int ry, int rz) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SC); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1287,7 +1285,7 @@
}
/* Multiply and subtract float */
-static int emu_mseb (int rx, float *val, int rz) {
+static int emu_mseb (struct pt_regs *regs, int rx, float *val, int rz) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SC); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1303,10 +1301,10 @@
}
/* Set floating point control word */
-static int emu_sfpc (int rx, int ry) {
+static int emu_sfpc (struct pt_regs *regs, int rx, int ry) {
__u32 temp;
- temp = current->thread.regs->gprs[rx];
+ temp = regs->gprs[rx];
if ((temp & ~FPC_VALID_MASK) != 0)
return SIGILL;
current->thread.fp_regs.fpc = temp;
@@ -1314,7 +1312,7 @@
}
/* Square root long double */
-static int emu_sqxbr (int rx, int ry) {
+static int emu_sqxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -1328,12 +1326,12 @@
FP_PACK_QP(&cvt.ld, QR);
current->thread.fp_regs.fprs[rx].ui = cvt.w.high;
current->thread.fp_regs.fprs[rx+2].ui = cvt.w.low;
- emu_set_CC_cs(QR_c, QR_s);
+ emu_set_CC_cs(regs, QR_c, QR_s);
return _fex;
}
/* Square root double */
-static int emu_sqdbr (int rx, int ry) {
+static int emu_sqdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1342,12 +1340,12 @@
FP_UNPACK_DP(DA, ¤t->thread.fp_regs.fprs[ry].d);
FP_SQRT_D(DR, DA);
FP_PACK_DP(¤t->thread.fp_regs.fprs[rx].d, DR);
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Square root double */
-static int emu_sqdb (int rx, double *val) {
+static int emu_sqdb (struct pt_regs *regs, int rx, double *val) {
FP_DECL_D(DA); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1356,12 +1354,12 @@
FP_UNPACK_DP(DA, val);
FP_SQRT_D(DR, DA);
FP_PACK_DP(¤t->thread.fp_regs.fprs[rx].d, DR);
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Square root float */
-static int emu_sqebr (int rx, int ry) {
+static int emu_sqebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1370,12 +1368,12 @@
FP_UNPACK_SP(SA, ¤t->thread.fp_regs.fprs[ry].f);
FP_SQRT_S(SR, SA);
FP_PACK_SP(¤t->thread.fp_regs.fprs[rx].f, SR);
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Square root float */
-static int emu_sqeb (int rx, float *val) {
+static int emu_sqeb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1384,12 +1382,12 @@
FP_UNPACK_SP(SA, val);
FP_SQRT_S(SR, SA);
FP_PACK_SP(¤t->thread.fp_regs.fprs[rx].f, SR);
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Subtract long double */
-static int emu_sxbr (int rx, int ry) {
+static int emu_sxbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_Q(QA); FP_DECL_Q(QB); FP_DECL_Q(QR);
FP_DECL_EX;
mathemu_ldcv cvt;
@@ -1406,12 +1404,12 @@
FP_PACK_QP(&cvt.ld, QR);
current->thread.fp_regs.fprs[rx].ui = cvt.w.high;
current->thread.fp_regs.fprs[rx+2].ui = cvt.w.low;
- emu_set_CC_cs(QR_c, QR_s);
+ emu_set_CC_cs(regs, QR_c, QR_s);
return _fex;
}
/* Subtract double */
-static int emu_sdbr (int rx, int ry) {
+static int emu_sdbr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1421,12 +1419,12 @@
FP_UNPACK_DP(DB, ¤t->thread.fp_regs.fprs[ry].d);
FP_SUB_D(DR, DA, DB);
FP_PACK_DP(¤t->thread.fp_regs.fprs[rx].d, DR);
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Subtract double */
-static int emu_sdb (int rx, double *val) {
+static int emu_sdb (struct pt_regs *regs, int rx, double *val) {
FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
FP_DECL_EX;
int mode;
@@ -1436,12 +1434,12 @@
FP_UNPACK_DP(DB, val);
FP_SUB_D(DR, DA, DB);
FP_PACK_DP(¤t->thread.fp_regs.fprs[rx].d, DR);
- emu_set_CC_cs(DR_c, DR_s);
+ emu_set_CC_cs(regs, DR_c, DR_s);
return _fex;
}
/* Subtract float */
-static int emu_sebr (int rx, int ry) {
+static int emu_sebr (struct pt_regs *regs, int rx, int ry) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1451,12 +1449,12 @@
FP_UNPACK_SP(SB, ¤t->thread.fp_regs.fprs[ry].f);
FP_SUB_S(SR, SA, SB);
FP_PACK_SP(¤t->thread.fp_regs.fprs[rx].f, SR);
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Subtract float */
-static int emu_seb (int rx, float *val) {
+static int emu_seb (struct pt_regs *regs, int rx, float *val) {
FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
FP_DECL_EX;
int mode;
@@ -1466,12 +1464,12 @@
FP_UNPACK_SP(SB, val);
FP_SUB_S(SR, SA, SB);
FP_PACK_SP(¤t->thread.fp_regs.fprs[rx].f, SR);
- emu_set_CC_cs(SR_c, SR_s);
+ emu_set_CC_cs(regs, SR_c, SR_s);
return _fex;
}
/* Test data class long double */
-static int emu_tcxb (int rx, long val) {
+static int emu_tcxb (struct pt_regs *regs, int rx, long val) {
FP_DECL_Q(QA);
mathemu_ldcv cvt;
int bit;
@@ -1500,12 +1498,12 @@
}
if (!QA_s)
bit++;
- emu_set_CC(((__u32) val >> bit) & 1);
+ emu_set_CC(regs, ((__u32) val >> bit) & 1);
return 0;
}
/* Test data class double */
-static int emu_tcdb (int rx, long val) {
+static int emu_tcdb (struct pt_regs *regs, int rx, long val) {
FP_DECL_D(DA);
int bit;
@@ -1531,12 +1529,12 @@
}
if (!DA_s)
bit++;
- emu_set_CC(((__u32) val >> bit) & 1);
+ emu_set_CC(regs, ((__u32) val >> bit) & 1);
return 0;
}
/* Test data class float */
-static int emu_tceb (int rx, long val) {
+static int emu_tceb (struct pt_regs *regs, int rx, long val) {
FP_DECL_S(SA);
int bit;
@@ -1562,7 +1560,7 @@
}
if (!SA_s)
bit++;
- emu_set_CC(((__u32) val >> bit) & 1);
+ emu_set_CC(regs, ((__u32) val >> bit) & 1);
return 0;
}
@@ -1666,8 +1664,9 @@
emu_store_regd(opcode[3] & 15);
emu_store_regd((opcode[3] & 15) + 2);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *,int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_regd((opcode[3] >> 4) & 15);
emu_load_regd(((opcode[3] >> 4) & 15) + 2);
emu_load_regd(opcode[3] & 15);
@@ -1677,8 +1676,9 @@
emu_store_regd((opcode[3] >> 4) & 15);
emu_store_regd(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_regd((opcode[3] >> 4) & 15);
emu_load_regd(opcode[3] & 15);
break;
@@ -1686,8 +1686,9 @@
emu_store_rege((opcode[3] >> 4) & 15);
emu_store_rege(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_rege((opcode[3] >> 4) & 15);
emu_load_rege(opcode[3] & 15);
break;
@@ -1699,8 +1700,9 @@
emu_store_regd(opcode[3] & 15);
emu_store_regd((opcode[3] & 15) + 2);
/* call the emulation function */
- _fex = ((int (*)(int, int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
+ _fex = ((int (*)(struct pt_regs *, int, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
emu_load_regd((opcode[3] >> 4) & 15);
emu_load_regd(((opcode[3] >> 4) & 15) + 2);
emu_load_regd(opcode[3] & 15);
@@ -1711,8 +1713,9 @@
emu_store_regd((opcode[3] >> 4) & 15);
emu_store_regd(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
+ _fex = ((int (*)(struct pt_regs *, int, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
emu_load_regd((opcode[2] >> 4) & 15);
emu_load_regd((opcode[3] >> 4) & 15);
emu_load_regd(opcode[3] & 15);
@@ -1722,8 +1725,9 @@
emu_store_rege((opcode[3] >> 4) & 15);
emu_store_rege(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
+ _fex = ((int (*)(struct pt_regs *, int, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
emu_load_rege((opcode[2] >> 4) & 15);
emu_load_rege((opcode[3] >> 4) & 15);
emu_load_rege(opcode[3] & 15);
@@ -1732,21 +1736,24 @@
/* call the emulation function */
if (opcode[3] & 0x20)
return SIGILL;
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_regd((opcode[3] >> 4) & 15);
emu_load_regd(((opcode[3] >> 4) & 15) + 2);
break;
case 8: /* RRE format, cdfbr instruction */
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_regd((opcode[3] >> 4) & 15);
break;
case 9: /* RRE format, cefbr instruction */
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_rege((opcode[3] >> 4) & 15);
break;
case 10: /* RRF format, cfxbr instruction */
@@ -1758,8 +1765,9 @@
emu_store_regd(opcode[3] & 15);
emu_store_regd((opcode[3] & 15) + 2);
/* call the emulation function */
- _fex = ((int (*)(int, int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
+ _fex = ((int (*)(struct pt_regs *, int, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
break;
case 11: /* RRF format, cfdbr instruction */
if ((opcode[2] & 128) == 128 || (opcode[2] & 96) == 32)
@@ -1767,8 +1775,9 @@
return SIGILL;
emu_store_regd(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
+ _fex = ((int (*)(struct pt_regs *, int, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
break;
case 12: /* RRF format, cfebr instruction */
if ((opcode[2] & 128) == 128 || (opcode[2] & 96) == 32)
@@ -1776,8 +1785,9 @@
return SIGILL;
emu_store_rege(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
+ _fex = ((int (*)(struct pt_regs *, int, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15, opcode[2] >> 4);
break;
case 13: /* RRE format, ldxbr & mdxbr instruction */
/* double store but long double load */
@@ -1786,8 +1796,9 @@
emu_store_regd((opcode[3] >> 4) & 15);
emu_store_regd(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_regd((opcode[3] >> 4) & 15);
emu_load_regd(((opcode[3] >> 4) & 15) + 2);
break;
@@ -1798,8 +1809,9 @@
emu_store_rege((opcode[3] >> 4) & 15);
emu_store_rege(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_regd((opcode[3] >> 4) & 15);
emu_load_regd(((opcode[3] >> 4) & 15) + 2);
break;
@@ -1808,8 +1820,9 @@
emu_store_rege((opcode[3] >> 4) & 15);
emu_store_rege(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_regd((opcode[3] >> 4) & 15);
break;
case 16: /* RRE format, ldxbr instruction */
@@ -1819,8 +1832,9 @@
emu_store_regd(opcode[3] & 15);
emu_store_regd((opcode[3] & 15) + 2);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_regd((opcode[3] >> 4) & 15);
break;
case 17: /* RRE format, ldxbr instruction */
@@ -1830,22 +1844,25 @@
emu_store_regd(opcode[3] & 15);
emu_store_regd((opcode[3] & 15) + 2);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_rege((opcode[3] >> 4) & 15);
break;
case 18: /* RRE format, ledbr instruction */
/* double store but float load */
emu_store_regd(opcode[3] & 15);
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
emu_load_rege((opcode[3] >> 4) & 15);
break;
case 19: /* RRE format, efpc & sfpc instruction */
/* call the emulation function */
- _fex = ((int (*)(int, int)) jump_table[opcode[1]])
- (opcode[3] >> 4, opcode[3] & 15);
+ _fex = ((int (*)(struct pt_regs *, int, int))
+ jump_table[opcode[1]])
+ (regs, opcode[3] >> 4, opcode[3] & 15);
break;
default: /* invalid operation */
return SIGILL;
@@ -1904,8 +1921,9 @@
dxb = (__u64 *) calc_addr(regs, opc >> 16, opc >> 12, opc);
mathemu_copy_from_user(&temp, dxb, 8);
/* call the emulation function */
- _fex = ((int (*)(int, double *)) jump_table[opcode[5]])
- (opcode[1] >> 4, (double *) &temp);
+ _fex = ((int (*)(struct pt_regs *, int, double *))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, (double *) &temp);
emu_load_regd((opcode[1] >> 4) & 15);
break;
}
@@ -1918,8 +1936,9 @@
dxb = (__u32 *) calc_addr(regs, opc >> 16, opc >> 12, opc);
mathemu_get_user(temp, dxb);
/* call the emulation function */
- _fex = ((int (*)(int, float *)) jump_table[opcode[5]])
- (opcode[1] >> 4, (float *) &temp);
+ _fex = ((int (*)(struct pt_regs *, int, float *))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, (float *) &temp);
emu_load_rege((opcode[1] >> 4) & 15);
break;
}
@@ -1933,8 +1952,9 @@
dxb = (__u64 *) calc_addr(regs, opc >> 16, opc >> 12, opc);
mathemu_copy_from_user(&temp, dxb, 8);
/* call the emulation function */
- _fex = ((int (*)(int, double *, int)) jump_table[opcode[5]])
- (opcode[1] >> 4, (double *) &temp, opcode[4] >> 4);
+ _fex = ((int (*)(struct pt_regs *, int, double *, int))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, (double *) &temp, opcode[4] >> 4);
emu_load_regd((opcode[1] >> 4) & 15);
break;
}
@@ -1948,8 +1968,9 @@
dxb = (__u32 *) calc_addr(regs, opc >> 16, opc >> 12, opc);
mathemu_get_user(temp, dxb);
/* call the emulation function */
- _fex = ((int (*)(int, float *, int)) jump_table[opcode[5]])
- (opcode[1] >> 4, (float *) &temp, opcode[4] >> 4);
+ _fex = ((int (*)(struct pt_regs *, int, float *, int))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, (float *) &temp, opcode[4] >> 4);
emu_load_rege((opcode[4] >> 4) & 15);
break;
}
@@ -1965,8 +1986,9 @@
dxb = (__u64 *) calc_addr(regs, opc >> 16, opc >> 12, opc);
mathemu_copy_from_user(&temp, dxb, 8);
/* call the emulation function */
- _fex = ((int (*)(int, double *)) jump_table[opcode[5]])
- (opcode[1] >> 4, (double *) &temp);
+ _fex = ((int (*)(struct pt_regs *, int, double *))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, (double *) &temp);
emu_load_regd((opcode[1] >> 4) & 15);
emu_load_regd(((opcode[1] >> 4) & 15) + 2);
break;
@@ -1981,8 +2003,9 @@
dxb = (__u32 *) calc_addr(regs, opc >> 16, opc >> 12, opc);
mathemu_get_user(temp, dxb);
/* call the emulation function */
- _fex = ((int (*)(int, float *)) jump_table[opcode[5]])
- (opcode[1] >> 4, (float *) &temp);
+ _fex = ((int (*)(struct pt_regs *, int, float *))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, (float *) &temp);
emu_load_regd((opcode[1] >> 4) & 15);
break;
}
@@ -1998,8 +2021,9 @@
dxb = (__u32 *) calc_addr(regs, opc >> 16, opc >> 12, opc);
mathemu_get_user(temp, dxb);
/* call the emulation function */
- _fex = ((int (*)(int, float *)) jump_table[opcode[5]])
- (opcode[1] >> 4, (float *) &temp);
+ _fex = ((int (*)(struct pt_regs *, int, float *))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, (float *) &temp);
emu_load_regd((opcode[1] >> 4) & 15);
emu_load_regd(((opcode[1] >> 4) & 15) + 2);
break;
@@ -2012,8 +2036,9 @@
opc = *((__u32 *) opcode);
dxb = (__u64) calc_addr(regs, opc >> 16, opc >> 12, opc);
/* call the emulation function */
- _fex = ((int (*)(int, long)) jump_table[opcode[5]])
- (opcode[1] >> 4, dxb);
+ _fex = ((int (*)(struct pt_regs *, int, long))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, dxb);
break;
}
case 9: /* RXE format, RX address used as int value */ {
@@ -2024,8 +2049,9 @@
opc = *((__u32 *) opcode);
dxb = (__u64) calc_addr(regs, opc >> 16, opc >> 12, opc);
/* call the emulation function */
- _fex = ((int (*)(int, long)) jump_table[opcode[5]])
- (opcode[1] >> 4, dxb);
+ _fex = ((int (*)(struct pt_regs *, int, long))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, dxb);
break;
}
case 10: /* RXE format, RX address used as int value */ {
@@ -2039,8 +2065,9 @@
opc = *((__u32 *) opcode);
dxb = (__u64) calc_addr(regs, opc >> 16, opc >> 12, opc);
/* call the emulation function */
- _fex = ((int (*)(int, long)) jump_table[opcode[5]])
- (opcode[1] >> 4, dxb);
+ _fex = ((int (*)(struct pt_regs *, int, long))
+ jump_table[opcode[5]])
+ (regs, opcode[1] >> 4, dxb);
break;
}
default: /* invalid operation */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)