dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm] Fix code patcher assertions for RISC-V.

Browse Source 
TEST=ci
Change-Id: I313d2bb7f03c9ce8fd9fe423e732b34a5a2420e3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/393584
Reviewed-by: Alexander Aprelev <aam@google.com>
This commit is contained in:
Ryan Macnak
2024-11-05 22:16:59 +00:00
parent 75e6a748f7
commit 4fa616b254
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/vm/code_patcher_riscv.cc
+7 -3
View File
@@ -19,11 +19,15 @@ class PoolPointerCall : public ValueObject {
ASSERT(*reinterpret_cast<uint16_t*>(end_ - 2) == 0x9082); // jalr ra
uint32_t load_entry = LoadUnaligned(reinterpret_cast<uint32_t*>(end_ - 6));
#if XLEN == 32
ASSERT((load_entry == 0x00362083) || // lw ra, entry(code)
ASSERT((load_entry == 0x0036a083) || // lw ra, entry(tmp)
(load_entry == 0x00b6a083) || // lw ra, unchecked_entry(tmp)
(load_entry == 0x00362083) || // lw ra, entry(code)
(load_entry == 0x00b62083)); // lw ra, unchecked_entry(code)
#elif XLEN == 64
ASSERT((load_entry == 0x00763083) || // ld ra, entry(code)
(load_entry = 0x01763083)); // ld ra, unchecked_entry(code)
ASSERT((load_entry == 0x0076b083) || // ld ra, entry(tmp)
(load_entry == 0x0176b083) || // ld ra, unchecked_entry(tmp)
(load_entry == 0x00763083) || // ld ra, entry(code)
(load_entry == 0x01763083)); // ld ra, unchecked_entry(code)
#endif
InstructionPattern::DecodeLoadWordFromPool(end_ - 6, &reg_, &index_);
}