languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 00:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ VM ] Fix asserts in ARM64 simulator

Browse source 
https://dart-review.googlesource.com/c/sdk/+/148539 hoisted an assert
out of a conditional block and started causing failures for DebugSIMARM64
fuzzing runs as `stxr` does not have `Rs = 31`.

Change-Id: Ibbcc1ba105567ca1142843261756b8ee6a8e119f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149483
Reviewed-by: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Ben Konyi 2020-05-29 21:54:04 +00:00
parent 3451c348db
commit 8ff37f07dc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime/vm/simulator_arm64.cc
View file

@ -2171,7 +2171,6 @@ void Simulator::DecodeLoadStoreExclusive(Instr* instr) {
UNIMPLEMENTED();
}
const Register rs = instr->RsField();
ASSERT(rs == R31); // Should-Be-One
const Register rn = instr->RnField();
const Register rt = instr->RtField();
ASSERT(instr->Rt2Field() == R31); // Should-Be-One
@ -2181,12 +2180,14 @@ void Simulator::DecodeLoadStoreExclusive(Instr* instr) {
if (is_load) {
const bool is_load_acquire = !is_exclusive && is_ordered;
if (is_load_acquire) {
ASSERT(rs == R31); // Should-Be-One
// Format(instr, "ldar 'rt, 'rn");
const int64_t addr = get_register(rn, R31IsSP);
const intptr_t value =
(size == 3) ? ReadAcquire(addr, instr) : ReadAcquireW(addr, instr);
set_register(instr, rt, value, R31IsSP);
} else {
ASSERT(rs == R31); // Should-Be-One
// Format(instr, "ldxr 'rt, 'rn");
const int64_t addr = get_register(rn, R31IsSP);
const intptr_t value = (size == 3) ? ReadExclusiveX(addr, instr)
@ -2196,6 +2197,7 @@ void Simulator::DecodeLoadStoreExclusive(Instr* instr) {
} else {
const bool is_store_release = !is_exclusive && is_ordered;
if (is_store_release) {
ASSERT(rs == R31); // Should-Be-One
// Format(instr, "stlr 'rt, 'rn");
const uword value = get_register(rt, R31IsSP);
const uword addr = get_register(rn, R31IsSP);