diff options
| author | Paul E. Murphy <murp@ibm.com> | 2022-07-07 14:26:31 -0500 |
|---|---|---|
| committer | Paul Murphy <murp@ibm.com> | 2022-11-16 20:18:50 +0000 |
| commit | e6eaf39cfaf253ebaff7fff3737f0f1d91024345 (patch) | |
| tree | 3a1ca298f2dcbeb54c165f811f3a1107dfef2d19 /src/cmd | |
| parent | cd9d26f0da769c5644ab7956433991385259ee0a (diff) | |
| download | go-e6eaf39cfaf253ebaff7fff3737f0f1d91024345.tar.xz | |
cmd/internal/obj/ppc64: add ISA 3.1B opcodes
A few new opcodes are added to support ROP mitigation on
Power10.
Change-Id: I13045aebc0b6fb09c64dc234ee5741318670d7ff
Reviewed-on: https://go-review.googlesource.com/c/go/+/425597
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Run-TryBot: Paul Murphy <murp@ibm.com>
Reviewed-by: Lynn Boger <laboger@linux.vnet.ibm.com>
Reviewed-by: Joedian Reid <joedian@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/asm/internal/asm/testdata/ppc64_p10.s | 7 | ||||
| -rw-r--r-- | src/cmd/internal/obj/ppc64/asm9_gtables.go | 44 |
2 files changed, 51 insertions, 0 deletions
diff --git a/src/cmd/asm/internal/asm/testdata/ppc64_p10.s b/src/cmd/asm/internal/asm/testdata/ppc64_p10.s index 4573ecba3a..c0a22aaca1 100644 --- a/src/cmd/asm/internal/asm/testdata/ppc64_p10.s +++ b/src/cmd/asm/internal/asm/testdata/ppc64_p10.s @@ -263,4 +263,11 @@ TEXT asmtest(SB), DUPOK|NOSPLIT, $0 XXSPLTI32DX $1, $1234, VS3 // 05000000806204d2 XXSPLTIDP $12345678, VS4 // 050000bc8084614e XXSPLTIW $123456, VS3 // 050000018066e240 + + // ISA 3.1B + HASHST R2, -8(R1) // 7fe115a5 + HASHSTP R2, -8(R1) // 7fe11525 + HASHCHK -8(R1), R2 // 7fe115e5 + HASHCHKP -8(R1), R2 // 7fe11565 + RET diff --git a/src/cmd/internal/obj/ppc64/asm9_gtables.go b/src/cmd/internal/obj/ppc64/asm9_gtables.go index 938fbaa313..953b148013 100644 --- a/src/cmd/internal/obj/ppc64/asm9_gtables.go +++ b/src/cmd/internal/obj/ppc64/asm9_gtables.go @@ -188,6 +188,10 @@ const ( ABRW ABRH ABRD + AHASHSTP + AHASHST + AHASHCHKP + AHASHCHK AXXSPLTIW AXXSPLTIDP AXXSPLTI32DX @@ -437,6 +441,10 @@ var GenAnames = []string{ "BRW", "BRH", "BRD", + "HASHSTP", + "HASHST", + "HASHCHKP", + "HASHCHK", "XXSPLTIW", "XXSPLTIDP", "XXSPLTI32DX", @@ -684,6 +692,10 @@ var GenOpcodes = [...]uint32{ 0x7c000136, // ABRW 0x7c0001b6, // ABRH 0x7c000176, // ABRD + 0x7c000524, // AHASHSTP + 0x7c0005a4, // AHASHST + 0x7c000564, // AHASHCHKP + 0x7c0005e4, // AHASHCHK 0x80060000, // AXXSPLTIW 0x80040000, // AXXSPLTIDP 0x80000000, // AXXSPLTI32DX @@ -821,6 +833,8 @@ var optabGen = []Optab{ {as: ABRW, a1: C_REG, a6: C_REG, asmout: type_brw, size: 4}, {as: ADCFFIXQQ, a1: C_VREG, a6: C_FREGP, asmout: type_xscvuqqp, size: 4}, {as: ADCTFIXQQ, a1: C_FREGP, a6: C_VREG, asmout: type_xscvuqqp, size: 4}, + {as: AHASHCHKP, a1: C_SOREG, a6: C_REG, asmout: type_hashchkp, size: 4}, + {as: AHASHSTP, a1: C_REG, a6: C_SOREG, asmout: type_hashstp, size: 4}, {as: ALXVKQ, a1: C_U5CON, a6: C_VSREG, asmout: type_lxvkq, size: 4}, {as: ALXVP, a1: C_SOREG, a6: C_VSREGP, asmout: type_lxvp, size: 4}, {as: ALXVPX, a1: C_XOREG, a6: C_VSREGP, asmout: type_lxvpx, size: 4}, @@ -884,6 +898,32 @@ func type_brw(c *ctxt9, p *obj.Prog, t *Optab, out *[5]uint32) { out[0] = o0 } +// hashchkp RB,offset(RA) +func type_hashchkp(c *ctxt9, p *obj.Prog, t *Optab, out *[5]uint32) { + o0 := GenOpcodes[p.As-AXXSETACCZ] + o0 |= uint32(p.To.Reg&0x1f) << 11 // RB + o0 |= uint32((p.From.Offset>>8)&0x1) << 0 // DX + o0 |= uint32((p.From.Offset>>3)&0x1f) << 21 // D + o0 |= uint32(p.From.Reg&0x1f) << 16 // RA + if p.From.Offset&0xfffffe07 != 0xfffffe00 { + c.ctxt.Diag("Constant(%d) must within the range of [-512,-8] in steps of 8\n%v", p.From.Offset, p) + } + out[0] = o0 +} + +// hashstp RB,offset(RA) +func type_hashstp(c *ctxt9, p *obj.Prog, t *Optab, out *[5]uint32) { + o0 := GenOpcodes[p.As-AXXSETACCZ] + o0 |= uint32(p.From.Reg&0x1f) << 11 // RB + o0 |= uint32((p.To.Offset>>8)&0x1) << 0 // DX + o0 |= uint32((p.To.Offset>>3)&0x1f) << 21 // D + o0 |= uint32(p.To.Reg&0x1f) << 16 // RA + if p.To.Offset&0xfffffe07 != 0xfffffe00 { + c.ctxt.Diag("Constant(%d) must within the range of [-512,-8] in steps of 8\n%v", p.To.Offset, p) + } + out[0] = o0 +} + // lxvkq XT,UIM func type_lxvkq(c *ctxt9, p *obj.Prog, t *Optab, out *[5]uint32) { o0 := GenOpcodes[p.As-AXXSETACCZ] @@ -1370,6 +1410,10 @@ func opsetGen(from obj.As) bool { opset(ABRD, r0) case ADCFFIXQQ: case ADCTFIXQQ: + case AHASHCHKP: + opset(AHASHCHK, r0) + case AHASHSTP: + opset(AHASHST, r0) case ALXVKQ: case ALXVP: case ALXVPX: |