svn commit: r231314 - head/sys/mips/mips

Oleksandr Tymoshenko gonzo at FreeBSD.org
Thu Feb 9 22:48:35 UTC 2012


Author: gonzo
Date: Thu Feb  9 22:48:35 2012
New Revision: 231314
URL: http://svn.freebsd.org/changeset/base/231314

Log:
  Fix n32 build breakage

Modified:
  head/sys/mips/mips/trap.c

Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c	Thu Feb  9 22:34:16 2012	(r231313)
+++ head/sys/mips/mips/trap.c	Thu Feb  9 22:48:35 2012	(r231314)
@@ -765,7 +765,7 @@ dofault:
 	case T_RES_INST + T_USER:
 		{
 			InstFmt inst;
-			inst = *(InstFmt *)trapframe->pc;
+			inst = *(InstFmt *)(intptr_t)trapframe->pc;
 			switch (inst.RType.op) {
 			case OP_SPECIAL3:
 				switch (inst.RType.func) {
@@ -773,7 +773,7 @@ dofault:
 					/* Register 29 used for TLS */
 					if (inst.RType.rd == 29) {
 						frame_regs = &(trapframe->zero);
-						frame_regs[inst.RType.rt] = (register_t)td->td_md.md_tls;
+						frame_regs[inst.RType.rt] = (register_t)(intptr_t)td->td_md.md_tls;
 						trapframe->pc += sizeof(int);
 						goto out;
 					}


More information about the svn-src-all mailing list