Fix wrong merge conflict resolution on #295 that overwrote change for #334

kbroch-rivosinc · kbroch-rivosinc · commit c3e697b5f0e7 · 2024-12-22T12:19:49.000-08:00
Brought up here: #295 (comment)
diff --git a/arch/inst/F/fadd.s.yaml b/arch/inst/F/fadd.s.yaml
@@ -26,6 +26,8 @@ access:
   vu: always
 data_independent_timing: true
 operation(): |
+  RoundingMode mode = rm_to_mode(X[rm], $encoding);
+  X[fd] = f32_add(X[fs1], X[fs2], mode);
 
 sail(): |
   {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ access:`
`26`	`26`	`vu: always`
`27`	`27`	`data_independent_timing: true`
`28`	`28`	`operation(): \|`
	`29`	`+ RoundingMode mode = rm_to_mode(X[rm], $encoding);`
	`30`	`+ X[fd] = f32_add(X[fs1], X[fs2], mode);`
`29`	`31`
`30`	`32`	`sail(): \|`
`31`	`33`	`{`