d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix debug printfs in FPU_EMU to compile on powerpc64 and enable it for

Browse Source 
powerpc64.  This fixes the LINT64 kernel config.

Approved by:	nwhitehorn (the idea, not the actual patch)
This commit is contained in:
John Baldwin 2013-12-05 21:49:14 +00:00
parent f5dfbe2f69
commit 43fdca95b6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=259010
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/conf/files.powerpc
View File

@ -106,15 +106,15 @@ powerpc/booke/pmap.c optional booke
powerpc/booke/trap.c optional booke
powerpc/cpufreq/dfs.c optional cpufreq
powerpc/cpufreq/pcr.c optional cpufreq aim
powerpc/fpu/fpu_add.c optional fpu_emu powerpc
powerpc/fpu/fpu_compare.c optional fpu_emu powerpc
powerpc/fpu/fpu_div.c optional fpu_emu powerpc
powerpc/fpu/fpu_emu.c optional fpu_emu powerpc
powerpc/fpu/fpu_explode.c optional fpu_emu powerpc
powerpc/fpu/fpu_implode.c optional fpu_emu powerpc
powerpc/fpu/fpu_mul.c optional fpu_emu powerpc
powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc
powerpc/fpu/fpu_subr.c optional fpu_emu powerpc
powerpc/fpu/fpu_add.c optional fpu_emu
powerpc/fpu/fpu_compare.c optional fpu_emu
powerpc/fpu/fpu_div.c optional fpu_emu
powerpc/fpu/fpu_emu.c optional fpu_emu
powerpc/fpu/fpu_explode.c optional fpu_emu
powerpc/fpu/fpu_implode.c optional fpu_emu
powerpc/fpu/fpu_mul.c optional fpu_emu
powerpc/fpu/fpu_sqrt.c optional fpu_emu
powerpc/fpu/fpu_subr.c optional fpu_emu
powerpc/mambo/mambocall.S optional mambo
powerpc/mambo/mambo.c optional mambo
powerpc/mambo/mambo_console.c optional mambo

21
sys/powerpc/fpu/fpu_emu.c
View File

@ -326,8 +326,10 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
/* Store as integer */
ra = instr.i_x.i_ra;
rb = instr.i_x.i_rb;
DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n",
ra, tf->fixreg[ra], rb, tf->fixreg[rb]));
DPRINTF(FPE_INSN,
("reg %d has %jx reg %d has %jx\n",
ra, (uintmax_t)tf->fixreg[ra], rb,
(uintmax_t)tf->fixreg[rb]));
addr = tf->fixreg[rb];
if (ra != 0)
@ -356,8 +358,9 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
/* calculate EA of load/store */
ra = instr.i_x.i_ra;
rb = instr.i_x.i_rb;
DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n",
ra, tf->fixreg[ra], rb, tf->fixreg[rb]));
DPRINTF(FPE_INSN, ("reg %d has %jx reg %d has %jx\n",
ra, (uintmax_t)tf->fixreg[ra], rb,
(uintmax_t)tf->fixreg[rb]));
addr = tf->fixreg[rb];
if (ra != 0)
addr += tf->fixreg[ra];
@ -373,8 +376,9 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
/* calculate EA of load/store */
ra = instr.i_d.i_ra;
addr = instr.i_d.i_d;
DPRINTF(FPE_INSN, ("reg %d has %x displ %x\n",
ra, tf->fixreg[ra], addr));
DPRINTF(FPE_INSN, ("reg %d has %jx displ %jx\n",
ra, (uintmax_t)tf->fixreg[ra],
(uintmax_t)addr));
if (ra != 0)
addr += tf->fixreg[ra];
rt = instr.i_d.i_rt;
@ -420,7 +424,7 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
return (0);
#ifdef notyet
} else if (instr.i_any.i_opcd == OPC_load_st_62) {
/* These are 64-bit extenstions */
/* These are 64-bit extensions */
return (NOTFPU);
#endif
} else if (instr.i_any.i_opcd == OPC_sp_fp_59 ||
@ -784,7 +788,8 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
/* Move fpu condition codes to cr[1] */
tf->cr &= ~(0xf0000000>>bf);
tf->cr |= (cond>>bf);
DPRINTF(FPE_INSN, ("fpu_execute: cr[%d] (cr=%x) <= %x\n", bf/4, tf->cr, cond));
DPRINTF(FPE_INSN, ("fpu_execute: cr[%d] (cr=%jx) <= %x\n",
bf/4, (uintmax_t)tf->cr, cond));
}
((int *)&fs->fpscr)[1] = fsr;