Open sendaoYan opened 1 month ago
diff --git a/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp b/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp
index b021fce29d8..ef2d54c1ea4 100644
--- a/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/c1_CodeStubs_riscv.cpp
@@ -351,10 +351,10 @@ void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
if (do_load()) {
ce->mem2reg(addr(), pre_val(), T_OBJECT, patch_code(), info(), false /*wide*/, false /*unaligned*/);
}
- __ cbz(pre_val_reg, _continuation);
+ __ beqz(pre_val_reg, _continuation); //TODO-RISCV64 cbz -> beqz
ce->store_parameter(pre_val()->as_register(), 0);
__ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::g1_pre_barrier_slow_id)));
- __ b(_continuation);
+ __ j(_continuation); //TODO-RISCV64 b -> j
}
void G1PostBarrierStub::emit_code(LIR_Assembler* ce) {
@@ -362,10 +362,10 @@ void G1PostBarrierStub::emit_code(LIR_Assembler* ce) {
assert(addr()->is_register(), "Precondition.");
assert(new_val()->is_register(), "Precondition.");
Register new_val_reg = new_val()->as_register();
- __ cbz(new_val_reg, _continuation);
+ __ beqz(new_val_reg, _continuation); //TODO-RISCV64 cbz -> beqz
ce->store_parameter(addr()->as_pointer_register(), 0);
__ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::g1_post_barrier_slow_id)));
- __ b(_continuation);
+ __ j(_continuation); //TODO-RISCV64 b -> j
}
#endif // INCLUDE_ALL_GCS
To github.com:sendaoYan/riscv-port-jdk8u-ysd.git bbe034fe8b9..be87e383c9a minus-jbs8276799 -> minus-jbs8276799
make-riscv64-fastdebug.log make-riscv64-release.log make-riscv64-slowdebug.log make-x86_64-fastdebug.log make-x86_64-release.log make-x86_64-slowdebug.log standalone.log make-aarch64-slowdebug.log make-aarch64-release.log make-aarch64-fastdebug.log