Skip to content

[ARM64] Change INS_bkpt to INS_brk for INS_BREAKPOINT #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 6, 2020
Merged

[ARM64] Change INS_bkpt to INS_brk for INS_BREAKPOINT #892

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d54755
[ARM64] Change INS_bkpt to INS_brk for INS_BREAKPOINT
xiangzhai Dec 16, 2019
a1381dc
[ARM64] Change INS_bkpt to INS_brk for INS_BREAKPOINT
xiangzhai Dec 16, 2019
27718f5
Merge branch 'master' of github.com:xiangzhai/runtime
xiangzhai Dec 16, 2019
d045a29
[ARM64] Change INS_bkpt to INS_brk for INS_BREAKPOINT
xiangzhai Dec 17, 2019
cfadb82
[ARM64] Change INS_bkpt to INS_brk for TARGET_UNIX
xiangzhai Dec 18, 2019
a878bae
[ARM64] Change INS_bkpt to INS_brk for TARGET_UNIX
xiangzhai Dec 23, 2019
ee69ee4
Fix formatting errors for INS_MULADD
xiangzhai Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/src/jit/codegenarm64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,7 +1526,7 @@ BasicBlock* CodeGen::genCallFinally(BasicBlock* block)

if ((block->bbNext == nullptr) || !BasicBlock::sameEHRegion(block, block->bbNext))
{
instGen(INS_bkpt); // This should never get executed
instGen(INS_BREAKPOINT); // This should never get executed
}
}
else
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/src/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10607,7 +10607,11 @@ const instruction INS_SQRT = INS_vsqrt;
#ifdef _TARGET_ARM64_

const instruction INS_MULADD = INS_madd;
#if defined(_TARGET_UNIX_)
const instruction INS_BREAKPOINT = INS_brk;
#else
const instruction INS_BREAKPOINT = INS_bkpt;
#endif

const instruction INS_ABS = INS_fabs;
const instruction INS_SQRT = INS_fsqrt;
Expand Down
7 changes: 5 additions & 2 deletions src/coreclr/src/jit/emitarm64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3368,7 +3368,10 @@ void emitter::emitIns(instruction ins)
instrDesc* id = emitNewInstrSmall(EA_8BYTE);
insFormat fmt = emitInsFormat(ins);

assert(fmt == IF_SN_0A);
if (ins != INS_BREAKPOINT)
{
assert(fmt == IF_SN_0A);
}

id->idIns(ins);
id->idInsFmt(fmt);
Expand Down Expand Up @@ -12547,7 +12550,7 @@ emitter::insExecutionCharacteristics emitter::getInsExecutionCharacteristics(ins
}
break;

case IF_SN_0A: // bkpt, nop
case IF_SN_0A: // bkpt, brk, nop
result.insThroughput = PERFSCORE_THROUGHPUT_2X;
result.insLatency = PERFSCORE_LATENCY_ZERO;
break;
Expand Down