diff --git a/src/codegen/riscv64/assembler-riscv64-inl.h b/src/codegen/riscv64/assembler-riscv64-inl.h
index b69432e6dc48..2d00d1511de0 100644
--- a/src/codegen/riscv64/assembler-riscv64-inl.h
+++ b/src/codegen/riscv64/assembler-riscv64-inl.h
@@ -225,18 +225,18 @@ void Assembler::CheckBuffer() {
 
 template <typename T>
 void Assembler::EmitHelper(T x) {
-  DEBUG_PRINTF("%p: ", pc_);
-  disassembleInstr((int)x);
   *reinterpret_cast<T*>(pc_) = x;
   pc_ += sizeof(x);
-  CheckTrampolinePoolQuick();
 }
 
 void Assembler::emit(Instr x) {
   if (!is_buffer_growth_blocked()) {
     CheckBuffer();
   }
+  DEBUG_PRINTF("%p: ", pc_);
+  disassembleInstr(x);
   EmitHelper(x);
+  CheckTrampolinePoolQuick();
 }
 
 void Assembler::emit(ShortInstr x) {
diff --git a/src/codegen/riscv64/assembler-riscv64.cc b/src/codegen/riscv64/assembler-riscv64.cc
index b7d259fa3a1e..c93ebc883368 100644
--- a/src/codegen/riscv64/assembler-riscv64.cc
+++ b/src/codegen/riscv64/assembler-riscv64.cc
@@ -2184,16 +2184,19 @@ void Assembler::GrowBuffer() {
 
 void Assembler::db(uint8_t data) {
   if (!is_buffer_growth_blocked()) CheckBuffer();
+  DEBUG_PRINTF("%p: constant 0x%x\n", pc_, data);
   EmitHelper(data);
 }
 
 void Assembler::dd(uint32_t data) {
   if (!is_buffer_growth_blocked()) CheckBuffer();
+  DEBUG_PRINTF("%p: constant 0x%x\n", pc_, data);
   EmitHelper(data);
 }
 
 void Assembler::dq(uint64_t data) {
   if (!is_buffer_growth_blocked()) CheckBuffer();
+  DEBUG_PRINTF("%p: constant 0x%lx\n", pc_, data);
   EmitHelper(data);
 }