math_mod for stdlib #54

dbaumgarten · Jul 1, 2021 · 4eb35c0 · 4eb35c0
1 parent b21dbb2
commit 4eb35c0
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 4 deletions.
diff --git a/stdlib/bindata.go b/stdlib/bindata.go
diff --git a/stdlib/src/math_advanced.nolol b/stdlib/src/math_advanced.nolol
@@ -12,3 +12,8 @@ end
 macro math_abs(x) expr
 	abs(x)
 end
+
+// Returns x%m (even on basic chips)
+macro math_mod(x,m) expr
+    x%m 
+end
diff --git a/stdlib/src/math_basic.nolol b/stdlib/src/math_basic.nolol
@@ -20,4 +20,9 @@ end
 // Returns the next lower integer to x
 macro math_floor(x) expr
 	x/1000*1000
+end
+
+// Returns x%m (even on basic chips)
+macro math_mod(x,m) expr
+    x-x/m/1000*1000*m
 end
diff --git a/stdlib/stdlib_advanced_test.yaml b/stdlib/stdlib_advanced_test.yaml
@@ -15,6 +15,9 @@ cases:
       sign3: 1
       floor1: 1
       floor2: 1
+      mod1: 1
+      mod2: 1
+      mod3: 1
       pop1: 1
       pop2: 1
       cont1: 1

diff --git a/stdlib/stdlib_basic_test.yaml b/stdlib/stdlib_basic_test.yaml
@@ -15,6 +15,9 @@ cases:
       sign3: 1
       floor1: 1
       floor2: 1
+      mod1: 1
+      mod2: 1
+      mod3: 1
       pop1: 1
       pop2: 1
       cont1: 1

diff --git a/stdlib/stdlib_test.yaml b/stdlib/stdlib_test.yaml
@@ -14,6 +14,9 @@ cases:
       sign3: 1
       floor1: 1
       floor2: 1
+      mod1: 1
+      mod2: 1
+      mod3: 1
       pop1: 1
       pop2: 1
       cont1: 1

diff --git a/stdlib/testcases.nolol b/stdlib/testcases.nolol
@@ -18,6 +18,10 @@ include "std/logic"
 :floor1=math_floor(5.5)==5
 :floor2=math_floor(5)==5
 
+:mod1=math_mod(11,10)==1
+:mod2=math_mod(5,-3)==2
+:mod3=math_mod(-5,3)==-2
+
 string="abc"
 string_pop(string,popout); :pop1=popout=="c"
 :pop2=string=="ab"