qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[gamecode] Make num_globals() calculate actual globals 

It calculating only the size of the array (which was often 4 or 8
globals per element) proved to be a pain when I forgot to alter the size
for the new scale tests. Fixing the size calculation even found a bug in
the shiftop tests.
This commit is contained in:
Bill Currie 2022-01-14 19:43:34 +09:00
parent a81067603c
commit 1a2ac24d8d
15 changed files with 108 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gamecode/test/head.c
View File

@ -11,7 +11,9 @@ static int verbose = 0;
// error if the sizes differ)
#define num_globals(init, expect) \
__builtin_choose_expr ( \
sizeof (init) == sizeof (expect), sizeof (init) / sizeof (init[0]), \
sizeof (init) == sizeof (expect), \
(sizeof (init) / sizeof (init[0])) \
* (sizeof (init[0]) / sizeof (pr_type_t)), \
(void) 0\
)

10
libs/gamecode/test/test-conv0.c
View File

@ -129,7 +129,7 @@ test_t tests[] = {
{
.desc = "int conv 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
.num_globals = num_globals(int_conv_init,int_conv_expect),
.num_statements = num_statements (int_conv_1_statements),
.statements = int_conv_1_statements,
.init_globals = (pr_int_t *) int_conv_init,
@ -138,7 +138,7 @@ test_t tests[] = {
{
.desc = "int conv 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
.num_globals = num_globals(int_conv_init,int_conv_expect),
.num_statements = num_statements (int_conv_2_statements),
.statements = int_conv_2_statements,
.init_globals = (pr_int_t *) int_conv_init,
@ -147,7 +147,7 @@ test_t tests[] = {
{
.desc = "int conv 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
.num_globals = num_globals(int_conv_init,int_conv_expect),
.num_statements = num_statements (int_conv_3a_statements),
.statements = int_conv_3a_statements,
.init_globals = (pr_int_t *) int_conv_init,
@ -156,7 +156,7 @@ test_t tests[] = {
{
.desc = "int conv 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
.num_globals = num_globals(int_conv_init,int_conv_expect),
.num_statements = num_statements (int_conv_3b_statements),
.statements = int_conv_3b_statements,
.init_globals = (pr_int_t *) int_conv_init,
@ -165,7 +165,7 @@ test_t tests[] = {
{
.desc = "int conv 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_conv_init,int_conv_expect),
.num_globals = num_globals(int_conv_init,int_conv_expect),
.num_statements = num_statements (int_conv_4_statements),
.statements = int_conv_4_statements,
.init_globals = (pr_int_t *) int_conv_init,

10
libs/gamecode/test/test-conv1.c
View File

@ -136,7 +136,7 @@ test_t tests[] = {
{
.desc = "float conv 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_conv_init,float_conv_expect),
.num_globals = num_globals(float_conv_init,float_conv_expect),
.num_statements = num_statements (float_conv_1_statements),
.statements = float_conv_1_statements,
.init_globals = (pr_int_t *) float_conv_init,
@ -145,7 +145,7 @@ test_t tests[] = {
{
.desc = "float conv 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_conv_init,float_conv_expect),
.num_globals = num_globals(float_conv_init,float_conv_expect),
.num_statements = num_statements (float_conv_2_statements),
.statements = float_conv_2_statements,
.init_globals = (pr_int_t *) float_conv_init,
@ -154,7 +154,7 @@ test_t tests[] = {
{
.desc = "float conv 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_conv_init,float_conv_expect),
.num_globals = num_globals(float_conv_init,float_conv_expect),
.num_statements = num_statements (float_conv_3a_statements),
.statements = float_conv_3a_statements,
.init_globals = (pr_int_t *) float_conv_init,
@ -163,7 +163,7 @@ test_t tests[] = {
{
.desc = "float conv 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_conv_init,float_conv_expect),
.num_globals = num_globals(float_conv_init,float_conv_expect),
.num_statements = num_statements (float_conv_3b_statements),
.statements = float_conv_3b_statements,
.init_globals = (pr_int_t *) float_conv_init,
@ -172,7 +172,7 @@ test_t tests[] = {
{
.desc = "float conv 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_conv_init,float_conv_expect),
.num_globals = num_globals(float_conv_init,float_conv_expect),
.num_statements = num_statements (float_conv_4_statements),
.statements = float_conv_4_statements,
.init_globals = (pr_int_t *) float_conv_init,

10
libs/gamecode/test/test-conv2.c
View File

@ -145,7 +145,7 @@ test_t tests[] = {
{
.desc = "long conv 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_conv_init,long_conv_expect),
.num_globals = num_globals(long_conv_init,long_conv_expect),
.num_statements = num_statements (long_conv_1_statements),
.statements = long_conv_1_statements,
.init_globals = (pr_int_t *) long_conv_init,
@ -154,7 +154,7 @@ test_t tests[] = {
{
.desc = "long conv 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_conv_init,long_conv_expect),
.num_globals = num_globals(long_conv_init,long_conv_expect),
.num_statements = num_statements (long_conv_2_statements),
.statements = long_conv_2_statements,
.init_globals = (pr_int_t *) long_conv_init,
@ -163,7 +163,7 @@ test_t tests[] = {
{
.desc = "long conv 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_conv_init,long_conv_expect),
.num_globals = num_globals(long_conv_init,long_conv_expect),
.num_statements = num_statements (long_conv_3a_statements),
.statements = long_conv_3a_statements,
.init_globals = (pr_int_t *) long_conv_init,
@ -172,7 +172,7 @@ test_t tests[] = {
{
.desc = "long conv 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_conv_init,long_conv_expect),
.num_globals = num_globals(long_conv_init,long_conv_expect),
.num_statements = num_statements (long_conv_3b_statements),
.statements = long_conv_3b_statements,
.init_globals = (pr_int_t *) long_conv_init,
@ -181,7 +181,7 @@ test_t tests[] = {
{
.desc = "long conv 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_conv_init,long_conv_expect),
.num_globals = num_globals(long_conv_init,long_conv_expect),
.num_statements = num_statements (long_conv_4_statements),
.statements = long_conv_4_statements,
.init_globals = (pr_int_t *) long_conv_init,

10
libs/gamecode/test/test-conv3.c
View File

@ -152,7 +152,7 @@ test_t tests[] = {
{
.desc = "double conv 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_conv_init,double_conv_expect),
.num_globals = num_globals(double_conv_init,double_conv_expect),
.num_statements = num_statements (double_conv_1_statements),
.statements = double_conv_1_statements,
.init_globals = (pr_int_t *) double_conv_init,
@ -161,7 +161,7 @@ test_t tests[] = {
{
.desc = "double conv 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_conv_init,double_conv_expect),
.num_globals = num_globals(double_conv_init,double_conv_expect),
.num_statements = num_statements (double_conv_2_statements),
.statements = double_conv_2_statements,
.init_globals = (pr_int_t *) double_conv_init,
@ -170,7 +170,7 @@ test_t tests[] = {
{
.desc = "double conv 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_conv_init,double_conv_expect),
.num_globals = num_globals(double_conv_init,double_conv_expect),
.num_statements = num_statements (double_conv_3a_statements),
.statements = double_conv_3a_statements,
.init_globals = (pr_int_t *) double_conv_init,
@ -179,7 +179,7 @@ test_t tests[] = {
{
.desc = "double conv 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_conv_init,double_conv_expect),
.num_globals = num_globals(double_conv_init,double_conv_expect),
.num_statements = num_statements (double_conv_3b_statements),
.statements = double_conv_3b_statements,
.init_globals = (pr_int_t *) double_conv_init,
@ -188,7 +188,7 @@ test_t tests[] = {
{
.desc = "double conv 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_conv_init,double_conv_expect),
.num_globals = num_globals(double_conv_init,double_conv_expect),
.num_statements = num_statements (double_conv_4_statements),
.statements = double_conv_4_statements,
.init_globals = (pr_int_t *) double_conv_init,

10
libs/gamecode/test/test-conv4.c
View File

@ -129,7 +129,7 @@ test_t tests[] = {
{
.desc = "uint conv 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_conv_init,uint_conv_expect),
.num_globals = num_globals(uint_conv_init,uint_conv_expect),
.num_statements = num_statements (uint_conv_1_statements),
.statements = uint_conv_1_statements,
.init_globals = (pr_int_t *) uint_conv_init,
@ -138,7 +138,7 @@ test_t tests[] = {
{
.desc = "uint conv 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_conv_init,uint_conv_expect),
.num_globals = num_globals(uint_conv_init,uint_conv_expect),
.num_statements = num_statements (uint_conv_2_statements),
.statements = uint_conv_2_statements,
.init_globals = (pr_int_t *) uint_conv_init,
@ -147,7 +147,7 @@ test_t tests[] = {
{
.desc = "uint conv 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_conv_init,uint_conv_expect),
.num_globals = num_globals(uint_conv_init,uint_conv_expect),
.num_statements = num_statements (uint_conv_3a_statements),
.statements = uint_conv_3a_statements,
.init_globals = (pr_int_t *) uint_conv_init,
@ -156,7 +156,7 @@ test_t tests[] = {
{
.desc = "uint conv 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_conv_init,uint_conv_expect),
.num_globals = num_globals(uint_conv_init,uint_conv_expect),
.num_statements = num_statements (uint_conv_3b_statements),
.statements = uint_conv_3b_statements,
.init_globals = (pr_int_t *) uint_conv_init,
@ -165,7 +165,7 @@ test_t tests[] = {
{
.desc = "uint conv 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_conv_init,uint_conv_expect),
.num_globals = num_globals(uint_conv_init,uint_conv_expect),
.num_statements = num_statements (uint_conv_4_statements),
.statements = uint_conv_4_statements,
.init_globals = (pr_int_t *) uint_conv_init,

10
libs/gamecode/test/test-conv5.c
View File

@ -136,7 +136,7 @@ test_t tests[] = {
{
.desc = "bool32 conv 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool32_conv_init,bool32_conv_expect),
.num_globals = num_globals(bool32_conv_init,bool32_conv_expect),
.num_statements = num_statements (bool32_conv_1_statements),
.statements = bool32_conv_1_statements,
.init_globals = (pr_int_t *) bool32_conv_init,
@ -145,7 +145,7 @@ test_t tests[] = {
{
.desc = "bool32 conv 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool32_conv_init,bool32_conv_expect),
.num_globals = num_globals(bool32_conv_init,bool32_conv_expect),
.num_statements = num_statements (bool32_conv_2_statements),
.statements = bool32_conv_2_statements,
.init_globals = (pr_int_t *) bool32_conv_init,
@ -154,7 +154,7 @@ test_t tests[] = {
{
.desc = "bool32 conv 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool32_conv_init,bool32_conv_expect),
.num_globals = num_globals(bool32_conv_init,bool32_conv_expect),
.num_statements = num_statements (bool32_conv_3a_statements),
.statements = bool32_conv_3a_statements,
.init_globals = (pr_int_t *) bool32_conv_init,
@ -163,7 +163,7 @@ test_t tests[] = {
{
.desc = "bool32 conv 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool32_conv_init,bool32_conv_expect),
.num_globals = num_globals(bool32_conv_init,bool32_conv_expect),
.num_statements = num_statements (bool32_conv_3b_statements),
.statements = bool32_conv_3b_statements,
.init_globals = (pr_int_t *) bool32_conv_init,
@ -172,7 +172,7 @@ test_t tests[] = {
{
.desc = "bool32 conv 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool32_conv_init,bool32_conv_expect),
.num_globals = num_globals(bool32_conv_init,bool32_conv_expect),
.num_statements = num_statements (bool32_conv_4_statements),
.statements = bool32_conv_4_statements,
.init_globals = (pr_int_t *) bool32_conv_init,

10
libs/gamecode/test/test-conv6.c
View File

@ -145,7 +145,7 @@ test_t tests[] = {
{
.desc = "ulong conv 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_conv_init,ulong_conv_expect),
.num_globals = num_globals(ulong_conv_init,ulong_conv_expect),
.num_statements = num_statements (ulong_conv_1_statements),
.statements = ulong_conv_1_statements,
.init_globals = (pr_int_t *) ulong_conv_init,
@ -154,7 +154,7 @@ test_t tests[] = {
{
.desc = "ulong conv 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_conv_init,ulong_conv_expect),
.num_globals = num_globals(ulong_conv_init,ulong_conv_expect),
.num_statements = num_statements (ulong_conv_2_statements),
.statements = ulong_conv_2_statements,
.init_globals = (pr_int_t *) ulong_conv_init,
@ -163,7 +163,7 @@ test_t tests[] = {
{
.desc = "ulong conv 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_conv_init,ulong_conv_expect),
.num_globals = num_globals(ulong_conv_init,ulong_conv_expect),
.num_statements = num_statements (ulong_conv_3a_statements),
.statements = ulong_conv_3a_statements,
.init_globals = (pr_int_t *) ulong_conv_init,
@ -172,7 +172,7 @@ test_t tests[] = {
{
.desc = "ulong conv 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_conv_init,ulong_conv_expect),
.num_globals = num_globals(ulong_conv_init,ulong_conv_expect),
.num_statements = num_statements (ulong_conv_3b_statements),
.statements = ulong_conv_3b_statements,
.init_globals = (pr_int_t *) ulong_conv_init,
@ -181,7 +181,7 @@ test_t tests[] = {
{
.desc = "ulong conv 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_conv_init,ulong_conv_expect),
.num_globals = num_globals(ulong_conv_init,ulong_conv_expect),
.num_statements = num_statements (ulong_conv_4_statements),
.statements = ulong_conv_4_statements,
.init_globals = (pr_int_t *) ulong_conv_init,

10
libs/gamecode/test/test-conv7.c
View File

@ -152,7 +152,7 @@ test_t tests[] = {
{
.desc = "bool64 conv 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool64_conv_init,bool64_conv_expect),
.num_globals = num_globals(bool64_conv_init,bool64_conv_expect),
.num_statements = num_statements (bool64_conv_1_statements),
.statements = bool64_conv_1_statements,
.init_globals = (pr_int_t *) bool64_conv_init,
@ -161,7 +161,7 @@ test_t tests[] = {
{
.desc = "bool64 conv 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool64_conv_init,bool64_conv_expect),
.num_globals = num_globals(bool64_conv_init,bool64_conv_expect),
.num_statements = num_statements (bool64_conv_2_statements),
.statements = bool64_conv_2_statements,
.init_globals = (pr_int_t *) bool64_conv_init,
@ -170,7 +170,7 @@ test_t tests[] = {
{
.desc = "bool64 conv 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool64_conv_init,bool64_conv_expect),
.num_globals = num_globals(bool64_conv_init,bool64_conv_expect),
.num_statements = num_statements (bool64_conv_3a_statements),
.statements = bool64_conv_3a_statements,
.init_globals = (pr_int_t *) bool64_conv_init,
@ -179,7 +179,7 @@ test_t tests[] = {
{
.desc = "bool64 conv 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool64_conv_init,bool64_conv_expect),
.num_globals = num_globals(bool64_conv_init,bool64_conv_expect),
.num_statements = num_statements (bool64_conv_3b_statements),
.statements = bool64_conv_3b_statements,
.init_globals = (pr_int_t *) bool64_conv_init,
@ -188,7 +188,7 @@ test_t tests[] = {
{
.desc = "bool64 conv 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(bool64_conv_init,bool64_conv_expect),
.num_globals = num_globals(bool64_conv_init,bool64_conv_expect),
.num_statements = num_statements (bool64_conv_4_statements),
.statements = bool64_conv_4_statements,
.init_globals = (pr_int_t *) bool64_conv_init,

22
libs/gamecode/test/test-double.c
View File

@ -232,7 +232,7 @@ test_t tests[] = {
{
.desc = "double binop 1",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(double_binop_init,double_binop_expect),
.num_globals = num_globals(double_binop_init,double_binop_expect),
.num_statements = num_statements (double_binop_1_statements),
.statements = double_binop_1_statements,
.init_globals = (pr_int_t *) double_binop_init,
@ -241,7 +241,7 @@ test_t tests[] = {
{
.desc = "double binop 2",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(double_binop_init,double_binop_expect),
.num_globals = num_globals(double_binop_init,double_binop_expect),
.num_statements = num_statements (double_binop_2_statements),
.statements = double_binop_2_statements,
.init_globals = (pr_int_t *) double_binop_init,
@ -250,7 +250,7 @@ test_t tests[] = {
{
.desc = "double binop 3a",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(double_binop_init,double_binop_expect),
.num_globals = num_globals(double_binop_init,double_binop_expect),
.num_statements = num_statements (double_binop_3a_statements),
.statements = double_binop_3a_statements,
.init_globals = (pr_int_t *) double_binop_init,
@ -259,7 +259,7 @@ test_t tests[] = {
{
.desc = "double binop 3b",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(double_binop_init,double_binop_expect),
.num_globals = num_globals(double_binop_init,double_binop_expect),
.num_statements = num_statements (double_binop_3b_statements),
.statements = double_binop_3b_statements,
.init_globals = (pr_int_t *) double_binop_init,
@ -268,7 +268,7 @@ test_t tests[] = {
{
.desc = "double binop 4",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(double_binop_init,double_binop_expect),
.num_globals = num_globals(double_binop_init,double_binop_expect),
.num_statements = num_statements (double_binop_4_statements),
.statements = double_binop_4_statements,
.init_globals = (pr_int_t *) double_binop_init,
@ -277,7 +277,7 @@ test_t tests[] = {
{
.desc = "double cos sin",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(double_cossin_init,double_cossin_expect),
.num_globals = num_globals(double_cossin_init,double_cossin_expect),
.num_statements = num_statements (double_cossin_statements),
.statements = double_cossin_statements,
.init_globals = (pr_int_t *) double_cossin_init,
@ -286,7 +286,7 @@ test_t tests[] = {
{
.desc = "double cmpop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_cmpop_init,double_cmpop_expect),
.num_globals = num_globals(double_cmpop_init,double_cmpop_expect),
.num_statements = num_statements (double_cmpop_1_statements),
.statements = double_cmpop_1_statements,
.init_globals = (pr_int_t *) double_cmpop_init,
@ -295,7 +295,7 @@ test_t tests[] = {
{
.desc = "double cmpop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_cmpop_init,double_cmpop_expect),
.num_globals = num_globals(double_cmpop_init,double_cmpop_expect),
.num_statements = num_statements (double_cmpop_2_statements),
.statements = double_cmpop_2_statements,
.init_globals = (pr_int_t *) double_cmpop_init,
@ -304,7 +304,7 @@ test_t tests[] = {
{
.desc = "double cmpop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_cmpop_init,double_cmpop_expect),
.num_globals = num_globals(double_cmpop_init,double_cmpop_expect),
.num_statements = num_statements (double_cmpop_3a_statements),
.statements = double_cmpop_3a_statements,
.init_globals = (pr_int_t *) double_cmpop_init,
@ -313,7 +313,7 @@ test_t tests[] = {
{
.desc = "double cmpop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_cmpop_init,double_cmpop_expect),
.num_globals = num_globals(double_cmpop_init,double_cmpop_expect),
.num_statements = num_statements (double_cmpop_3b_statements),
.statements = double_cmpop_3b_statements,
.init_globals = (pr_int_t *) double_cmpop_init,
@ -322,7 +322,7 @@ test_t tests[] = {
{
.desc = "double cmpop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(double_cmpop_init,double_cmpop_expect),
.num_globals = num_globals(double_cmpop_init,double_cmpop_expect),
.num_statements = num_statements (double_cmpop_4_statements),
.statements = double_cmpop_4_statements,
.init_globals = (pr_int_t *) double_cmpop_init,

22
libs/gamecode/test/test-float.c
View File

@ -232,7 +232,7 @@ test_t tests[] = {
{
.desc = "float binop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_binop_init,float_binop_expect),
.num_globals = num_globals(float_binop_init,float_binop_expect),
.num_statements = num_statements (float_binop_1_statements),
.statements = float_binop_1_statements,
.init_globals = (pr_int_t *) float_binop_init,
@ -241,7 +241,7 @@ test_t tests[] = {
{
.desc = "float binop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_binop_init,float_binop_expect),
.num_globals = num_globals(float_binop_init,float_binop_expect),
.num_statements = num_statements (float_binop_2_statements),
.statements = float_binop_2_statements,
.init_globals = (pr_int_t *) float_binop_init,
@ -250,7 +250,7 @@ test_t tests[] = {
{
.desc = "float binop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_binop_init,float_binop_expect),
.num_globals = num_globals(float_binop_init,float_binop_expect),
.num_statements = num_statements (float_binop_3a_statements),
.statements = float_binop_3a_statements,
.init_globals = (pr_int_t *) float_binop_init,
@ -259,7 +259,7 @@ test_t tests[] = {
{
.desc = "float binop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_binop_init,float_binop_expect),
.num_globals = num_globals(float_binop_init,float_binop_expect),
.num_statements = num_statements (float_binop_3b_statements),
.statements = float_binop_3b_statements,
.init_globals = (pr_int_t *) float_binop_init,
@ -268,7 +268,7 @@ test_t tests[] = {
{
.desc = "float binop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_binop_init,float_binop_expect),
.num_globals = num_globals(float_binop_init,float_binop_expect),
.num_statements = num_statements (float_binop_4_statements),
.statements = float_binop_4_statements,
.init_globals = (pr_int_t *) float_binop_init,
@ -277,7 +277,7 @@ test_t tests[] = {
{
.desc = "float cos sin",
.extra_globals = 4 * 1,
.num_globals = 4 * num_globals (float_cossin_init, float_cossin_expect),
.num_globals = num_globals (float_cossin_init, float_cossin_expect),
.num_statements = num_statements (float_cossin_statements),
.statements = float_cossin_statements,
.init_globals = (pr_int_t *) float_cossin_init,
@ -286,7 +286,7 @@ test_t tests[] = {
{
.desc = "float cmpop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_cmpop_init,float_cmpop_expect),
.num_globals = num_globals(float_cmpop_init,float_cmpop_expect),
.num_statements = num_statements (float_cmpop_1_statements),
.statements = float_cmpop_1_statements,
.init_globals = (pr_int_t *) float_cmpop_init,
@ -295,7 +295,7 @@ test_t tests[] = {
{
.desc = "float cmpop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_cmpop_init,float_cmpop_expect),
.num_globals = num_globals(float_cmpop_init,float_cmpop_expect),
.num_statements = num_statements (float_cmpop_2_statements),
.statements = float_cmpop_2_statements,
.init_globals = (pr_int_t *) float_cmpop_init,
@ -304,7 +304,7 @@ test_t tests[] = {
{
.desc = "float cmpop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_cmpop_init,float_cmpop_expect),
.num_globals = num_globals(float_cmpop_init,float_cmpop_expect),
.num_statements = num_statements (float_cmpop_3a_statements),
.statements = float_cmpop_3a_statements,
.init_globals = (pr_int_t *) float_cmpop_init,
@ -313,7 +313,7 @@ test_t tests[] = {
{
.desc = "float cmpop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_cmpop_init,float_cmpop_expect),
.num_globals = num_globals(float_cmpop_init,float_cmpop_expect),
.num_statements = num_statements (float_cmpop_3b_statements),
.statements = float_cmpop_3b_statements,
.init_globals = (pr_int_t *) float_cmpop_init,
@ -322,7 +322,7 @@ test_t tests[] = {
{
.desc = "float cmpop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(float_cmpop_init,float_cmpop_expect),
.num_globals = num_globals(float_cmpop_init,float_cmpop_expect),
.num_statements = num_statements (float_cmpop_4_statements),
.statements = float_cmpop_4_statements,
.init_globals = (pr_int_t *) float_cmpop_init,

20
libs/gamecode/test/test-int.c
View File

@ -192,7 +192,7 @@ test_t tests[] = {
{
.desc = "int binop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_binop_init,int_binop_expect),
.num_globals = num_globals(int_binop_init,int_binop_expect),
.num_statements = num_statements (int_binop_1_statements),
.statements = int_binop_1_statements,
.init_globals = (pr_int_t *) int_binop_init,
@ -201,7 +201,7 @@ test_t tests[] = {
{
.desc = "int binop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_binop_init,int_binop_expect),
.num_globals = num_globals(int_binop_init,int_binop_expect),
.num_statements = num_statements (int_binop_2_statements),
.statements = int_binop_2_statements,
.init_globals = (pr_int_t *) int_binop_init,
@ -210,7 +210,7 @@ test_t tests[] = {
{
.desc = "int binop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_binop_init,int_binop_expect),
.num_globals = num_globals(int_binop_init,int_binop_expect),
.num_statements = num_statements (int_binop_3a_statements),
.statements = int_binop_3a_statements,
.init_globals = (pr_int_t *) int_binop_init,
@ -219,7 +219,7 @@ test_t tests[] = {
{
.desc = "int binop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_binop_init,int_binop_expect),
.num_globals = num_globals(int_binop_init,int_binop_expect),
.num_statements = num_statements (int_binop_3b_statements),
.statements = int_binop_3b_statements,
.init_globals = (pr_int_t *) int_binop_init,
@ -228,7 +228,7 @@ test_t tests[] = {
{
.desc = "int binop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_binop_init,int_binop_expect),
.num_globals = num_globals(int_binop_init,int_binop_expect),
.num_statements = num_statements (int_binop_4_statements),
.statements = int_binop_4_statements,
.init_globals = (pr_int_t *) int_binop_init,
@ -237,7 +237,7 @@ test_t tests[] = {
{
.desc = "int cmpop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_cmpop_init,int_cmpop_expect),
.num_globals = num_globals(int_cmpop_init,int_cmpop_expect),
.num_statements = num_statements (int_cmpop_1_statements),
.statements = int_cmpop_1_statements,
.init_globals = (pr_int_t *) int_cmpop_init,
@ -246,7 +246,7 @@ test_t tests[] = {
{
.desc = "int cmpop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_cmpop_init,int_cmpop_expect),
.num_globals = num_globals(int_cmpop_init,int_cmpop_expect),
.num_statements = num_statements (int_cmpop_2_statements),
.statements = int_cmpop_2_statements,
.init_globals = (pr_int_t *) int_cmpop_init,
@ -255,7 +255,7 @@ test_t tests[] = {
{
.desc = "int cmpop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_cmpop_init,int_cmpop_expect),
.num_globals = num_globals(int_cmpop_init,int_cmpop_expect),
.num_statements = num_statements (int_cmpop_3a_statements),
.statements = int_cmpop_3a_statements,
.init_globals = (pr_int_t *) int_cmpop_init,
@ -264,7 +264,7 @@ test_t tests[] = {
{
.desc = "int cmpop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_cmpop_init,int_cmpop_expect),
.num_globals = num_globals(int_cmpop_init,int_cmpop_expect),
.num_statements = num_statements (int_cmpop_3b_statements),
.statements = int_cmpop_3b_statements,
.init_globals = (pr_int_t *) int_cmpop_init,
@ -273,7 +273,7 @@ test_t tests[] = {
{
.desc = "int cmpop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(int_cmpop_init,int_cmpop_expect),
.num_globals = num_globals(int_cmpop_init,int_cmpop_expect),
.num_statements = num_statements (int_cmpop_4_statements),
.statements = int_cmpop_4_statements,
.init_globals = (pr_int_t *) int_cmpop_init,

20
libs/gamecode/test/test-long.c
View File

@ -194,7 +194,7 @@ test_t tests[] = {
{
.desc = "long binop 1",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(long_binop_init,long_binop_expect),
.num_globals = num_globals(long_binop_init,long_binop_expect),
.num_statements = num_statements (long_binop_1_statements),
.statements = long_binop_1_statements,
.init_globals = (pr_int_t *) long_binop_init,
@ -203,7 +203,7 @@ test_t tests[] = {
{
.desc = "long binop 2",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(long_binop_init,long_binop_expect),
.num_globals = num_globals(long_binop_init,long_binop_expect),
.num_statements = num_statements (long_binop_2_statements),
.statements = long_binop_2_statements,
.init_globals = (pr_int_t *) long_binop_init,
@ -212,7 +212,7 @@ test_t tests[] = {
{
.desc = "long binop 3a",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(long_binop_init,long_binop_expect),
.num_globals = num_globals(long_binop_init,long_binop_expect),
.num_statements = num_statements (long_binop_3a_statements),
.statements = long_binop_3a_statements,
.init_globals = (pr_int_t *) long_binop_init,
@ -221,7 +221,7 @@ test_t tests[] = {
{
.desc = "long binop 3b",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(long_binop_init,long_binop_expect),
.num_globals = num_globals(long_binop_init,long_binop_expect),
.num_statements = num_statements (long_binop_3b_statements),
.statements = long_binop_3b_statements,
.init_globals = (pr_int_t *) long_binop_init,
@ -230,7 +230,7 @@ test_t tests[] = {
{
.desc = "long binop 4",
.extra_globals = 8 * 1,
.num_globals = 8*num_globals(long_binop_init,long_binop_expect),
.num_globals = num_globals(long_binop_init,long_binop_expect),
.num_statements = num_statements (long_binop_4_statements),
.statements = long_binop_4_statements,
.init_globals = (pr_int_t *) long_binop_init,
@ -239,7 +239,7 @@ test_t tests[] = {
{
.desc = "long cmpop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_cmpop_init,long_cmpop_expect),
.num_globals = num_globals(long_cmpop_init,long_cmpop_expect),
.num_statements = num_statements (long_cmpop_1_statements),
.statements = long_cmpop_1_statements,
.init_globals = (pr_int_t *) long_cmpop_init,
@ -248,7 +248,7 @@ test_t tests[] = {
{
.desc = "long cmpop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_cmpop_init,long_cmpop_expect),
.num_globals = num_globals(long_cmpop_init,long_cmpop_expect),
.num_statements = num_statements (long_cmpop_2_statements),
.statements = long_cmpop_2_statements,
.init_globals = (pr_int_t *) long_cmpop_init,
@ -257,7 +257,7 @@ test_t tests[] = {
{
.desc = "long cmpop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_cmpop_init,long_cmpop_expect),
.num_globals = num_globals(long_cmpop_init,long_cmpop_expect),
.num_statements = num_statements (long_cmpop_3a_statements),
.statements = long_cmpop_3a_statements,
.init_globals = (pr_int_t *) long_cmpop_init,
@ -266,7 +266,7 @@ test_t tests[] = {
{
.desc = "long cmpop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_cmpop_init,long_cmpop_expect),
.num_globals = num_globals(long_cmpop_init,long_cmpop_expect),
.num_statements = num_statements (long_cmpop_3b_statements),
.statements = long_cmpop_3b_statements,
.init_globals = (pr_int_t *) long_cmpop_init,
@ -275,7 +275,7 @@ test_t tests[] = {
{
.desc = "long cmpop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(long_cmpop_init,long_cmpop_expect),
.num_globals = num_globals(long_cmpop_init,long_cmpop_expect),
.num_statements = num_statements (long_cmpop_4_statements),
.statements = long_cmpop_4_statements,
.init_globals = (pr_int_t *) long_cmpop_init,

42
libs/gamecode/test/test-unsigned.c
View File

@ -304,7 +304,7 @@ static pr_ulvec4_t ulong_shiftop_expect[] = {
{ UINT64_C(0x456789abcdef0000), UINT64_C(0xdef0123456780000),
UINT64_C(0x0000030000000200), UINT64_C(0x5554aaab5554aaaa) },//shl a
{ UINT64_C(0xef00000000000000), UINT64_C(0x5678000000000000),
UINT64_C(0x0020000000000000), UINT64_C(0x8000000000000000) },//shl b
UINT64_C(0x0080000000000000), UINT64_C(0x8000000000000000) },//shl b
{ UINT64_C(0x000123456789abcd), UINT64_C(0x00009abcdef01234),
UINT64_C(0x0040000000c00000), UINT64_C(0x55552aaad5552aaa) },//shr a
{ UINT64_C(0x0000000000000123), UINT64_C(0x0000000000009abc),
@ -390,7 +390,7 @@ test_t tests[] = {
{
.desc = "uint cmpop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_globals = num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_statements = num_statements (uint_cmpop_1_statements),
.statements = uint_cmpop_1_statements,
.init_globals = (pr_int_t *) uint_cmpop_init,
@ -399,7 +399,7 @@ test_t tests[] = {
{
.desc = "uint cmpop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_globals = num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_statements = num_statements (uint_cmpop_2_statements),
.statements = uint_cmpop_2_statements,
.init_globals = (pr_int_t *) uint_cmpop_init,
@ -408,7 +408,7 @@ test_t tests[] = {
{
.desc = "uint cmpop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_globals = num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_statements = num_statements (uint_cmpop_3a_statements),
.statements = uint_cmpop_3a_statements,
.init_globals = (pr_int_t *) uint_cmpop_init,
@ -417,7 +417,7 @@ test_t tests[] = {
{
.desc = "uint cmpop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_globals = num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_statements = num_statements (uint_cmpop_3b_statements),
.statements = uint_cmpop_3b_statements,
.init_globals = (pr_int_t *) uint_cmpop_init,
@ -426,7 +426,7 @@ test_t tests[] = {
{
.desc = "uint cmpop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_globals = num_globals(uint_cmpop_init,uint_cmpop_expect),
.num_statements = num_statements (uint_cmpop_4_statements),
.statements = uint_cmpop_4_statements,
.init_globals = (pr_int_t *) uint_cmpop_init,
@ -435,7 +435,7 @@ test_t tests[] = {
{
.desc = "ulong cmpop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_globals = num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_statements = num_statements (ulong_cmpop_1_statements),
.statements = ulong_cmpop_1_statements,
.init_globals = (pr_int_t *) ulong_cmpop_init,
@ -444,7 +444,7 @@ test_t tests[] = {
{
.desc = "ulong cmpop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_globals = num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_statements = num_statements (ulong_cmpop_2_statements),
.statements = ulong_cmpop_2_statements,
.init_globals = (pr_int_t *) ulong_cmpop_init,
@ -453,7 +453,7 @@ test_t tests[] = {
{
.desc = "ulong cmpop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_globals = num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_statements = num_statements (ulong_cmpop_3a_statements),
.statements = ulong_cmpop_3a_statements,
.init_globals = (pr_int_t *) ulong_cmpop_init,
@ -462,7 +462,7 @@ test_t tests[] = {
{
.desc = "ulong cmpop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_globals = num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_statements = num_statements (ulong_cmpop_3b_statements),
.statements = ulong_cmpop_3b_statements,
.init_globals = (pr_int_t *) ulong_cmpop_init,
@ -471,7 +471,7 @@ test_t tests[] = {
{
.desc = "ulong cmpop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_globals = num_globals(ulong_cmpop_init,ulong_cmpop_expect),
.num_statements = num_statements (ulong_cmpop_4_statements),
.statements = ulong_cmpop_4_statements,
.init_globals = (pr_int_t *) ulong_cmpop_init,
@ -480,7 +480,7 @@ test_t tests[] = {
{
.desc = "uint shiftop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_globals = num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_statements = num_statements (uint_shiftop_1_statements),
.statements = uint_shiftop_1_statements,
.init_globals = (pr_int_t *) uint_shiftop_init,
@ -489,7 +489,7 @@ test_t tests[] = {
{
.desc = "uint shiftop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_globals = num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_statements = num_statements (uint_shiftop_2_statements),
.statements = uint_shiftop_2_statements,
.init_globals = (pr_int_t *) uint_shiftop_init,
@ -498,7 +498,7 @@ test_t tests[] = {
{
.desc = "uint shiftop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_globals = num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_statements = num_statements (uint_shiftop_3a_statements),
.statements = uint_shiftop_3a_statements,
.init_globals = (pr_int_t *) uint_shiftop_init,
@ -507,7 +507,7 @@ test_t tests[] = {
{
.desc = "uint shiftop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_globals = num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_statements = num_statements (uint_shiftop_3b_statements),
.statements = uint_shiftop_3b_statements,
.init_globals = (pr_int_t *) uint_shiftop_init,
@ -516,7 +516,7 @@ test_t tests[] = {
{
.desc = "uint shiftop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_globals = num_globals(uint_shiftop_init,uint_shiftop_expect),
.num_statements = num_statements (uint_shiftop_4_statements),
.statements = uint_shiftop_4_statements,
.init_globals = (pr_int_t *) uint_shiftop_init,
@ -525,7 +525,7 @@ test_t tests[] = {
{
.desc = "ulong shiftop 1",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_globals = num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_statements = num_statements (ulong_shiftop_1_statements),
.statements = ulong_shiftop_1_statements,
.init_globals = (pr_int_t *) ulong_shiftop_init,
@ -534,7 +534,7 @@ test_t tests[] = {
{
.desc = "ulong shiftop 2",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_globals = num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_statements = num_statements (ulong_shiftop_2_statements),
.statements = ulong_shiftop_2_statements,
.init_globals = (pr_int_t *) ulong_shiftop_init,
@ -543,7 +543,7 @@ test_t tests[] = {
{
.desc = "ulong shiftop 3a",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_globals = num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_statements = num_statements (ulong_shiftop_3a_statements),
.statements = ulong_shiftop_3a_statements,
.init_globals = (pr_int_t *) ulong_shiftop_init,
@ -552,7 +552,7 @@ test_t tests[] = {
{
.desc = "ulong shiftop 3b",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_globals = num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_statements = num_statements (ulong_shiftop_3b_statements),
.statements = ulong_shiftop_3b_statements,
.init_globals = (pr_int_t *) ulong_shiftop_init,
@ -561,7 +561,7 @@ test_t tests[] = {
{
.desc = "ulong shiftop 4",
.extra_globals = 4 * 1,
.num_globals = 4*num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_globals = num_globals(ulong_shiftop_init,ulong_shiftop_expect),
.num_statements = num_statements (ulong_shiftop_4_statements),
.statements = ulong_shiftop_4_statements,
.init_globals = (pr_int_t *) ulong_shiftop_init,

4
libs/gamecode/test/test-vector.c
View File

@ -151,7 +151,7 @@ static dstatement_t double_vector_statements[] = {
test_t tests[] = {
{
.desc = "float vector",
.num_globals = 4*num_globals(float_globals_init, float_globals_expect),
.num_globals = num_globals(float_globals_init, float_globals_expect),
.num_statements = num_statements (float_vector_statements),
.statements = float_vector_statements,
.init_globals = (pr_int_t *) float_globals_init,
@ -159,7 +159,7 @@ test_t tests[] = {
},
{
.desc = "double vector",
.num_globals = 8*num_globals(double_globals_init,double_globals_expect),
.num_globals = num_globals(double_globals_init,double_globals_expect),
.num_statements = num_statements (double_vector_statements),
.statements = double_vector_statements,
.init_globals = (pr_int_t *) double_globals_init,