dyncall: test/suite_aggrs/mk-cases.lua comparison

comparison test/suite_aggrs/mk-cases.lua @ 482:0f3b6898078d

suite_aggrs (still ahead of checked in version of dyncall, sorry): - renaming struct -> aggr - added knobs to: * control struct packing * whether to test immutability of aggr-by-val params * how to copy aggrs (field by field or via = op (which might do a memcpy and thus copy padding garbage, also)) - some macros to reduce file sizes of generated cases - setting default misalignment to 1

author	Tassilo Philipp
date	Wed, 16 Mar 2022 16:27:50 +0100
parents	653b65580cb4
children

comparison

equal deleted inserted replaced

-:0fc22b5feac7
+:0f3b6898078d
+require"config"
 require"math"
-local max = math.max
+local max_numargs = 0
-local maxargs = 0
 local aggrs = { }
 local seen_aggrs = { }
 end
 -- no nesting (= actual func args), generate case code
 if n_nest == 0 then
 h[#h+1] = canon_type(ch)
--- aggregate types (more than one char) need copying via a func
+-- aggregate types have more than one
 if #h[#h] > 1 then
-t[#t+1] = 'f_cp'..h[#h]:sub(8)..'(V_a['..pos.."],&"..name..");"
+if aggrcpsimple then
+t[#t+1] = '*('..h[#h]..'*)V_a['..pos.."]="..name..";"
+else
+t[#t+1] = 'f_cp'..h[#h]:sub(8)..'(V_a['..pos.."],&"..name..");"
+end
+if aggrmutabletest then
+t[#t] = t[#t]..'memset(&'..name..',0,sizeof('..name..'));'
+end
 else
 t[#t+1] = "V_"..ch.."["..pos.."]="..name..";"
 end
 -- is return type or func arg?
 pos = pos + 1
 end
 end
 end
-maxargs = max(maxargs, pos-1)
+max_numargs = math.max(max_numargs, pos-1)
 h[#h] = "){"
 if #h[6] == 1 then
 t[#t+1] = "ret_"..h[6].."("..(pos-1)..")}\n"
 else
 t[#t+1] = "ret_a("..(pos-1)..","..h[6]..")}\n"
 agg_sigs [#agg_sigs  + 1] = k
 agg_names[#agg_names + 1] = at:sub(8)
 -- aggregate def
 io.write('/* '..k..' */\n')
+if aggrpacking ~= 0 then
+local pack = aggrpacking
+if pack < 0 then
+pack = math.floor(math.pow(2,math.floor(math.log(math.random(math.abs(pack)),2))))
+end
+io.write('#pragma pack(push,'..pack..')\n')
+end
 io.write(at..' { ')
 for i = 1, #am, 2 do
 io.write(am[i]..' '..am[i+1]..'; ')
 end
 io.write("};\n")
+if aggrpacking ~= 0 then
+io.write('#pragma pack(pop)\n')
+end
 -- aggregate cp and cmp funcs
 s = {
 'void f_cp'..at:sub(8)..'('..at..' *x, const '..at..' *y) { ',
 'int f_cmp'..at:sub(8)..'(const '..at..' *x, const '..at..' *y) { return '
 }
 o = { '=', '==', 'f_cp', 'f_cmp', '; ', ' && ', '', '1' }
 for t = 1, 2 do
-io.write(s[t])
+if t ~= 1 or aggrcpsimple == false then
-local b = {}
+io.write(s[t])
-for i = 1, #am, 2 do
+local b = {}
-local m = split_array_decl(am[i+1])
+for i = 1, #am, 2 do
-local fmt = ''
+local m = split_array_decl(am[i+1])
-if m[2] ~= nil then -- need array suffixes?
+local fmt = ''
-fmt = '[%d]'
+if m[2] ~= nil then -- need array suffixes?
-else
+fmt = '[%d]'
-m[2] = 1
-end
-for j = 1, m[2] do
-name = m[1]..string.format(fmt, j-1)
-if string.match(am[i], ' ') then -- aggregate canonical types contain at least one space
-b[#b+1] = o[t+2]..am[i]:sub(8)..'(&x->'..name..', &y->'..name..')'
 else
-b[#b+1] = 'x->'..name..' '..o[t]..' y->'..name
+m[2] = 1
 end
-end
-end
+for j = 1, m[2] do
-if #b == 0 then  -- to handle empty aggregates
+name = m[1]..string.format(fmt, j-1)
-b[1] = o[t+6]
+if string.match(am[i], ' ') then -- aggregate canonical types contain at least one space
-end
+b[#b+1] = o[t+2]..am[i]:sub(8)..'(&x->'..name..', &y->'..name..')'
-io.write(table.concat(b,o[t+4]).."; };\n")
+else
+b[#b+1] = 'x->'..name..' '..o[t]..' y->'..name
+end
+end
+end
+if #b == 0 then  -- to handle empty aggregates
+b[1] = o[t+6]
+end
+io.write(table.concat(b,o[t+4]).."; };\n")
+end
 end
 -- convenient dcnewstruct helper funcs
-io.write('DCstruct* f_touchdcst'..at:sub(8)..'() {\n\tstatic DCstruct* at = NULL;\n\tif(!at) {\n\t\tat = dcNewStruct('..(#am>>1)..', sizeof('..at..'), DC_TRUE);\n\t\t')
+io.write('DCaggr* f_touchdcst'..at:sub(8)..'() {\n\tstatic DCaggr* at = NULL;\n\tif(!at) {\n\t\tat = dcNewAggr('..(#am>>1)..', sizeof('..at..'), DC_TRUE);\n\t\t')
 for i = 1, #am, 2 do
 local m = split_array_decl(am[i+1])
 if m[2] == nil then -- need array suffixes?
 m[2] = 1
 end
 if string.match(am[i], ' ') then -- aggregate canonical types contain at least one space
-io.write('dcStructField(at, DC_SIGCHAR_STRUCT, offsetof('..at..', '..m[1]..'), '..m[2]..', f_touchdcst'..am[i]:sub(8)..'());\n\t\t')
+--io.write('dcAggrField(at, DC_SIGCHAR_AGGREGATE, offsetof('..at..', '..m[1]..'), '..m[2]..', f_touchdcst'..am[i]:sub(8)..'());\n\t\t')
+io.write("AFa("..at..','..m[1]..','..m[2]..','..am[i]:sub(8)..')\n\t\t')
 else
-io.write("dcStructField(at, '"..am[i].."', offsetof("..at..', '..m[1]..'), '..m[2]..');\n\t\t')
+--io.write("dcAggrField(at, '"..am[i].."', offsetof("..at..', '..m[1]..'), '..m[2]..');\n\t\t')
-end
+io.write("AF('"..am[i].."',"..at..','..m[1]..','..m[2]..')\n\t\t')
 end
-io.write("dcCloseStruct(at);\n\t}\n\treturn at;\n};\n")
+end
+io.write("dcCloseAggr(at);\n\t}\n\treturn at;\n};\n")
 end
 -- make table.concat work
 if #agg_names > 0 then
 table.insert(agg_names, 1, '')
 io.write(mksigtab(sigtab))
 io.write('const char* G_agg_sigs[]  = {\n\t"'..table.concat(agg_sigs, '",\n\t"')..'"\n};\n')
 io.write('int G_agg_sizes[] = {\n\t'..table.concat(agg_sizes, ',\n\t')..'\n};\n')
 io.write('funptr G_agg_touchdcstfuncs[] = {'..string.sub(table.concat(agg_names, ',\n\t(funptr)&f_touchdcst'),2)..'\n};\n')
 io.write('funptr G_agg_cmpfuncs[] = {'..string.sub(table.concat(agg_names, ',\n\t(funptr)&f_cmp'),2)..'\n};\n')
-io.write("int G_maxargs = "..maxargs..";\n")
+io.write("int G_maxargs = "..max_numargs..";\n")
 end
+math.randomseed(seed)
 mkall()

Mercurial > pub > dyncall > dyncall

comparison test/suite_aggrs/mk-cases.lua @ 482:0f3b6898078d