shithub: riscv

Download patch

ref: bd510d7fb0f1fd312319be4d9fd37a9c4bb5169a
parent: a0da5b973ffa098e428c574104e270b600770f9a
author: cinap_lenrek <[email protected]>
date: Sun Apr 21 23:05:51 EDT 2019

7l: there is no BIC* $bimm variant

--- a/sys/src/cmd/7l/asmout.c
+++ b/sys/src/cmd/7l/asmout.c
@@ -708,7 +708,7 @@
 		o1 |= (p->from.offset&0x7F)<<5;
 		break;
 
-	case 53:	/* and/or/eor/bic/... $bimmN, Rn, Rd -> op (N,r,s), Rn, Rd */
+	case 53:	/* and/or/eor... $bimmN, Rn, Rd -> op (N,r,s), Rn, Rd */
 		as = p->as;
 		rt = p->to.reg;
 		r = p->reg;
@@ -1169,7 +1169,7 @@
 	case ASUBSW:	return S32 | 1<<30 | 1<<29 | 0x11<<24;
 
 	/* op $imm(SB), Rd; op label, Rd */
-	case AADR:		return 0<<31 | 0x10<<24;
+	case AADR:	return 0<<31 | 0x10<<24;
 	case AADRP:	return 1<<31 | 0x10<<24;
 
 	/* op $bimm, Rn, Rd */
@@ -1235,7 +1235,7 @@
 
 	case ADSB:	return SYSOP(0,0,3,3,0,4,0x1F);
 	case ADMB:	return SYSOP(0,0,3,3,0,5,0x1F);
-	case AISB:		return SYSOP(0,0,3,3,0,6,0x1F);
+	case AISB:	return SYSOP(0,0,3,3,0,6,0x1F);
 	case AHINT:	return SYSOP(0,0,3,2,0,0,0x1F);
 
 	}
--- a/sys/src/cmd/7l/optab.c
+++ b/sys/src/cmd/7l/optab.c
@@ -54,10 +54,6 @@
 	{ AANDW,	C_BITCON32,C_REG,C_REG,		53, 4, 0 },
 	{ AAND,		C_BITCON64,C_NONE,C_REG,	53, 4, 0 },
 	{ AANDW,	C_BITCON32,C_NONE,C_REG,	53, 4, 0 },
-	{ ABIC,		C_BITCON64,C_REG,C_REG,		53, 4, 0 },
-	{ ABICW,	C_BITCON32,C_REG,C_REG,		53, 4, 0 },
-	{ ABIC,		C_BITCON64,C_NONE,C_REG,	53, 4, 0 },
-	{ ABICW,	C_BITCON32,C_NONE,C_REG,	53, 4, 0 },
 
 	{ AAND,		C_LCON,	C_REG,	C_REG,		28, 8, 0,	LFROM },
 	{ AANDW,	C_LCON,	C_REG,	C_REG,		28, 8, 0,	LFROM },