mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 21:21:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

add ENDBR32 and ENDBR64 to inline assembler (#15401)

Browse source
This commit is contained in:
Walter Bright 2023-07-11 01:22:36 -07:00 • committed by GitHub
parent 70b4087efb
commit 815716022e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/src/dmd/backend/cgcod.d
View file

@ -2146,9 +2146,9 @@ regm_t getscratch()
* before. * before.
* Look first to see if it is already in a register. * Look first to see if it is already in a register.
* Params: * Params:
* cdb = sink for generated code * cdb = sink for generated code
* e = the elem * e = the elem
* pretregs = input is mask of registers, output is result register * pretregs = input is mask of registers, output is result register
*/ */
@trusted @trusted

14
compiler/src/dmd/backend/cod3.d
View file

@ -6491,7 +6491,7 @@ uint calccodsize(code *c)
size = 9; // 64 bit immediate value for MOV to/from RAX size = 9; // 64 bit immediate value for MOV to/from RAX
goto Lret; goto Lret;
} }
goto Ldefault; goto default;
case 0xF6: /* TEST mem8,immed8 */ case 0xF6: /* TEST mem8,immed8 */
ins = inssize[op]; ins = inssize[op];
@ -6511,8 +6511,16 @@ uint calccodsize(code *c)
size += (i32 ^ ((iflags & CFopsize) !=0)) ? 4 : 2; size += (i32 ^ ((iflags & CFopsize) !=0)) ? 4 : 2;
break; break;
case 0xFA:
case 0xFB:
if (c.Iop == ENDBR32 || c.Iop == ENDBR64)
{
size = 4;
break;
}
goto default;
default: default:
Ldefault:
ins = inssize[op]; ins = inssize[op];
size = ins & 7; size = ins & 7;
if (i32) if (i32)
@ -6992,7 +7000,7 @@ uint codout(int seg, code *c, Barray!ubyte* disasmBuf)
else if ((op & 0xFF00) == 0x0F00) else if ((op & 0xFF00) == 0x0F00)
ins = inssize2[op & 0xFF]; ins = inssize2[op & 0xFF];
if (op & 0xFF000000) if (op & 0xFF_00_00_00)
{ {
ubyte op1 = op >> 24; ubyte op1 = op >> 24;
if (op1 == 0xF2 || op1 == 0xF3 || op1 == 0x66) if (op1 == 0xF2 || op1 == 0xF3 || op1 == 0x66)

2
compiler/src/dmd/backend/code_x86.d
View file

@ -464,6 +464,8 @@ enum
ESCAPE = SEGDS, // marker that special information is here ESCAPE = SEGDS, // marker that special information is here
// (Iop2 is the type of special information) // (Iop2 is the type of special information)
ENDBR32 = 0xF30F1EFB,
ENDBR64 = 0xF30F1EFA,
} }

4
compiler/src/dmd/backend/ptrntab.d
View file

@ -51,6 +51,8 @@ alias aptb0AAA = OPTABLE0!( 0x37 ,_i64_bit | _modax);
alias aptb0AAD = OPTABLE0!( 0xd50a,_i64_bit | _modax); alias aptb0AAD = OPTABLE0!( 0xd50a,_i64_bit | _modax);
alias aptb0AAM = OPTABLE0!( 0xd40a,_i64_bit | _modax); alias aptb0AAM = OPTABLE0!( 0xd40a,_i64_bit | _modax);
alias aptb0AAS = OPTABLE0!( 0x3f, _i64_bit | _modax); alias aptb0AAS = OPTABLE0!( 0x3f, _i64_bit | _modax);
alias aptb0ENDBR32 = OPTABLE0!( ENDBR32, _I386);
alias aptb0ENDBR64 = OPTABLE0!( ENDBR64, _I386);
alias aptb0CBW = OPTABLE0!( 0x98,_16_bit | _modax); alias aptb0CBW = OPTABLE0!( 0x98,_16_bit | _modax);
alias aptb0CWDE = OPTABLE0!( 0x98,_32_bit | _I386 | _modax); alias aptb0CWDE = OPTABLE0!( 0x98,_32_bit | _I386 | _modax);
alias aptb0CDQE = OPTABLE0!( 0x98,_64_bit | _modax); alias aptb0CDQE = OPTABLE0!( 0x98,_64_bit | _modax);
@ -4933,6 +4935,8 @@ immutable OP[] optab = [
{ "dt", ITdata | OPdt, { null } }, { "dt", ITdata | OPdt, { null } },
{ "dw", ITdata | OPdw, { null } }, { "dw", ITdata | OPdw, { null } },
{ "emms", 0, { &aptb0EMMS[0] } }, { "emms", 0, { &aptb0EMMS[0] } },
{ "endbr32", 0, { &aptb0ENDBR32[0] } },
{ "endbr64", 0, { &aptb0ENDBR64[0] } },
{ "enter", 2, { &aptb2ENTER[0] } }, { "enter", 2, { &aptb2ENTER[0] } },
{ "extractps", 3, { &aptb3EXTRACTPS[0] } }, { "extractps", 3, { &aptb3EXTRACTPS[0] } },
{ "f2xm1", ITfloat | 0, { &aptb0F2XM1[0] } }, { "f2xm1", ITfloat | 0, { &aptb0F2XM1[0] } },

8
compiler/src/dmd/iasmdmd.d
View file

@ -1765,6 +1765,14 @@ code *asm_emit(Loc loc,
case 0x0F0000: // an AMD instruction case 0x0F0000: // an AMD instruction
const puc = (cast(ubyte *) &opcode); const puc = (cast(ubyte *) &opcode);
if (opcode == ENDBR32 || opcode == ENDBR64)
{
emit(puc[3]);
emit(puc[2]);
emit(puc[1]);
emit(puc[0]);
goto L3;
}
emit(puc[2]); emit(puc[2]);
emit(puc[1]); emit(puc[1]);
emit(puc[0]); emit(puc[0]);

5
compiler/test/runnable/iasm64.d
View file

@ -3718,6 +3718,8 @@ void test50()
0x9B, // wait 0x9B, // wait
0x91, // xchg EAX,ECX 0x91, // xchg EAX,ECX
0xD7, // xlat 0xD7, // xlat
0xF3, 0x0F, 0x1E, 0xFB, // endbr32
0xF3, 0x0F, 0x1E, 0xFA, // endbr64
0x48, 0x8D, 0x1D, 0x02, 0x00, 0x00, 0x00, // lea RBX,L1; 0x48, 0x8D, 0x1D, 0x02, 0x00, 0x00, 0x00, // lea RBX,L1;
0x89, 0xC0, // mov EAX,EAX 0x89, 0xC0, // mov EAX,EAX
]; ];
@ -3844,6 +3846,8 @@ L10: nop; nop; // put instructions above this or L10 changes
wait ; wait ;
xchg EAX,ECX ; xchg EAX,ECX ;
xlat ; xlat ;
endbr32 ;
endbr64 ;
lea RBX,L1 ; lea RBX,L1 ;
mov EAX,EAX ; mov EAX,EAX ;
@ -3853,6 +3857,7 @@ L1: ;
} }
for (i = 0; i < data.length; i++) for (i = 0; i < data.length; i++)
{ {
//printf("[%d] %02x %02x\n", i, p[i], data[i]);
assert(p[i] == data[i]); assert(p[i] == data[i]);
} }
} }