Date: Sun, 29 Sep 2013 09:28:51 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 890770 for review Message-ID: <201309290928.r8T9Sp3w017459@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@890770?ac=10 Change 890770 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/29 09:28:44 Prefer FreeBSD macro for daddiu. Replace an incorrect csc with a more correct clc when popping PCC from the trusted stack. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/ccall.S#7 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/ccall.S#7 (text+ko) ==== @@ -126,7 +126,7 @@ /* Push PC + 4 */ MFC0 k0, MIPS_COP_0_EXC_PC - daddiu k0, 4 + PTR_ADDU k0, k0, 4 csd k0, k1, U_CHERI_STACK_PC(CHERI_REG_KDC) /* @@ -184,7 +184,7 @@ clc CHERI_REG_IDC, k1, U_CHERI_STACK_IDC(CHERI_REG_KDC) /* Pop PCC. */ - csc CHERI_REG_EPCC, k1, U_CHERI_STACK_PCC(CHERI_REG_KDC) + clc CHERI_REG_EPCC, k1, U_CHERI_STACK_PCC(CHERI_REG_KDC) /* Pop PC + padding; +4 increment already done. */ cld k0, k1, U_CHERI_STACK_PC(CHERI_REG_KDC)help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309290928.r8T9Sp3w017459>