Skip to content

Use the latest base register while accessing the stack #38834

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 16 commits into from
Jul 8, 2020
Merged

Use the latest base register while accessing the stack #38834

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7e5317e
logging
kunalspathak Jul 6, 2020
06ebea4
the fix
kunalspathak Jul 6, 2020
3b3b91d
revert lclvars.cpp changes
kunalspathak Jul 6, 2020
3b1c038
Revert "revert lclvars.cpp changes"
kunalspathak Jul 6, 2020
73c986d
wip
kunalspathak Jul 6, 2020
58d2bba
revert lclvars.cpp changes
kunalspathak Jul 6, 2020
fb5226c
deleted inst_RV_ST()
kunalspathak Jul 6, 2020
83c18c9
removing logging, added some asserts
kunalspathak Jul 6, 2020
85feea6
jit-formatting
kunalspathak Jul 6, 2020
b8ac22b
add back case of INS_add and some more asserts
kunalspathak Jul 7, 2020
f288c40
reset lclvars.cpp
kunalspathak Jul 7, 2020
9e450f8
delete comments and cleanup code
kunalspathak Jul 7, 2020
6ab40f2
revert changes inside common.il
kunalspathak Jul 7, 2020
db7e86d
Revert "Disable failing Windows arm32 tests (#38844)"
kunalspathak Jul 7, 2020
943771d
review comments
kunalspathak Jul 7, 2020
0094682
added standard function header
kunalspathak Jul 7, 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
22 changes: 14 additions & 8 deletions src/coreclr/src/jit/emitarm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3513,8 +3513,10 @@ void emitter::emitIns_S(instruction ins, emitAttr attr, int varx, int offs)
/*****************************************************************************
*
* Add an instruction referencing a register and a stack-based local variable.
*
* Stores the base register used for accessing the offset of stack in "pBaseReg".
*/
void emitter::emitIns_R_S(instruction ins, emitAttr attr, regNumber reg1, int varx, int offs, regNumber* baseReg)
void emitter::emitIns_R_S(instruction ins, emitAttr attr, regNumber reg1, int varx, int offs, regNumber* pBaseReg)
{
if (ins == INS_mov)
{
Expand Down Expand Up @@ -3556,9 +3558,9 @@ void emitter::emitIns_R_S(instruction ins, emitAttr attr, regNumber reg1, int va

base = emitComp->lvaFrameAddress(varx, emitComp->funCurrentFunc()->funKind != FUNC_ROOT, &reg2, offs,
CodeGen::instIsFP(ins));
if (baseReg != nullptr)
if (pBaseReg != nullptr)
{
*baseReg = reg2;
*pBaseReg = reg2;
}

disp = base + offs;
Expand Down Expand Up @@ -3673,9 +3675,13 @@ void emitter::emitIns_R_S(instruction ins, emitAttr attr, regNumber reg1, int va
appendToCurIG(id);
}

// generate the offset of &varx + offs into a register
// also capture the 'baseReg' used for generating movw/movt
void emitter::emitIns_genStackOffset(regNumber r, int varx, int offs, bool isFloatUsage, regNumber* baseReg)
/*****************************************************************************
*
* Generate the offset of &varx + offs into a register
*
* Stores the base register used for accessing the offset of stack in "pBaseReg".
*/
void emitter::emitIns_genStackOffset(regNumber r, int varx, int offs, bool isFloatUsage, regNumber* pBaseReg)
{
regNumber regBase;
int base;
Expand All @@ -3685,13 +3691,13 @@ void emitter::emitIns_genStackOffset(regNumber r, int varx, int offs, bool isFlo
emitComp->lvaFrameAddress(varx, emitComp->funCurrentFunc()->funKind != FUNC_ROOT, &regBase, offs, isFloatUsage);
disp = base + offs;

emitIns_R_S(INS_movw, EA_4BYTE, r, varx, offs, baseReg);
emitIns_R_S(INS_movw, EA_4BYTE, r, varx, offs, pBaseReg);

if ((disp & 0xffff) != disp)
{
regNumber regBaseUsedInMovT;
emitIns_R_S(INS_movt, EA_4BYTE, r, varx, offs, &regBaseUsedInMovT);
assert(*baseReg == regBaseUsedInMovT);
assert(*pBaseReg == regBaseUsedInMovT);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/src/jit/emitarm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,11 @@ void emitIns_C(instruction ins, emitAttr attr, CORINFO_FIELD_HANDLE fdlHnd, int

void emitIns_S(instruction ins, emitAttr attr, int varx, int offs);

void emitIns_genStackOffset(regNumber r, int varx, int offs, bool isFloatUsage, regNumber* baseReg);
void emitIns_genStackOffset(regNumber r, int varx, int offs, bool isFloatUsage, regNumber* pBaseReg);

void emitIns_S_R(instruction ins, emitAttr attr, regNumber ireg, int varx, int offs);

void emitIns_R_S(instruction ins, emitAttr attr, regNumber ireg, int varx, int offs, regNumber* baseReg = nullptr);
void emitIns_R_S(instruction ins, emitAttr attr, regNumber ireg, int varx, int offs, regNumber* pBaseReg = nullptr);

void emitIns_S_I(instruction ins, emitAttr attr, int varx, int offs, int val);

Expand Down