d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86_64-asm: support endbr64 instruction

Browse source 
endbr64 has no operand but comes with a ModR/M byte. Handle it in the
same way as *fence instructions.

Co-authored-by: Yao Zi <ziyao@disroot.org>
Signed-off-by: Yao Zi <ziyao@disroot.org>
Signed-off-by: John Nunley <dev@notgull.net>
This commit is contained in:
John Nunley 2024-10-27 15:33:23 -07:00
parent 6acf301e77
commit a21b5f1fd7
No known key found for this signature in database
GPG key ID: E53E674BF0AA7116
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
i386-asm.c
View file

@ -1002,15 +1002,21 @@ again:
modrm_index = -1; modrm_index = -1;
modreg_index = -1; modreg_index = -1;
if (pa->instr_type & OPC_MODRM) { if (pa->instr_type & OPC_MODRM) {
#ifdef TCC_TARGET_X86_64
if (!nb_ops) { if (!nb_ops) {
/* A modrm opcode without operands is a special case (e.g. mfence). /* A modrm opcode without operands is a special case (e.g. mfence).
It has a group and acts as if there's an register operand 0 It has a group and acts as if there's an register operand 0 */
(ax). */
i = 0; i = 0;
ops[i].type = OP_REG; ops[i].type = OP_REG;
ops[i].reg = 0; if (pa->sym == TOK_ASM_endbr64)
ops[i].reg = 2; // dx
else if (pa->sym >= TOK_ASM_lfence && pa->sym <= TOK_ASM_sfence)
ops[i].reg = 0; // ax
else
tcc_error("bad MODR/M opcode without operands");
goto modrm_found; goto modrm_found;
} }
#endif
/* first look for an ea operand */ /* first look for an ea operand */
for(i = 0;i < nb_ops; i++) { for(i = 0;i < nb_ops; i++) {
if (op_type[i] & OP_EA) if (op_type[i] & OP_EA)

3
x86_64-asm.h
View file

@ -538,6 +538,9 @@ ALT(DEF_ASM_OP2(movhps, 0x0f17, 0, OPC_MODRM, OPT_SSE, OPT_EA | OPT_REG32 ))
DEF_ASM_OP0L(mfence, 0x0fae, 6, OPC_MODRM) DEF_ASM_OP0L(mfence, 0x0fae, 6, OPC_MODRM)
DEF_ASM_OP0L(sfence, 0x0fae, 7, OPC_MODRM) DEF_ASM_OP0L(sfence, 0x0fae, 7, OPC_MODRM)
DEF_ASM_OP1(clflush, 0x0fae, 7, OPC_MODRM, OPT_EA) DEF_ASM_OP1(clflush, 0x0fae, 7, OPC_MODRM, OPT_EA)
/* Control-Flow Enforcement */
DEF_ASM_OP0L(endbr64, 0xf30f1e, 7, OPC_MODRM)
#undef ALT #undef ALT
#undef DEF_ASM_OP0 #undef DEF_ASM_OP0
#undef DEF_ASM_OP0L #undef DEF_ASM_OP0L