commit 178e647cfc23649acd4340fb60ce4d0f5207a526
author Vladimir Marko <vmarko@google.com> Mon Oct 30 12:30:35 2023 +0000
committer Vladimir Marko <vmarko@google.com> Mon Oct 30 13:31:01 2023 +0000
tree 021616669e84bd7c8251815c6f4d793b055affcf
parent c06882353d1567adbcadc28e93947ec788036d23

riscv64: Fix `ExecuteNterpWithClinitImpl()`.

Fix thread ID check to use 32-bit loads.

Test: aosp_cf_riscv64_phone-userdebug boots.
Bug: 283082047
Bug: 305970538
Change-Id: Iaaad1582682eb33ab14a629c17f47aa55d7e9f86

runtime/interpreter/mterp/riscv64/main.S

diff --git a/runtime/interpreter/mterp/riscv64/main.S b/runtime/interpreter/mterp/riscv64/main.S
index ac82bef..82803e7 100644
--- a/runtime/interpreter/mterp/riscv64/main.S
+++ b/runtime/interpreter/mterp/riscv64/main.S
@@ -437,8 +437,8 @@
 .Linitializing_check:
     lui t2, MIRROR_CLASS_STATUS_INITIALIZING << (MIRROR_CLASS_STATUS_SHIFT - 12)
     bltu t1, t2, .Lresolution_trampoline
-    ld t1, MIRROR_CLASS_CLINIT_THREAD_ID_OFFSET(t0)
-    ld t0, THREAD_TID_OFFSET(xSELF)
+    lwu t1, MIRROR_CLASS_CLINIT_THREAD_ID_OFFSET(t0)
+    lwu t0, THREAD_TID_OFFSET(xSELF)
     beq t0, t1, ExecuteNterpImpl
 .Lresolution_trampoline:
     tail art_quick_resolution_trampoline