diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_isa.c b/sys/cddl/dev/dtrace/riscv/dtrace_isa.c
--- a/sys/cddl/dev/dtrace/riscv/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/riscv/dtrace_isa.c
@@ -119,10 +119,8 @@
     uintptr_t fp)
 {
 	volatile uint16_t *flags;
-	uintptr_t oldfp;
-	int ret;
-
-	ret = 0;
+	int ret = 0;
+	uintptr_t oldfp = fp;
 	flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags;
 
 	ASSERT(pcstack == NULL || pcstack_limit > 0);
@@ -157,6 +155,8 @@
 			cpu_core[curcpu].cpuc_dtrace_illval = fp;
 			break;
 		}
+		
+		oldfp = fp;
 	}
 
 	return (ret);