Skip to content

fix(jsc): correct ARM64 register-to-memory add64 operands #770

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

Open
steipete wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(jsc): correct ARM64 register-to-memory add64 operands #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ class MacroAssemblerARM64 : public AbstractMacroAssembler<Assembler> {
void add64(RegisterID src, Address dest)
{
load64(dest, getCachedDataTempRegisterIDAndInvalidate());
m_assembler.add<64>(src, dataTempRegister, dataTempRegister);
m_assembler.add<64>(dataTempRegister, dataTempRegister, src);
store64(dataTempRegister, dest);
}

Expand Down
23 changes: 23 additions & 0 deletions Source/JavaScriptCore/assembler/testmasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,28 @@ void testAdd64Imm32()
}
}

void testAdd64RegisterAddress()
{
auto add = compile([] (CCallHelpers& jit) {
emitFunctionPrologue(jit);
jit.add64(GPRInfo::argumentGPR1, CCallHelpers::Address(GPRInfo::argumentGPR0, sizeof(uint64_t)));
jit.move(GPRInfo::argumentGPR1, GPRInfo::returnValueGPR);
emitFunctionEpilogue(jit);
jit.ret();
});

for (auto initial : int64Operands()) {
for (auto source : int64Operands()) {
uint64_t values[] = { 0x0123456789abcdefULL, static_cast<uint64_t>(initial), 0xfedcba9876543210ULL };
auto result = invoke<uint64_t>(add, values, static_cast<uint64_t>(source));
CHECK_EQ(values[1], static_cast<uint64_t>(initial) + static_cast<uint64_t>(source));
CHECK_EQ(result, static_cast<uint64_t>(source));
CHECK_EQ(values[0], 0x0123456789abcdefULL);
CHECK_EQ(values[2], 0xfedcba9876543210ULL);
}
}
}

void testAdd64ArgImm32()
{
for (auto immediate : int32Operands()) {
Expand Down Expand Up @@ -8534,6 +8556,7 @@ void run(const char* filter) WTF_IGNORES_THREAD_SAFETY_ANALYSIS
RUN(testAdd32Imm());
RUN(testAdd32ArgImm());
RUN(testAdd64Imm32());
RUN(testAdd64RegisterAddress());
RUN(testAdd64ArgImm32());
RUN(testAdd64Imm64());
RUN(testAdd64ArgImm64());
Expand Down