|
@@ -436,24 +436,26 @@ extern void sun4v_data_access_exception(struct pt_regs *regs,
|
|
|
int handle_ldf_stq(u32 insn, struct pt_regs *regs)
|
|
|
{
|
|
|
unsigned long addr = compute_effective_address(regs, insn, 0);
|
|
|
- int freg = ((insn >> 25) & 0x1e) | ((insn >> 20) & 0x20);
|
|
|
+ int freg;
|
|
|
struct fpustate *f = FPUSTATE;
|
|
|
int asi = decode_asi(insn, regs);
|
|
|
- int flag = (freg < 32) ? FPRS_DL : FPRS_DU;
|
|
|
+ int flag;
|
|
|
|
|
|
perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, regs, 0);
|
|
|
|
|
|
save_and_clear_fpu();
|
|
|
current_thread_info()->xfsr[0] &= ~0x1c000;
|
|
|
- if (freg & 3) {
|
|
|
- current_thread_info()->xfsr[0] |= (6 << 14) /* invalid_fp_register */;
|
|
|
- do_fpother(regs);
|
|
|
- return 0;
|
|
|
- }
|
|
|
if (insn & 0x200000) {
|
|
|
/* STQ */
|
|
|
u64 first = 0, second = 0;
|
|
|
|
|
|
+ freg = ((insn >> 25) & 0x1e) | ((insn >> 20) & 0x20);
|
|
|
+ flag = (freg < 32) ? FPRS_DL : FPRS_DU;
|
|
|
+ if (freg & 3) {
|
|
|
+ current_thread_info()->xfsr[0] |= (6 << 14) /* invalid_fp_register */;
|
|
|
+ do_fpother(regs);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
if (current_thread_info()->fpsaved[0] & flag) {
|
|
|
first = *(u64 *)&f->regs[freg];
|
|
|
second = *(u64 *)&f->regs[freg+2];
|
|
@@ -513,6 +515,12 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs)
|
|
|
case 0x100000: size = 4; break;
|
|
|
default: size = 2; break;
|
|
|
}
|
|
|
+ if (size == 1)
|
|
|
+ freg = (insn >> 25) & 0x1f;
|
|
|
+ else
|
|
|
+ freg = ((insn >> 25) & 0x1e) | ((insn >> 20) & 0x20);
|
|
|
+ flag = (freg < 32) ? FPRS_DL : FPRS_DU;
|
|
|
+
|
|
|
for (i = 0; i < size; i++)
|
|
|
data[i] = 0;
|
|
|
|