target/mips: decode Octeon CRC and GFM COP2 selectors
Add explicit decodetree entries and translator bindings for the Octeon CRC and GFM COP2 operation selectors. Unlike simple register moves, these selectors update CRC or Galois-field state and therefore remain per-operation helper calls. Keep CRC/GFM decode next to the helpers that implement these side effects while avoiding a monolithic selector-dispatch helper. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-ID: <20260608-mips-octeon-missing-insns-v2-v16-15-daef7a0d8b04@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
James Hilliard committed
Jun 8, 2026 at 12:59 UTC
9679d839f8457ec0f62100cf42f8f6e877f2c66b
5 files changed
+150
target/mips/helper.h
+1
@@ -32,6 +32,7 @@ DEF_HELPER_1(octeon_cp2_mf_gfm_mul_reflect1, i64, env)
32
DEF_HELPER_1(octeon_cp2_mf_gfm_resinp_reflect0, i64, env)
33
DEF_HELPER_1(octeon_cp2_mf_gfm_resinp_reflect1, i64, env)
34
DEF_HELPER_2(octeon_cp2_mt_crc_write_iv_reflect, void, env, i64)
35
+DEF_HELPER_2(octeon_cp2_mt_crc_write_polynomial_reflect, void, env, i64)
36
DEF_HELPER_2(octeon_cp2_mt_crc_write_byte, void, env, i64)
37
DEF_HELPER_2(octeon_cp2_mt_crc_write_half, void, env, i64)
38
DEF_HELPER_2(octeon_cp2_mt_crc_write_word, void, env, i64)
target/mips/tcg/octeon.decode
+22
@@ -132,6 +132,11 @@ LDX 011111 ..... ..... ..... 01000 001010 @lx
132
CVM_MF_CRC_POLYNOMIAL 010010 00001 rt:5 0000 0010 0000 0000 &cp2
133
CVM_MF_CRC_IV 010010 00001 rt:5 0000 0010 0000 0001 &cp2
134
CVM_MF_CRC_LEN 010010 00001 rt:5 0000 0010 0000 0010 &cp2
135
+ CVM_MF_CRC_IV_REFLECT 010010 00001 rt:5 0000 0010 0000 0011 &cp2
136
+ CVM_MF_GFM_MUL_REFLECT0 010010 00001 rt:5 0000 0000 0101 1000 &cp2
137
+ CVM_MF_GFM_MUL_REFLECT1 010010 00001 rt:5 0000 0000 0101 1001 &cp2
138
+ CVM_MF_GFM_RESINP_REFLECT0 010010 00001 rt:5 0000 0000 0101 1010 &cp2
139
+ CVM_MF_GFM_RESINP_REFLECT1 010010 00001 rt:5 0000 0000 0101 1011 &cp2
140
CVM_MF_GFM_MUL0 010010 00001 rt:5 0000 0010 0101 1000 &cp2
141
CVM_MF_GFM_MUL1 010010 00001 rt:5 0000 0010 0101 1001 &cp2
142
CVM_MF_GFM_RESINP0 010010 00001 rt:5 0000 0010 0101 1010 &cp2
@@ -148,6 +153,9 @@ LDX 011111 ..... ..... ..... 01000 001010 @lx
153
CVM_MT_HSH_IV1 010010 00101 rt:5 0000 0000 0100 1001 &cp2
154
CVM_MT_HSH_IV2 010010 00101 rt:5 0000 0000 0100 1010 &cp2
155
CVM_MT_HSH_IV3 010010 00101 rt:5 0000 0000 0100 1011 &cp2
156
+ CVM_MT_GFM_MUL_REFLECT0 010010 00101 rt:5 0000 0000 0101 1000 &cp2
157
+ CVM_MT_GFM_MUL_REFLECT1 010010 00101 rt:5 0000 0000 0101 1001 &cp2
158
+ CVM_MT_GFM_XOR0_REFLECT 010010 00101 rt:5 0000 0000 0101 1100 &cp2
159
CVM_MT_3DES_KEY0 010010 00101 rt:5 0000 0000 1000 0000 &cp2
160
CVM_MT_3DES_KEY1 010010 00101 rt:5 0000 0000 1000 0001 &cp2
161
CVM_MT_3DES_KEY2 010010 00101 rt:5 0000 0000 1000 0010 &cp2
@@ -167,13 +175,27 @@ LDX 011111 ..... ..... ..... 01000 001010 @lx
175
CVM_MT_AES_DEC0 010010 00101 rt:5 0000 0001 0000 1110 &cp2
176
CVM_MT_AES_KEYLENGTH 010010 00101 rt:5 0000 0001 0001 0000 &cp2
177
CVM_MT_CRC_IV 010010 00101 rt:5 0000 0010 0000 0001 &cp2
178
+ CVM_MT_CRC_IV_REFLECT 010010 00101 rt:5 0000 0010 0001 0001 &cp2
179
+ CVM_MT_CRC_BYTE 010010 00101 rt:5 0000 0010 0000 0100 &cp2
180
+ CVM_MT_CRC_HALF 010010 00101 rt:5 0000 0010 0000 0101 &cp2
181
+ CVM_MT_CRC_WORD 010010 00101 rt:5 0000 0010 0000 0110 &cp2
182
+ CVM_MT_CRC_BYTE_REFLECT 010010 00101 rt:5 0000 0010 0001 0100 &cp2
183
+ CVM_MT_CRC_HALF_REFLECT 010010 00101 rt:5 0000 0010 0001 0101 &cp2
184
+ CVM_MT_CRC_WORD_REFLECT 010010 00101 rt:5 0000 0010 0001 0110 &cp2
185
CVM_MT_GFM_MUL0 010010 00101 rt:5 0000 0010 0101 1000 &cp2
186
CVM_MT_GFM_MUL1 010010 00101 rt:5 0000 0010 0101 1001 &cp2
187
CVM_MT_GFM_RESINP0 010010 00101 rt:5 0000 0010 0101 1010 &cp2
188
CVM_MT_GFM_RESINP1 010010 00101 rt:5 0000 0010 0101 1011 &cp2
189
CVM_MT_GFM_POLY 010010 00101 rt:5 0000 0010 0101 1110 &cp2
190
CVM_MT_CRC_LEN 010010 00101 rt:5 0001 0010 0000 0010 &cp2
191
+ CVM_MT_CRC_DWORD 010010 00101 rt:5 0001 0010 0000 0111 &cp2
192
+ CVM_MT_CRC_VAR 010010 00101 rt:5 0001 0010 0000 1000 &cp2
193
+ CVM_MT_CRC_DWORD_REFLECT 010010 00101 rt:5 0001 0010 0001 0111 &cp2
194
+ CVM_MT_CRC_VAR_REFLECT 010010 00101 rt:5 0001 0010 0001 1000 &cp2
195
+ CVM_MT_GFM_XORMUL1_REFLECT 010010 00101 rt:5 0100 0000 0101 1101 &cp2
196
CVM_MT_CRC_POLYNOMIAL 010010 00101 rt:5 0100 0010 0000 0000 &cp2
197
+ CVM_MT_CRC_POLYNOMIAL_REFLECT 010010 00101 rt:5 0100 0010 0001 0000 &cp2
198
+ CVM_MT_GFM_XORMUL1 010010 00101 rt:5 0100 0010 0101 1101 &cp2
199
]
200
CP2_Undef 010010 ----- ----- ---- ---- ---- ----
201
}
target/mips/tcg/octeon_crypto.c
+7
@@ -2203,6 +2203,13 @@ void helper_octeon_cp2_mt_crc_write_iv_reflect(CPUMIPSState *env,
2203
octeon_crc_reflect32_by_byte((uint32_t)value);
2204
}
2205
2206
+void helper_octeon_cp2_mt_crc_write_polynomial_reflect(CPUMIPSState *env,
2207
+ uint64_t value)
2208
+{
2209
+ env->octeon_crypto.crc_poly =
2210
+ octeon_crc_reflect32_by_byte((uint32_t)value);
2211
+}
2212
+
2213
void helper_octeon_cp2_mt_crc_write_byte(CPUMIPSState *env, uint64_t value)
2214
{
2215
octeon_crc_update_normal(&env->octeon_crypto, value, 1);
target/mips/tcg/octeon_translate.c
+50
@@ -28,6 +28,9 @@
28
TRANS(NAME, trans_octeon_cp2_mf_hsh_pair, \
29
OCTEON_CRYPTO_OFFSET(FIELD[2 * (INDEX)]), \
30
OCTEON_CRYPTO_OFFSET(FIELD[2 * (INDEX) + 1]))
31
+#define CP2_MF_HELPER(NAME, SUFFIX) \
32
+ TRANS(NAME, trans_octeon_cp2_mf_helper, \
33
+ gen_helper_octeon_cp2_mf_ ## SUFFIX)
34
#define CP2_MT_I64(NAME, FIELD) \
35
TRANS(NAME, trans_octeon_cp2_mt_i64, OCTEON_CRYPTO_OFFSET(FIELD))
36
#define CP2_MT_U32(NAME, FIELD) \
@@ -41,6 +44,9 @@
44
TRANS(NAME, trans_octeon_cp2_mt_hsh_pair, \
45
OCTEON_CRYPTO_OFFSET(FIELD[2 * (INDEX)]), \
46
OCTEON_CRYPTO_OFFSET(FIELD[2 * (INDEX) + 1]))
47
+#define CP2_MT_HELPER(NAME, SUFFIX) \
48
+ TRANS(NAME, trans_octeon_cp2_mt_helper, \
49
+ gen_helper_octeon_cp2_mt_ ## SUFFIX)
50
51
#define OCTEON_LO32_OFFSET (HOST_BIG_ENDIAN ? 4 : 0)
52
@@ -99,6 +105,16 @@ static bool trans_octeon_cp2_mf_hsh_pair(DisasContext *ctx, arg_cp2 *a,
105
return true;
106
}
107
108
+static bool trans_octeon_cp2_mf_helper(DisasContext *ctx, arg_cp2 *a,
109
+ void (*gen_helper)(TCGv_i64, TCGv_env))
110
+{
111
+ TCGv_i64 value = tcg_temp_new_i64();
112
+
113
+ gen_helper(value, tcg_env);
114
+ gen_store_gpr(value, a->rt);
115
+ return true;
116
+}
117
+
118
static bool trans_octeon_cp2_mt_i64(DisasContext *ctx, arg_cp2 *a, int offset)
119
{
120
TCGv_i64 value = tcg_temp_new_i64();
@@ -149,6 +165,16 @@ static bool trans_octeon_cp2_mt_hsh_pair(DisasContext *ctx, arg_cp2 *a,
165
return true;
166
}
167
168
+static bool trans_octeon_cp2_mt_helper(DisasContext *ctx, arg_cp2 *a,
169
+ void (*gen_helper)(TCGv_env, TCGv_i64))
170
+{
171
+ TCGv_i64 value = tcg_temp_new_i64();
172
+
173
+ gen_load_gpr(value, a->rt);
174
+ gen_helper(tcg_env, value);
175
+ return true;
176
+}
177
+
178
CP2_MF_HSH_PAIR(CVM_MF_HSH_DAT0, hsh_dat, 0);
179
CP2_MF_HSH_PAIR(CVM_MF_HSH_DAT1, hsh_dat, 1);
180
CP2_MF_HSH_PAIR(CVM_MF_HSH_DAT2, hsh_dat, 2);
@@ -185,6 +211,12 @@ CP2_MF_I64(CVM_MF_GFM_RESINP0, gfm_resinp[0]);
211
CP2_MF_I64(CVM_MF_GFM_RESINP1, gfm_resinp[1]);
212
CP2_MF_U16(CVM_MF_GFM_POLY, gfm_poly);
213
214
+CP2_MF_HELPER(CVM_MF_CRC_IV_REFLECT, crc_iv_reflect);
215
+CP2_MF_HELPER(CVM_MF_GFM_MUL_REFLECT0, gfm_mul_reflect0);
216
+CP2_MF_HELPER(CVM_MF_GFM_MUL_REFLECT1, gfm_mul_reflect1);
217
+CP2_MF_HELPER(CVM_MF_GFM_RESINP_REFLECT0, gfm_resinp_reflect0);
218
+CP2_MF_HELPER(CVM_MF_GFM_RESINP_REFLECT1, gfm_resinp_reflect1);
219
+
220
CP2_MT_HSH_PAIR(CVM_MT_HSH_DAT0, hsh_dat, 0);
221
CP2_MT_HSH_PAIR(CVM_MT_HSH_DAT1, hsh_dat, 1);
222
CP2_MT_HSH_PAIR(CVM_MT_HSH_DAT2, hsh_dat, 2);
@@ -196,6 +228,9 @@ CP2_MT_HSH_PAIR(CVM_MT_HSH_IV0, hsh_iv, 0);
228
CP2_MT_HSH_PAIR(CVM_MT_HSH_IV1, hsh_iv, 1);
229
CP2_MT_HSH_PAIR(CVM_MT_HSH_IV2, hsh_iv, 2);
230
CP2_MT_HSH_PAIR(CVM_MT_HSH_IV3, hsh_iv, 3);
231
+CP2_MT_HELPER(CVM_MT_GFM_MUL_REFLECT0, gfm_mul_reflect0);
232
+CP2_MT_HELPER(CVM_MT_GFM_MUL_REFLECT1, gfm_mul_reflect1);
233
+CP2_MT_HELPER(CVM_MT_GFM_XOR0_REFLECT, gfm_xor0_reflect);
234
CP2_MT_I64(CVM_MT_3DES_KEY0, des3_key[0]);
235
CP2_MT_I64(CVM_MT_3DES_KEY1, des3_key[1]);
236
CP2_MT_I64(CVM_MT_3DES_KEY2, des3_key[2]);
@@ -223,6 +258,21 @@ CP2_MT_U16(CVM_MT_GFM_POLY, gfm_poly);
258
CP2_MT_U8_MASKED(CVM_MT_CRC_LEN, crc_len, 0xf);
259
CP2_MT_U32(CVM_MT_CRC_POLYNOMIAL, crc_poly);
260
261
+CP2_MT_HELPER(CVM_MT_CRC_POLYNOMIAL_REFLECT, crc_write_polynomial_reflect);
262
+CP2_MT_HELPER(CVM_MT_CRC_IV_REFLECT, crc_write_iv_reflect);
263
+CP2_MT_HELPER(CVM_MT_CRC_BYTE, crc_write_byte);
264
+CP2_MT_HELPER(CVM_MT_CRC_HALF, crc_write_half);
265
+CP2_MT_HELPER(CVM_MT_CRC_WORD, crc_write_word);
266
+CP2_MT_HELPER(CVM_MT_CRC_BYTE_REFLECT, crc_write_byte_reflect);
267
+CP2_MT_HELPER(CVM_MT_CRC_HALF_REFLECT, crc_write_half_reflect);
268
+CP2_MT_HELPER(CVM_MT_CRC_WORD_REFLECT, crc_write_word_reflect);
269
+CP2_MT_HELPER(CVM_MT_CRC_DWORD, crc_write_dword);
270
+CP2_MT_HELPER(CVM_MT_CRC_VAR, crc_write_var);
271
+CP2_MT_HELPER(CVM_MT_CRC_DWORD_REFLECT, crc_write_dword_reflect);
272
+CP2_MT_HELPER(CVM_MT_CRC_VAR_REFLECT, crc_write_var_reflect);
273
+CP2_MT_HELPER(CVM_MT_GFM_XORMUL1_REFLECT, gfm_xormul1_reflect);
274
+CP2_MT_HELPER(CVM_MT_GFM_XORMUL1, gfm_xormul1);
275
+
276
static bool trans_BBIT(DisasContext *ctx, arg_BBIT *a)
277
{
278
TCGv_i64 p;
tests/tcg/mips/user/isa/octeon/octeon-insns.c
+70
@@ -266,6 +266,70 @@ static uint64_t octeon_cop2_hsh_dat0_readback(uint64_t value)
266
return rd;
267
}
268
269
+static uint64_t octeon_cop2_crc_len_readback(uint64_t value)
270
+{
271
+ uint64_t rd;
272
+
273
+ asm volatile(
274
+ "move $8, %[value]\n\t"
275
+ ".word 0x48a81202\n\t" /* dmtc2 $8, CRC_LEN selector */
276
+ ".word 0x482a0202\n\t" /* dmfc2 $10, CRC_LEN selector */
277
+ "move %[rd], $10\n\t"
278
+ : [rd] "=r" (rd)
279
+ : [value] "r" (value)
280
+ : "$8", "$10");
281
+
282
+ return rd;
283
+}
284
+
285
+static uint64_t octeon_cop2_crc_poly_reflect_readback(uint64_t value)
286
+{
287
+ uint64_t rd;
288
+
289
+ asm volatile(
290
+ "move $8, %[value]\n\t"
291
+ ".word 0x48a84210\n\t" /* dmtc2 $8, CRC_POLYNOMIAL_REFLECT selector */
292
+ ".word 0x482a0200\n\t" /* dmfc2 $10, CRC_POLYNOMIAL selector */
293
+ "move %[rd], $10\n\t"
294
+ : [rd] "=r" (rd)
295
+ : [value] "r" (value)
296
+ : "$8", "$10");
297
+
298
+ return rd;
299
+}
300
+
301
+static uint64_t octeon_cop2_gfm_mul_reflect_write_readback(uint64_t value)
302
+{
303
+ uint64_t rd;
304
+
305
+ asm volatile(
306
+ "move $8, %[value]\n\t"
307
+ ".word 0x48a80058\n\t" /* dmtc2 $8, GFM_MUL_REFLECT0 selector */
308
+ ".word 0x482a0258\n\t" /* dmfc2 $10, GFM_MUL0 selector */
309
+ "move %[rd], $10\n\t"
310
+ : [rd] "=r" (rd)
311
+ : [value] "r" (value)
312
+ : "$8", "$10");
313
+
314
+ return rd;
315
+}
316
+
317
+static uint64_t octeon_cop2_gfm_mul_reflect_readback(uint64_t value)
318
+{
319
+ uint64_t rd;
320
+
321
+ asm volatile(
322
+ "move $8, %[value]\n\t"
323
+ ".word 0x48a80258\n\t" /* dmtc2 $8, GFM_MUL0 selector */
324
+ ".word 0x482a0058\n\t" /* dmfc2 $10, GFM_MUL_REFLECT0 selector */
325
+ "move %[rd], $10\n\t"
326
+ : [rd] "=r" (rd)
327
+ : [value] "r" (value)
328
+ : "$8", "$10");
329
+
330
+ return rd;
331
+}
332
+
333
int main(void)
334
{
335
assert(octeon_baddu(0x123, 0x0f0) == 0x13);
@@ -288,6 +352,12 @@ int main(void)
352
assert(octeon_cop2_keylength_readback(0xa5) == 1);
353
assert(octeon_cop2_hsh_dat0_readback(0x0102030405060708ULL) ==
354
0x0102030405060708ULL);
355
+ assert(octeon_cop2_crc_len_readback(0xb5) == 5);
356
+ assert(octeon_cop2_crc_poly_reflect_readback(0x12345678) == 0x482c6a1e);
357
+ assert(octeon_cop2_gfm_mul_reflect_write_readback(
358
+ 0x0123456789abcdefULL) == 0xf7b3d591e6a2c480ULL);
359
+ assert(octeon_cop2_gfm_mul_reflect_readback(
360
+ 0xfedcba9876543210ULL) == 0x084c2a6e195d3b7fULL);
361
362
return 0;
363
}