Consolidate test cases

rmsk2 · Jun 24, 2023 · e23d53c · e23d53c
1 parent 5fbcb17
commit e23d53c
Show file tree

Hide file tree

Showing 41 changed files with 108 additions and 148 deletions.
diff --git a/README.md b/README.md
@@ -25,14 +25,15 @@ feature of the F256) heck it should even run on the KIM-1. The following routine
 - 8 by 8 bit unsigned multiplication with a 16 bit result
 - 8, 16 and 32 bit divison of unsigned integers
 
-General division is only implemented for 8, 16 or 32 bit *unisgned integers*. 32 bit divison is roughly 1.6 times
+General division is only implemented for 8, 16 or 32 bit *unsigned* integers. 32 bit divison is roughly 1.6 times
 slower than 32 bit multiplication (multiplication takes about 3000 clock cycles, division about 5000 cycles). Apart 
-from multiplication and squaring the routines do not care about where a decimal point (or comma depending on where you 
-live) is assumed to be and so the library also provides the above operations for fixed point numbers in the variants 
-mentioned above. 
+from multiplication, squaring and division the routines do not care about where a decimal point (or comma depending 
+on where you live) is assumed to be and so the library also provides the above operations for fixed point numbers in 
+the variants mentioned above. 
 
-The assembled binary has a size of about 1755 bytes in the default configuration (512 of which are part of a table 
-which is used for 16 bit multiplication) but you can customize the library to be as short as about 1200 bytes.
+The assembled binary has a size of about 1800  bytes in the default configuration (512 of which are part of a table 
+which is used for 16 bit multiplication) but you can customize the library to be as short as about 1300 bytes. If you
+enable all features the library has a size of about 2000 bytes.
 
 # Building and customizing
 

diff --git a/arith.a b/arith.a
@@ -696,9 +696,9 @@ divMod32BitUnsigned
 .n3
     lda div32_HELP+1
     cmp div32_DIVISOR+1
-.endCmp32
-    ;+callFunc sub32SwitchedUnsigned, div32_DIVISOR, div32_HELP
+.endCmp32    
     bcc .skip32
+    ;+callFunc sub32SwitchedUnsigned, div32_DIVISOR, div32_HELP
     sec
     lda div32_HELP+1
     sbc div32_DIVISOR+1

diff --git a/tests/add1.lua b/tests/add1.lua
@@ -1,5 +1,6 @@
 require(test_dir .. "arith_base")
 
-valL =   "-AAEEDDFF"
-valR =   "+FFDDEEAA"
-opRes = "+54EF10AB"
+test_data = {    
+    [1] = {valL = "-AAEEDDFF", valR = "+FFDDEEAA", opRes = "+54EF10AB"},
+}
+
diff --git a/tests/arith_base.lua b/tests/arith_base.lua
@@ -1,13 +1,21 @@
 require(test_dir .. "conv")
 
+iter_count = 0
+
 function arrange()
-    set_memory(load_address+3, txt_to_mem(valL))
-    set_memory(load_address+8, txt_to_mem(valR))
+    iter_count = iter_count + 1
+    set_pc(load_address)
+    set_memory(load_address+3, txt_to_mem(test_data[iter_count].valL))
+    set_memory(load_address+8, txt_to_mem(test_data[iter_count].valR))
+end
+
+function num_iterations() 
+    return #test_data
 end
 
 function assert()
     op_res = mem_to_text(get_memory(load_address+8, 5))
-    res = (string.lower(op_res) == string.lower(opRes))
+    res = (string.lower(op_res) == string.lower(test_data[iter_count].opRes))
     err_msg = ""
 
     if not res then

diff --git a/tests/arith_base_mono.lua b/tests/arith_base_mono.lua
@@ -1,12 +1,20 @@
 require(test_dir .. "conv")
 
+iter_count = 0
+
 function arrange()
-    set_memory(load_address+3, txt_to_mem(valL))
+    iter_count = iter_count + 1
+    set_pc(load_address)
+    set_memory(load_address+3, txt_to_mem(test_data[iter_count].valL))
+end
+
+function num_iterations() 
+    return #test_data
 end
 
 function assert()
     op_res = mem_to_text(get_memory(load_address+3, 5))
-    res = (string.lower(op_res) == string.lower(opRes))
+    res = (string.lower(op_res) == string.lower(test_data[iter_count].opRes))
     err_msg = ""
 
     if not res then

diff --git a/tests/double1.lua b/tests/double1.lua
@@ -1,4 +1,8 @@
 require(test_dir .. "arith_base_mono")
 
-valL  = "-00000001"
-opRes = "-00000002"
+test_data = {    
+    [1] = {valL = "-00000001", opRes = "-00000002"},
+    [2] = {valL = "-80000000", opRes = "-00000000"},
+    [3] = {valL = "-00000080", opRes = "-00000100"}
+}
+
diff --git a/tests/double2.json b/tests/double2.json
diff --git a/tests/double2.lua b/tests/double2.lua
diff --git a/tests/double3.json b/tests/double3.json
diff --git a/tests/double3.lua b/tests/double3.lua
diff --git a/tests/fixed161.lua b/tests/fixed161.lua
@@ -1,5 +1,6 @@
 require(test_dir .. "arith_base")
 
-valL =   "-00038000"
-valR =   "+00048000"
-opRes =  "-000FC000"
+test_data = {    
+    [1] = {valL = "-00038000", valR = "+00048000", opRes = "-000FC000"},
+}
+
diff --git a/tests/fixed162.lua b/tests/fixed162.lua
@@ -1,4 +1,5 @@
 require(test_dir .. "arith_base_mono")
 
-valL =   "-00038000"
-opRes =  "+000C4000"
+test_data = {    
+    [1] = {valL = "-00038000", opRes = "+000C4000"},
+}
diff --git a/tests/fixed241.lua b/tests/fixed241.lua
@@ -1,5 +1,7 @@
 require(test_dir .. "arith_base")
 
-valL =   "-0000FF80"
-valR =   "+00014080"
-opRes =  "-013FDFC0"
+test_data = {    
+    [1] = {valL = "-0000FF80", valR = "+00014080", opRes = "-013FDFC0"},
+}
+
+
diff --git a/tests/fixed242.lua b/tests/fixed242.lua
@@ -1,4 +1,5 @@
 require(test_dir .. "arith_base_mono")
 
-valL =   "-0002CDC0"
-opRes =  "+07DC5D10"
+test_data = {    
+    [1] = {valL = "-0002CDC0", opRes = "+07DC5D10"},
+}
diff --git a/tests/fixed81.lua b/tests/fixed81.lua
@@ -1,5 +1,6 @@
 require(test_dir .. "arith_base")
 
-valL =   "-03800000"
-valR =   "+04800000"
-opRes =  "-0FC00000"
+test_data = {    
+    [1] = {valL = "-03800000", valR = "+04800000", opRes = "-0FC00000"},
+}
+
diff --git a/tests/fixed82.lua b/tests/fixed82.lua
@@ -1,4 +1,5 @@
 require(test_dir .. "arith_base_mono")
 
-valL =   "-03800000"
-opRes =  "+0C400000"
+test_data = {    
+    [1] = {valL = "-03800000", opRes = "+0C400000"},
+}
diff --git a/tests/halve1.lua b/tests/halve1.lua
@@ -1,4 +1,6 @@
 require(test_dir .. "arith_base_mono")
 
-valL  = "+80000000"
-opRes = "+40000000"
+test_data = {    
+    [1] = {valL = "+80000000", opRes = "+40000000"},
+    [2] = {valL = "+00010000", opRes = "+00008000"}
+}
diff --git a/tests/halve2.json b/tests/halve2.json
diff --git a/tests/halve2.lua b/tests/halve2.lua
diff --git a/tests/iszero1.lua b/tests/iszero1.lua
@@ -1,4 +1,8 @@
 require(test_dir .. "mono_test")
 
-valL = "-00000000"
-refVal = true
+test_data = {    
+    [1] = {valL = "-00000000", refVal = true},
+    [2] = {valL = "+00000000", refVal = true},
+    [3] = {valL = "+00000001", refVal = false},
+    [4] = {valL = "+01000000", refVal = false}
+}
diff --git a/tests/iszero2.json b/tests/iszero2.json
diff --git a/tests/iszero2.lua b/tests/iszero2.lua
diff --git a/tests/iszero3.json b/tests/iszero3.json
diff --git a/tests/iszero3.lua b/tests/iszero3.lua
diff --git a/tests/iszero4.json b/tests/iszero4.json
diff --git a/tests/iszero4.lua b/tests/iszero4.lua
diff --git a/tests/mono_test.lua b/tests/mono_test.lua
@@ -1,12 +1,20 @@
 require(test_dir .. "conv")
 
+iter_count = 0
+
 function arrange()
-    set_memory(load_address+3, txt_to_mem(valL))
+    iter_count = iter_count + 1
+    set_pc(load_address)
+    set_memory(load_address+3, txt_to_mem(test_data[iter_count].valL))
+end
+
+function num_iterations() 
+    return #test_data
 end
 
 function assert()
     err_msg = ""
-    res = contains_flag("Z") == refVal
+    res = contains_flag("Z") == test_data[iter_count].refVal
 
     if not res then
         err_msg = "Zero flag does not have expected value"

diff --git a/tests/move1.lua b/tests/move1.lua
@@ -1,5 +1,6 @@
 require(test_dir .. "arith_base")
 
-valL =   "-AAEEDDFF"
-valR =   "+00000000"
-opRes =  "-AAEEDDFF"
+test_data = {    
+    [1] = {valL = "-AAEEDDFF", valR = "+00000000", opRes = "-AAEEDDFF"},
+}
+
diff --git a/tests/mul1.lua b/tests/mul1.lua
@@ -1,5 +1,9 @@
 require(test_dir .. "arith_base")
 
-valL =   "-AAEEDDFF"
-valR =   "+FFDDEEAA"
-opRes = "-3B257D56"
+test_data = {    
+    [1] = {valL = "-AAEEDDFF", valR = "+FFDDEEAA", opRes = "-3B257D56"},
+    [2] = {valL = "-00000001", valR = "+FFDDEEAA", opRes = "-FFDDEEAA"},
+    [3] = {valL = "-00000000", valR = "+FFDDEEAA", opRes = "-00000000"},
+    [4] = {valL = "-ABFE2651", valR = "-7B6549ED", opRes = "+BC2B91FD"},
+}
+
diff --git a/tests/mul2.json b/tests/mul2.json
diff --git a/tests/mul2.lua b/tests/mul2.lua
diff --git a/tests/mul3.json b/tests/mul3.json
diff --git a/tests/mul3.lua b/tests/mul3.lua
diff --git a/tests/mul4.json b/tests/mul4.json
diff --git a/tests/mul4.lua b/tests/mul4.lua
diff --git a/tests/mulsquare1.lua b/tests/mulsquare1.lua
@@ -1,5 +1,6 @@
 require(test_dir .. "arith_base")
 
-valL =   "-17EEFB98"
-valR =   "-17EEFB98"
-opRes =  "+15E36A40"
+test_data = {    
+    [1] = {valL = "-17EEFB98", valR = "-17EEFB98", opRes = "+15E36A40"},
+}
+
diff --git a/tests/neg1.lua b/tests/neg1.lua
@@ -1,4 +1,6 @@
 require(test_dir .. "arith_base_mono")
 
-valL  = "+80000000"
-opRes = "-80000000"
+test_data = {    
+    [1] = {valL = "+80000000", opRes = "-80000000"},
+    [2] = {valL = "-00050000", opRes = "+00050000"}
+}
diff --git a/tests/neg2.json b/tests/neg2.json
diff --git a/tests/neg2.lua b/tests/neg2.lua