From owner-p4-projects@FreeBSD.ORG Tue Jul 17 09:26:22 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65D49106566C; Tue, 17 Jul 2012 09:26:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0D1961065675 for ; Tue, 17 Jul 2012 09:26:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E47F88FC1F for ; Tue, 17 Jul 2012 09:26:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q6H9QKUM039920 for ; Tue, 17 Jul 2012 09:26:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q6H9QKoQ039917 for perforce@freebsd.org; Tue, 17 Jul 2012 09:26:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 17 Jul 2012 09:26:20 GMT Message-Id: <201207170926.q6H9QKoQ039917@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 214504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jul 2012 09:26:22 -0000 http://p4web.freebsd.org/@@214504?ac=10 Change 214504 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/07/17 09:26:10 Merge CHERI assembler enhancements from CTSRD-CHERI/binutils: commit 7248f6e0b1e1262bebc404c50ac618e6f7d9c60e Author: Steven Murdoch Date: Thu Jul 5 14:41:05 2012 +0100 Use indexed notation when instructions have an offset value or register cscr, clcr cl[bhwd] cl[bhwd]r cs[bhwd] cs[bhwd]r cjr cjalr Affected files ... .. //depot/projects/ctsrd/cheribsd/src/contrib/binutils/gas/config/tc-mips.c#3 edit .. //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#5 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/contrib/binutils/gas/config/tc-mips.c#3 (text+ko) ==== @@ -8796,6 +8796,8 @@ s += strspn (s, " \t"); is_mdmx = 0; + /* Switch on first character of operand (+ options are handled by + a nested case statement, inside this switch) */ switch (*args) { case '\0': /* end of args */ @@ -9055,7 +9057,8 @@ /* This is dependent on the next operand specifier is a base register specification. */ assert (args[1] == 'b' || args[1] == '5' - || args[1] == '-' || args[1] == '4'); + || args[1] == '-' || args[1] == '4' + || (args[1] == '+' && args[2] == 'b')); if (*s == '\0') return; ==== //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#5 (text+ko) ==== @@ -200,26 +200,26 @@ {"cdeclen", "+w,+b,m", 0x48800000, 0xffe0003f, 0, 0, I1 }, /* DEPRECATED */ {"cdecleng","+w,+b,m", 0x48800000, 0xffe0003f, 0, 0, I1 }, /* DEPRECATED */ {"candperm","+w,+b,m", 0x48800006, 0xffe0003f, 0, 0, I1 }, -{"cscr", "+w,+b,m", 0x49200000, 0xffe0003f, 0, 0, I1 }, -{"clcr", "+w,+b,m", 0x49400000, 0xffe0003f, 0, 0, I1 }, -{"clb", "t,+b,+o", 0x4a000000, 0xffe00000, 0, 0, I1 }, -{"clh", "t,+b,+o", 0x4a200000, 0xffe00000, 0, 0, I1 }, -{"clw", "t,+b,+o", 0x4a400000, 0xffe00000, 0, 0, I1 }, -{"cld", "t,+b,+o", 0x4a600000, 0xffe00000, 0, 0, I1 }, -{"clbr", "t,+b,m", 0x4a800000, 0xffe0003f, 0, 0, I1 }, -{"clhr", "t,+b,m", 0x4aa00000, 0xffe0003f, 0, 0, I1 }, -{"clwr", "t,+b,m", 0x4ac00000, 0xffe0003f, 0, 0, I1 }, -{"cldr", "t,+b,m", 0x4ae00000, 0xffe0003f, 0, 0, I1 }, -{"csb", "t,+b,+o", 0x4b000000, 0xffe00000, 0, 0, I1 }, -{"csh", "t,+b,+o", 0x4b200000, 0xffe00000, 0, 0, I1 }, -{"csw", "t,+b,+o", 0x4b400000, 0xffe00000, 0, 0, I1 }, -{"csd", "t,+b,+o", 0x4b600000, 0xffe00000, 0, 0, I1 }, -{"csbr", "t,+b,m", 0x4b800000, 0xffe0003f, 0, 0, I1 }, -{"cshr", "t,+b,m", 0x4ba00000, 0xffe0003f, 0, 0, I1 }, -{"cswr", "t,+b,m", 0x4bc00000, 0xffe0003f, 0, 0, I1 }, -{"csdr", "t,+b,m", 0x4be00000, 0xffe0003f, 0, 0, I1 }, -{"cjr", "+b,m", 0x49000000, 0xffff003f, 0, 0, I1 }, -{"cjalr", "+b,m", 0x48e00000, 0xffff003f, 0, 0, I1 }, +{"cscr", "+w,m(+b)", 0x49200000, 0xffe0003f, 0, 0, I1 }, +{"clcr", "+w,m(+b)", 0x49400000, 0xffe0003f, 0, 0, I1 }, +{"clb", "t,+o(+b)", 0x4a000000, 0xffe00000,0, 0, I1 }, +{"clh", "t,+o(+b)", 0x4a200000, 0xffe00000, 0, 0, I1 }, +{"clw", "t,+o(+b)", 0x4a400000, 0xffe00000, 0, 0, I1 }, +{"cld", "t,+o(+b)", 0x4a600000, 0xffe00000, 0, 0, I1 }, +{"clbr", "t,m(+b)", 0x4a800000, 0xffe0003f, 0, 0, I1 }, +{"clhr", "t,m(+b)", 0x4aa00000, 0xffe0003f, 0, 0, I1 }, +{"clwr", "t,m(+b)", 0x4ac00000, 0xffe0003f, 0, 0, I1 }, +{"cldr", "t,m(+b)", 0x4ae00000, 0xffe0003f, 0, 0, I1 }, +{"csb", "t,+o(+b)", 0x4b000000, 0xffe00000, 0, 0, I1 }, +{"csh", "t,+o(+b)", 0x4b200000, 0xffe00000, 0, 0, I1 }, +{"csw", "t,+o(+b)", 0x4b400000, 0xffe00000, 0, 0, I1 }, +{"csd", "t,+o(+b)", 0x4b600000, 0xffe00000, 0, 0, I1 }, +{"csbr", "t,m(+b)", 0x4b800000, 0xffe0003f, 0, 0, I1 }, +{"cshr", "t,m(+b)", 0x4ba00000, 0xffe0003f, 0, 0, I1 }, +{"cswr", "t,m(+b)", 0x4bc00000, 0xffe0003f, 0, 0, I1 }, +{"csdr", "t,m(+b)", 0x4be00000, 0xffe0003f, 0, 0, I1 }, +{"cjr", "m(+b)", 0x49000000, 0xffff003f, 0, 0, I1 }, +{"cjalr", "m(+b)", 0x48e00000, 0xffff003f, 0, 0, I1 }, {"csealcode","+w,+b", 0x48200000, 0xffe007ff, 0, 0, I1 }, {"csealdata","+w,+b,+v",0x48400000, 0xffe0003f, 0, 0, I1 }, {"cunseal", "+w,+b,+v", 0x48600000, 0xffe0003f, 0, 0, I1 },